diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java index 9909a4a..a43f2d2 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java @@ -1,6 +1,6 @@ package com.nu.modules.pad.instruction.invoicing; -import com.nu.entity.LogisticsDirectiveEntity; +import com.nu.entity.InvoicingDirectiveEntity; import com.nu.modules.care.api.IDirectiveConfigApi; import com.nu.modules.care.api.IInvoicingDirectivePlanApi; import lombok.extern.slf4j.Slf4j; @@ -48,7 +48,7 @@ public class InvoicingDirectiveApi { * @return */ @GetMapping(value = "/getNclist") - public Result> getPlanList(LogisticsDirectiveEntity logisticsDirectiveEntity) { + public Result> getPlanList(InvoicingDirectiveEntity logisticsDirectiveEntity) { Map pageList = logisticsDirectivePlanApi.getPlanList(logisticsDirectiveEntity); return Result.OK(pageList); } @@ -60,7 +60,7 @@ public class InvoicingDirectiveApi { * @return */ @PostMapping(value = "/addDirective") - public Result addDirective(@RequestBody LogisticsDirectiveEntity logisticsDirectiveEntity) { + public Result addDirective(@RequestBody InvoicingDirectiveEntity logisticsDirectiveEntity) { return Result.OK(logisticsDirectivePlanApi.addDirective(logisticsDirectiveEntity)); } @@ -71,7 +71,7 @@ public class InvoicingDirectiveApi { * @return */ @PostMapping(value = "/editDirective") - public Result editDirective(@RequestBody LogisticsDirectiveEntity logisticsDirectiveEntity) { + public Result editDirective(@RequestBody InvoicingDirectiveEntity logisticsDirectiveEntity) { logisticsDirectivePlanApi.editDirective(logisticsDirectiveEntity); return Result.OK("操作成功"); } @@ -83,7 +83,7 @@ public class InvoicingDirectiveApi { * @return */ @PostMapping(value = "/deleteDirective") - public Result deleteDirective(@RequestBody LogisticsDirectiveEntity logisticsDirectiveEntity) { + public Result deleteDirective(@RequestBody InvoicingDirectiveEntity logisticsDirectiveEntity) { logisticsDirectivePlanApi.deleteDirective(logisticsDirectiveEntity); return Result.OK("操作成功"); } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java similarity index 97% rename from nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java rename to nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java index 360723c..4a50b84 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java @@ -15,7 +15,7 @@ import java.util.List; * @Version: V1.0 */ @Data -public class LogisticsDirectiveEntity implements Serializable { +public class InvoicingDirectiveEntity implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsOrdersEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java similarity index 98% rename from nursing-unit-common/src/main/java/com/nu/entity/LogisticsOrdersEntity.java rename to nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java index c37c0c3..98e281a 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/LogisticsOrdersEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingOrdersEntity.java @@ -22,7 +22,7 @@ import java.util.Date; * @Version: V1.0 */ @Data -public class LogisticsOrdersEntity implements Serializable { +public class InvoicingOrdersEntity implements Serializable { /**id*/ private String id; /**数据池子表ID*/ diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java index dff6c71..f7d49c3 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java @@ -4,8 +4,8 @@ import com.nu.entity.*; import java.util.Map; public interface IInvoicingDirectivePlanApi { - Map getPlanList(LogisticsDirectiveEntity logisticsDirectiveEntity); - LogisticsDirectiveEntity addDirective(LogisticsDirectiveEntity logisticsDirectiveEntity); - void editDirective(LogisticsDirectiveEntity logisticsDirectiveEntity); - void deleteDirective(LogisticsDirectiveEntity logisticsDirectiveEntity); + Map getPlanList(InvoicingDirectiveEntity logisticsDirectiveEntity); + InvoicingDirectiveEntity addDirective(InvoicingDirectiveEntity logisticsDirectiveEntity); + void editDirective(InvoicingDirectiveEntity logisticsDirectiveEntity); + void deleteDirective(InvoicingDirectiveEntity logisticsDirectiveEntity); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java index 0769ba9..82b9d7d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java @@ -22,10 +22,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("nu_biz_nu_logistics_directive_data_pool") +@TableName("nu_biz_nu_invoicing_directive_data_pool") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_logistics_directive_data_pool对象", description="仓库类服务指令数据池主表") +@ApiModel(value="nu_biz_nu_invoicing_directive_data_pool对象", description="仓库类服务指令数据池主表") public class InvoicingDataPool implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml index 013f846..708dc3f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml @@ -26,7 +26,7 @@ net_mp4_file as netMp4File, service_duration as serviceDuration, service_content as serviceContent - from nu_biz_nu_customer_logistics_server + from nu_biz_nu_customer_invoicing_server AND nu_id = #{nuId} @@ -70,7 +70,7 @@ net_mp4_file as netMp4File, service_duration as serviceDuration, service_content as serviceContent - from nu_biz_nu_customer_logistics_server + from nu_biz_nu_customer_invoicing_server where id = #{id} @@ -101,7 +101,7 @@ end_time, iz_orders, iz_start - from nu_biz_nu_logistics_directive_data_pool + from nu_biz_nu_invoicing_directive_data_pool AND biz_id = #{bizId} @@ -127,7 +127,7 @@ CREATE TABLE IF NOT EXISTS ${tableName} ( id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_nu_customer_server.id;即时指令计划ID,nu_biz_nu_customer_logistics_server_instant.id', + biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_nu_customer_server.id;即时指令计划ID,nu_biz_nu_customer_invoicing_server_instant.id', nu_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '护理单元ID,nu_base_info.id', nu_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '护理单元名称', customer_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID,nu_biz_customer_info.id', @@ -164,7 +164,7 @@ insert into ${tableName} select a.*,#{operationFlag} - from nu_biz_nu_logistics_directive_data_pool a + from nu_biz_nu_invoicing_directive_data_pool a AND id = #{id} @@ -176,7 +176,7 @@ - delete from nu_biz_nu_logistics_directive_data_pool a + delete from nu_biz_nu_invoicing_directive_data_pool a AND id = #{id} @@ -191,7 +191,7 @@ CREATE TABLE IF NOT EXISTS ${tableName} ( id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', pool_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据池主表ID,nu_biz_nu_directive_data_pool.id', - biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_nu_customer_server.id;即时指令计划ID,nu_biz_nu_customer_logistics_server_instant.id', + biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_nu_customer_server.id;即时指令计划ID,nu_biz_nu_customer_invoicing_server_instant.id', nu_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '护理单元ID,nu_base_info.id', nu_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '护理单元名称', customer_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID,nu_biz_customer_info.id', @@ -258,7 +258,7 @@ start_time, end_time, iz_start - from nu_biz_nu_logistics_directive_order + from nu_biz_nu_invoicing_directive_order where pool_id = #{id} AND iz_start = #{izStart} @@ -266,12 +266,12 @@ insert into ${tableName} select a.*,#{remarks} - from nu_biz_nu_logistics_directive_order a + from nu_biz_nu_invoicing_directive_order a where id = #{id} - delete from nu_biz_nu_logistics_directive_order + delete from nu_biz_nu_invoicing_directive_order where id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java index 2941e7e..efcef61 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java @@ -246,7 +246,7 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') and start_time <=DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59') group by employee_id ) e on a.id = e.employee_id left join ( select employee_id,sum(case when iz_finish='N' then 1 else 0 end) as orderNum - from nu_biz_nu_logistics_directive_order + from nu_biz_nu_invoicing_directive_order where start_time = #{startTime} or (start_time < #{startTime} and end_time > #{startTime}) group by employee_id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/entity/PlanBizNuCustomerInvoicingServer.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/entity/PlanBizNuCustomerInvoicingServer.java index d233e9a..013739d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/entity/PlanBizNuCustomerInvoicingServer.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/entity/PlanBizNuCustomerInvoicingServer.java @@ -24,10 +24,10 @@ import java.util.List; * @Version: V1.0 */ @Data -@TableName("nu_biz_nu_customer_logistics_server") +@TableName("nu_biz_nu_customer_invoicing_server") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_customer_logistics_server对象", description="护理单元客户仓库类服务指令计划") +@ApiModel(value="nu_biz_nu_customer_invoicing_server对象", description="护理单元客户仓库类服务指令计划") public class PlanBizNuCustomerInvoicingServer implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml index d4a4b4e..12a3269 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml @@ -2,6 +2,6 @@ - delete from nu_biz_nu_customer_care_server where id = #{id} + delete from nu_biz_nu_customer_invoicing_server where id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java index 50df032..80674e6 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java @@ -3,7 +3,7 @@ package com.nu.modules.biz.invoicing.plan.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.entity.LogisticsDirectiveEntity; +import com.nu.entity.InvoicingDirectiveEntity; import com.nu.modules.biz.invoicing.datapool.service.IInvoicingDataPoolService; import com.nu.modules.biz.invoicing.plan.entity.PlanBizNuCustomerInvoicingServer; import com.nu.modules.biz.invoicing.plan.mapper.PlanBizNuCustomerInvoicingServerMapper; @@ -32,35 +32,35 @@ public class PlanBizNuCustomerInvoicingServerServiceImpl extends ServiceImpl getPlanList(LogisticsDirectiveEntity logisticsDirectiveEntity) { + public Map getPlanList(InvoicingDirectiveEntity invoicingDirectiveEntity) { Map resMap = new HashMap<>(); //服务指令计划 QueryWrapper PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); - PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(logisticsDirectiveEntity.getNuId()), "nu_id", logisticsDirectiveEntity.getNuId()); - PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(logisticsDirectiveEntity.getCustomerId()), "customer_id", logisticsDirectiveEntity.getCustomerId()); + PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(invoicingDirectiveEntity.getNuId()), "nu_id", invoicingDirectiveEntity.getNuId()); + PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(invoicingDirectiveEntity.getCustomerId()), "customer_id", invoicingDirectiveEntity.getCustomerId()); List groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper); resMap.put("serviceList", groupList);//服务指令计划 return resMap; } @Override - public LogisticsDirectiveEntity addDirective(LogisticsDirectiveEntity logisticsDirectiveEntity) { + public InvoicingDirectiveEntity addDirective(InvoicingDirectiveEntity invoicingDirectiveEntity) { PlanBizNuCustomerInvoicingServer planBizNuCustomerServer = new PlanBizNuCustomerInvoicingServer(); - BeanUtils.copyProperties(logisticsDirectiveEntity,planBizNuCustomerServer); + BeanUtils.copyProperties(invoicingDirectiveEntity,planBizNuCustomerServer); baseMapper.insert(planBizNuCustomerServer); //TODO 增加日志 //单一指令生成到数据池 dataPoolServiceImpl.generateDataPool(planBizNuCustomerServer); - BeanUtils.copyProperties(planBizNuCustomerServer, logisticsDirectiveEntity); - return logisticsDirectiveEntity; + BeanUtils.copyProperties(planBizNuCustomerServer, invoicingDirectiveEntity); + return invoicingDirectiveEntity; } @Override - public void editDirective(LogisticsDirectiveEntity logisticsDirectiveEntity) { + public void editDirective(InvoicingDirectiveEntity invoicingDirectiveEntity) { PlanBizNuCustomerInvoicingServer planBizNuCustomerServer = new PlanBizNuCustomerInvoicingServer(); - BeanUtils.copyProperties(logisticsDirectiveEntity,planBizNuCustomerServer); - PlanBizNuCustomerInvoicingServer entity = baseMapper.selectById(logisticsDirectiveEntity.getId()); + BeanUtils.copyProperties(invoicingDirectiveEntity,planBizNuCustomerServer); + PlanBizNuCustomerInvoicingServer entity = baseMapper.selectById(invoicingDirectiveEntity.getId()); baseMapper.updateById(planBizNuCustomerServer); //TODO 增加日志 //调用方法先删除数据池中的数据,再生成数据池中的数据 @@ -68,9 +68,9 @@ public class PlanBizNuCustomerInvoicingServerServiceImpl extends ServiceImpl