From 1801b559d1a5dd1b3360654aa4ded58d50feef51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 4 Dec 2025 09:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=B1=BB=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E6=88=90=E4=BB=93=E5=BA=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoicingDirectiveApi.java} | 14 +-- ...i.java => IInvoicingDirectivePlanApi.java} | 2 +- ...rdersApi.java => IInvoicingOrdersApi.java} | 4 +- .../datapool/entity/InvoicingDataPool.java} | 8 +- .../datapool/job/InvoicingDataPoolJob.java} | 11 ++- .../mapper/InvoicingDataPoolMapper.java | 26 ++++++ .../mapper/xml/InvoicingDataPoolMapper.xml} | 10 +-- .../service/IInvoicingDataPoolService.java} | 16 ++-- .../impl/InvoicingDataPoolServiceImpl.java} | 61 ++++++------- .../order/entity/InvoicingOrders.java} | 8 +- .../order/job/InvoicingOrdersJob.java} | 10 +-- .../order/mapper/InvoicingOrdersMapper.java | 21 +++++ .../mapper/xml/InvoicingOrdersMapper.xml} | 10 +-- .../service/IInvoicingOrdersService.java | 15 ++++ .../impl/InvoicingOrdersServiceImpl.java} | 88 +++++++++---------- .../PlanBizNuCustomerInvoicingServer.java} | 12 +-- ...lanBizNuCustomerInvoicingServerMapper.java | 15 ++++ ...lanBizNuCustomerInvoicingServerMapper.xml} | 2 +- ...anBizNuCustomerInvoicingServerService.java | 15 ++++ ...NuCustomerInvoicingServerServiceImpl.java} | 30 +++---- .../mapper/LogisticsDataPoolMapper.java | 26 ------ .../order/mapper/LogisticsOrdersMapper.java | 21 ----- .../service/ILogisticsOrdersService.java | 15 ---- ...lanBizNuCustomerLogisticsServerMapper.java | 15 ---- ...anBizNuCustomerLogisticsServerService.java | 15 ---- 25 files changed, 232 insertions(+), 238 deletions(-) rename nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/{logistics/LogisticsDirectiveApi.java => invoicing/InvoicingDirectiveApi.java} (87%) rename nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/{ILogisticsDirectivePlanApi.java => IInvoicingDirectivePlanApi.java} (90%) rename nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/{ILogisticsOrdersApi.java => IInvoicingOrdersApi.java} (52%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/datapool/entity/LogisticsDataPool.java => invoicing/datapool/entity/InvoicingDataPool.java} (94%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/datapool/job/LogisticsDataPoolJob.java => invoicing/datapool/job/InvoicingDataPoolJob.java} (66%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/InvoicingDataPoolMapper.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/datapool/mapper/xml/LogisticsDataPoolMapper.xml => invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml} (96%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/datapool/service/ILogisticsDataPoolService.java => invoicing/datapool/service/IInvoicingDataPoolService.java} (54%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/datapool/service/impl/LogisticsDataPoolServiceImpl.java => invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java} (85%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/order/entity/LogisticsOrders.java => invoicing/order/entity/InvoicingOrders.java} (96%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/order/job/LogisticsOrdersJob.java => invoicing/order/job/InvoicingOrdersJob.java} (71%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/order/mapper/xml/LogisticsOrdersMapper.xml => invoicing/order/mapper/xml/InvoicingOrdersMapper.xml} (92%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IInvoicingOrdersService.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/order/service/impl/LogisticsOrdersServiceImpl.java => invoicing/order/service/impl/InvoicingOrdersServiceImpl.java} (82%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/plan/entity/PlanBizNuCustomerLogisticsServer.java => invoicing/plan/entity/PlanBizNuCustomerInvoicingServer.java} (91%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/PlanBizNuCustomerInvoicingServerMapper.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/plan/mapper/xml/PlanBizNuCustomerLogisticsServerMapper.xml => invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml} (73%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/IPlanBizNuCustomerInvoicingServerService.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/{logistics/plan/service/impl/PlanBizNuCustomerLogisticsServerServiceImpl.java => invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java} (68%) delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/mapper/LogisticsDataPoolMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/LogisticsOrdersMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/ILogisticsOrdersService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/PlanBizNuCustomerLogisticsServerMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/IPlanBizNuCustomerLogisticsServerService.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java similarity index 87% rename from nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java rename to nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java index 513f32ed..9909a4a4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/invoicing/InvoicingDirectiveApi.java @@ -1,8 +1,8 @@ -package com.nu.modules.pad.instruction.logistics; +package com.nu.modules.pad.instruction.invoicing; import com.nu.entity.LogisticsDirectiveEntity; import com.nu.modules.care.api.IDirectiveConfigApi; -import com.nu.modules.care.api.ILogisticsDirectivePlanApi; +import com.nu.modules.care.api.IInvoicingDirectivePlanApi; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; @@ -12,25 +12,25 @@ import java.util.Map; /** -* @Description: 后勤类服务指令API +* @Description: 仓库类服务指令API * @Author: caolei * @Date: 2025-11-28 * @Version: V1.0 */ @RestController -@RequestMapping("/api/pad/logistics/directive") +@RequestMapping("/api/pad/invoicing/directive") @Slf4j -public class LogisticsDirectiveApi { +public class InvoicingDirectiveApi { @Autowired private IDirectiveConfigApi directiveConfigApi; @Autowired - private ILogisticsDirectivePlanApi logisticsDirectivePlanApi; + private IInvoicingDirectivePlanApi logisticsDirectivePlanApi; /** - * 获取后勤类服务指令树-配置数据 + * 获取仓库类服务指令树-配置数据 * * @return */ diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ILogisticsDirectivePlanApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java similarity index 90% rename from nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ILogisticsDirectivePlanApi.java rename to nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java index 941676de..dff6c71e 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ILogisticsDirectivePlanApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingDirectivePlanApi.java @@ -3,7 +3,7 @@ package com.nu.modules.care.api; import com.nu.entity.*; import java.util.Map; -public interface ILogisticsDirectivePlanApi { +public interface IInvoicingDirectivePlanApi { Map getPlanList(LogisticsDirectiveEntity logisticsDirectiveEntity); LogisticsDirectiveEntity addDirective(LogisticsDirectiveEntity logisticsDirectiveEntity); void editDirective(LogisticsDirectiveEntity logisticsDirectiveEntity); diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ILogisticsOrdersApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingOrdersApi.java similarity index 52% rename from nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ILogisticsOrdersApi.java rename to nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingOrdersApi.java index 9d9f5d2c..a297f838 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ILogisticsOrdersApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IInvoicingOrdersApi.java @@ -1,10 +1,10 @@ package com.nu.modules.care.api; /** - * @Description: 后勤类服务指令工单主表 + * @Description: 仓库类服务指令工单主表 * @Author: zmy * @Date: 2025-12-2 * @Version: V1.0 */ -public interface ILogisticsOrdersApi { +public interface IInvoicingOrdersApi { } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/entity/LogisticsDataPool.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java similarity index 94% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/entity/LogisticsDataPool.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java index d4e03e4b..0769ba97 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/entity/LogisticsDataPool.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/entity/InvoicingDataPool.java @@ -1,4 +1,4 @@ -package com.nu.modules.biz.logistics.datapool.entity; +package com.nu.modules.biz.invoicing.datapool.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -16,7 +16,7 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 后勤类服务指令数据池主表 + * @Description: 仓库类服务指令数据池主表 * @Author: caolei * @Date: 2025-11-07 * @Version: V1.0 @@ -25,8 +25,8 @@ import java.util.Date; @TableName("nu_biz_nu_logistics_directive_data_pool") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_logistics_directive_data_pool对象", description="后勤类服务指令数据池主表") -public class LogisticsDataPool implements Serializable { +@ApiModel(value="nu_biz_nu_logistics_directive_data_pool对象", description="仓库类服务指令数据池主表") +public class InvoicingDataPool implements Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.ASSIGN_ID) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/job/LogisticsDataPoolJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/job/InvoicingDataPoolJob.java similarity index 66% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/job/LogisticsDataPoolJob.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/job/InvoicingDataPoolJob.java index e573104e..2e77efa3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/job/LogisticsDataPoolJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/job/InvoicingDataPoolJob.java @@ -1,7 +1,6 @@ -package com.nu.modules.biz.logistics.datapool.job; +package com.nu.modules.biz.invoicing.datapool.job; -import com.nu.modules.biz.care.datapool.service.ICareDataPoolService; -import com.nu.modules.biz.logistics.datapool.service.ILogisticsDataPoolService; +import com.nu.modules.biz.invoicing.datapool.service.IInvoicingDataPoolService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; @@ -14,14 +13,14 @@ import org.springframework.beans.factory.annotation.Autowired; * 指令计划批量生成到指令池 */ @Slf4j -public class LogisticsDataPoolJob implements Job { +public class InvoicingDataPoolJob implements Job { @Autowired - ILogisticsDataPoolService service; + IInvoicingDataPoolService service; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - log.error("DataPoolJob:{}-{}", DateUtils.now(),"后勤类指令计划批量生成到指令池开始"); + log.error("DataPoolJob:{}-{}", DateUtils.now(),"仓库类指令计划批量生成到指令池开始"); Result result = service.generateDataPoolBatch(); log.error("DataPoolJob:{}-{}", DateUtils.now(),result.getMessage()); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/InvoicingDataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/InvoicingDataPoolMapper.java new file mode 100644 index 00000000..e46c9ed5 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/InvoicingDataPoolMapper.java @@ -0,0 +1,26 @@ +package com.nu.modules.biz.invoicing.datapool.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.invoicing.datapool.entity.InvoicingDataPool; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * @Description: 仓库类服务指令数据池管理 + * @Author: caolei + * @Date: 2025-11-07 + * @Version: V1.0 + */ +public interface InvoicingDataPoolMapper extends BaseMapper { + List queryPlanList(InvoicingDataPool dataPool); + InvoicingDataPool queryPlanById(@Param("id") String id); + InvoicingDataPool queryPoolOne(InvoicingDataPool dataPool); + void createDataPoolLog(InvoicingDataPool dataPool); + void addDataPoolLog(InvoicingDataPool dataPool); + void deleteDataPool(InvoicingDataPool dataPool); + void createOrdersLog(InvoicingDataPool dataPool); + void addOrdersLog(InvoicingDataPool dataPool); + InvoicingDataPool queryOrdersOne(InvoicingDataPool dataPool); + void deleteOrders(InvoicingDataPool dataPool); + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/mapper/xml/LogisticsDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml similarity index 96% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/mapper/xml/LogisticsDataPoolMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml index 8621ed33..013f846f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/mapper/xml/LogisticsDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/mapper/xml/InvoicingDataPoolMapper.xml @@ -1,8 +1,8 @@ - + - select id as bizId, nu_id as nuId, @@ -46,7 +46,7 @@ - select id as bizId, nu_id as nuId, @@ -74,7 +74,7 @@ where id = #{id} - select id, biz_id, @@ -231,7 +231,7 @@ ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志主表' ROW_FORMAT = Dynamic; - select id, nu_id, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/service/ILogisticsDataPoolService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/IInvoicingDataPoolService.java similarity index 54% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/service/ILogisticsDataPoolService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/IInvoicingDataPoolService.java index 022dbc18..90bbedb3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/service/ILogisticsDataPoolService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/IInvoicingDataPoolService.java @@ -1,8 +1,8 @@ -package com.nu.modules.biz.logistics.datapool.service; +package com.nu.modules.biz.invoicing.datapool.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.logistics.datapool.entity.LogisticsDataPool; -import com.nu.modules.biz.logistics.plan.entity.PlanBizNuCustomerLogisticsServer; +import com.nu.modules.biz.invoicing.datapool.entity.InvoicingDataPool; +import com.nu.modules.biz.invoicing.plan.entity.PlanBizNuCustomerInvoicingServer; import org.jeecg.common.api.vo.Result; /** @@ -11,7 +11,7 @@ import org.jeecg.common.api.vo.Result; * @Date: 2025-11-06 * @Version: V1.0 */ -public interface ILogisticsDataPoolService extends IService { +public interface IInvoicingDataPoolService extends IService { /** * 批量生成 @@ -22,19 +22,19 @@ public interface ILogisticsDataPoolService extends IService { * 单一生成 * @param planBizNuCustomerServer */ - void generateDataPool(PlanBizNuCustomerLogisticsServer planBizNuCustomerServer); + void generateDataPool(PlanBizNuCustomerInvoicingServer planBizNuCustomerServer); /** * 删除 * @param planBizNuCustomerServer */ - void deleteDataPool(PlanBizNuCustomerLogisticsServer planBizNuCustomerServer); + void deleteDataPool(PlanBizNuCustomerInvoicingServer planBizNuCustomerServer); /** * 修改 * @param planBizNuCustomerServer */ - void editDataPool(PlanBizNuCustomerLogisticsServer planBizNuCustomerServer); + void editDataPool(PlanBizNuCustomerInvoicingServer planBizNuCustomerServer); /** @@ -42,7 +42,7 @@ public interface ILogisticsDataPoolService extends IService { */ void cleanDataPool(); - Result addInstant(LogisticsDataPool dataPool); + Result addInstant(InvoicingDataPool dataPool); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/service/impl/LogisticsDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java similarity index 85% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/service/impl/LogisticsDataPoolServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java index 5c5cf1e7..2941e7ea 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/datapool/service/impl/LogisticsDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/datapool/service/impl/InvoicingDataPoolServiceImpl.java @@ -1,16 +1,13 @@ -package com.nu.modules.biz.logistics.datapool.service.impl; +package com.nu.modules.biz.invoicing.datapool.service.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.logistics.datapool.entity.LogisticsDataPool; -import com.nu.modules.biz.logistics.datapool.mapper.LogisticsDataPoolMapper; -import com.nu.modules.biz.logistics.datapool.service.ILogisticsDataPoolService; -import com.nu.modules.biz.logistics.plan.entity.PlanBizNuCustomerLogisticsServer; -import com.nu.modules.sysconfig.ISysConfigApi; +import com.nu.modules.biz.invoicing.datapool.entity.InvoicingDataPool; +import com.nu.modules.biz.invoicing.datapool.mapper.InvoicingDataPoolMapper; +import com.nu.modules.biz.invoicing.datapool.service.IInvoicingDataPoolService; +import com.nu.modules.biz.invoicing.plan.entity.PlanBizNuCustomerInvoicingServer; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,21 +17,21 @@ import java.util.Date; import java.util.List; /** - * @Description: 后勤类服务指令数据池管理 + * @Description: 仓库类服务指令数据池管理 * @Author: caolei * @Date: 2025-11-07 * @Version: V1.0 */ @Service @Slf4j -public class LogisticsDataPoolServiceImpl extends ServiceImpl implements ILogisticsDataPoolService { +public class InvoicingDataPoolServiceImpl extends ServiceImpl implements IInvoicingDataPoolService { /** * 批量生成数据池 */ @Override public Result generateDataPoolBatch() { - LogisticsDataPool entity = new LogisticsDataPool(); + InvoicingDataPool entity = new InvoicingDataPool(); Calendar c = Calendar.getInstance(); c.set(Calendar.SECOND,0); c.set(Calendar.MILLISECOND,0); @@ -42,10 +39,10 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl planList = baseMapper.queryPlanList(entity);//获取计划 + List planList = baseMapper.queryPlanList(entity);//获取计划 if(planList.size()>0){ - for(LogisticsDataPool plan : planList){ - LogisticsDataPool pool = baseMapper.queryPoolOne(plan); + for(InvoicingDataPool plan : planList){ + InvoicingDataPool pool = baseMapper.queryPoolOne(plan); if(pool!=null){ continue; } @@ -62,7 +59,7 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl addInstant(LogisticsDataPool dataPool){ + public Result addInstant(InvoicingDataPool dataPool){ Calendar c = Calendar.getInstance(); c.set(Calendar.MILLISECOND,0); c.set(Calendar.SECOND,0); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/entity/LogisticsOrders.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java similarity index 96% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/entity/LogisticsOrders.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java index e9fbf69f..3fca8462 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/entity/LogisticsOrders.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java @@ -1,4 +1,4 @@ -package com.nu.modules.biz.logistics.order.entity; +package com.nu.modules.biz.invoicing.order.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -16,7 +16,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 后勤类服务指令工单表 + * @Description: 仓库类服务指令工单表 * @Author: caolei * @Date: 2025-12-1 * @Version: V1.0 @@ -25,8 +25,8 @@ import java.util.Date; @TableName("nu_biz_nu_logistics_directive_order") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_logistics_directive_order对象", description="后勤类服务指令工单表") -public class LogisticsOrders implements Serializable { +@ApiModel(value="nu_biz_nu_logistics_directive_order对象", description="仓库类服务指令工单表") +public class InvoicingOrders implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/job/LogisticsOrdersJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/job/InvoicingOrdersJob.java similarity index 71% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/job/LogisticsOrdersJob.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/job/InvoicingOrdersJob.java index 2a6c8480..1b25b01c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/job/LogisticsOrdersJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/job/InvoicingOrdersJob.java @@ -1,6 +1,6 @@ -package com.nu.modules.biz.logistics.order.job; +package com.nu.modules.biz.invoicing.order.job; -import com.nu.modules.biz.logistics.order.service.ILogisticsOrdersService; +import com.nu.modules.biz.invoicing.order.service.IInvoicingOrdersService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; @@ -13,14 +13,14 @@ import org.springframework.beans.factory.annotation.Autowired; * 指令池批量生成工单 */ @Slf4j -public class LogisticsOrdersJob implements Job { +public class InvoicingOrdersJob implements Job { @Autowired - ILogisticsOrdersService service; + IInvoicingOrdersService service; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - log.error("OrdersJob:{}-{}", DateUtils.now(),"后勤类指令池批量生成工单开始"); + log.error("OrdersJob:{}-{}", DateUtils.now(),"仓库类指令池批量生成工单开始"); Result result = service.generateOrdersBatch(); log.error("OrdersJob:{}-{}", DateUtils.now(),result.getMessage()); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java new file mode 100644 index 00000000..b41a62be --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java @@ -0,0 +1,21 @@ +package com.nu.modules.biz.invoicing.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 仓库类服务指令工单主表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +public interface InvoicingOrdersMapper extends BaseMapper { + List queryDataPoolList(InvoicingOrders orders); + List getEmpPermissionAndOnline(@Param("directiveId") String directiveId, @Param("startTime") Date startTime); + InvoicingOrders getEmpOrderly(@Param("customerId") String customerId); + List getPermissionEmps(@Param("directiveIds") String directiveIds); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/xml/LogisticsOrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml similarity index 92% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/xml/LogisticsOrdersMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml index 79464536..e671cdce 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/xml/LogisticsOrdersMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml @@ -1,8 +1,8 @@ - + - select a.id as poolId, a.biz_id as bizId, @@ -37,7 +37,7 @@ order by a.start_time,orderEmp,a.nu_id - select distinct a.id as employeeId, @@ -82,13 +82,13 @@ - select orderly as employeeIds from nu_biz_elder_info where id = #{customerId} - select a.id as employeeId,count(*) as ownCn from nu_biz_employees_info a inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IInvoicingOrdersService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IInvoicingOrdersService.java new file mode 100644 index 00000000..3ab2aeee --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/IInvoicingOrdersService.java @@ -0,0 +1,15 @@ +package com.nu.modules.biz.invoicing.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders; +import org.jeecg.common.api.vo.Result; + +/** + * @Description: 仓库类服务指令工单主表 + * @Author: caolei + * @Date: 2025-12-1 + * @Version: V1.0 + */ +public interface IInvoicingOrdersService extends IService { + Result generateOrdersBatch(); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/impl/LogisticsOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java similarity index 82% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/impl/LogisticsOrdersServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java index 91171fe3..283651a6 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/impl/LogisticsOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java @@ -1,18 +1,16 @@ -package com.nu.modules.biz.logistics.order.service.impl; +package com.nu.modules.biz.invoicing.order.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.order.entity.CareOrders; -import com.nu.modules.biz.logistics.order.entity.LogisticsOrders; -import com.nu.modules.biz.logistics.order.mapper.LogisticsOrdersMapper; -import com.nu.modules.biz.logistics.order.service.ILogisticsOrdersService; -import com.nu.modules.care.api.ILogisticsOrdersApi; +import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders; +import com.nu.modules.biz.invoicing.order.mapper.InvoicingOrdersMapper; +import com.nu.modules.biz.invoicing.order.service.IInvoicingOrdersService; +import com.nu.modules.care.api.IInvoicingOrdersApi; import com.nu.modules.config.sendorderpriority.entity.SendOrderRule; import com.nu.modules.config.sendorderpriority.entity.SendOrderRuleSub; import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleService; import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleSubService; -import com.nu.modules.mediamanage.entity.MediaManage; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; @@ -22,14 +20,14 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 后勤类服务指令工单主表 + * @Description: 仓库类服务指令工单主表 * @Author: caolei * @Date: 2025-12-1 * @Version: V1.0 */ @Service @Slf4j -public class LogisticsOrdersServiceImpl extends ServiceImpl implements ILogisticsOrdersService, ILogisticsOrdersApi { +public class InvoicingOrdersServiceImpl extends ServiceImpl implements IInvoicingOrdersService, IInvoicingOrdersApi { @Autowired ISendOrderRuleService sendOrderRuleService; @@ -60,7 +58,7 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl getEmpPermissionAndOnline(String directiveId, Date startTime) { + private List getEmpPermissionAndOnline(String directiveId, Date startTime) { return baseMapper.getEmpPermissionAndOnline(directiveId, startTime); } @@ -72,7 +70,7 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl getEmpOrderly(String customerId) { Map map = null; - LogisticsOrders orders = baseMapper.getEmpOrderly(customerId); + InvoicingOrders orders = baseMapper.getEmpOrderly(customerId); if (orders != null) { String empIds = orders.getEmployeeIds(); if (empIds != null && !empIds.equals("")) { @@ -97,9 +95,9 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl generateOrdersBatch() { //获取派单规则 getSendOrderRule(); - List ordersList = baseMapper.queryDataPoolList(null); + List ordersList = baseMapper.queryDataPoolList(null); for (int i = 0; i < ordersList.size(); i++) { - LogisticsOrders orders = ordersList.get(i); + InvoicingOrders orders = ordersList.get(i); generateOrders(orders); } return Result.OK(); @@ -110,9 +108,9 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList = getEmpPermissionAndOnline(directiveId, startTime); + private InvoicingOrders getByPriority(String directiveId, String customerId, Date startTime) { + List empList = getEmpPermissionAndOnline(directiveId, startTime); if (empList.size() > 0) { if(ruleSubList.size()>0){ for(SendOrderRuleSub ruleSub : ruleSubList){ @@ -197,11 +195,11 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList = getEmpPermissionAndOnline(directiveId,startTime); + private InvoicingOrders getByHeadCount(String directiveId, String customerId, Date startTime) { + List empList = getEmpPermissionAndOnline(directiveId,startTime); if (empList.size() > 0) { for(int i=0;i empList,Integer coefficient) { + public void sortByIzFree(List empList, Integer coefficient) { for (int i = 0; i < empList.size(); i++) { - LogisticsOrders emp = empList.get(i); + InvoicingOrders emp = empList.get(i); if (emp.getIzFree().equals(1)) { Integer empLevel = emp.getLevel(); empLevel = empLevel + empList.size() * coefficient; //提高5N等级 @@ -270,9 +268,9 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,Integer coefficient,String customerId) { + public void sortByOrderly(List empList, Integer coefficient, String customerId) { for (int i = 0; i < empList.size(); i++) { - LogisticsOrders emp = empList.get(i); + InvoicingOrders emp = empList.get(i); String employeeId = emp.getEmployeeId(); Map orderlyMap = getEmpOrderly(customerId); if (orderlyMap != null) { @@ -291,10 +289,10 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,Integer coefficient) { + public void sortByNumAndSetLevel(List empList, Integer coefficient) { // 根据orderNum倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(LogisticsOrders::getOrderNum).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(InvoicingOrders::getOrderNum).reversed()) .collect(Collectors.toList()); // 为level字段顺序赋值1,2,3... @@ -314,10 +312,10 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,Integer coefficient) { + public void sortByPriceAndSetLevel(List empList, Integer coefficient) { // 根据totalComPrice倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(LogisticsOrders::getTotalComPrice).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(InvoicingOrders::getTotalComPrice).reversed()) .collect(Collectors.toList()); // 为level字段顺序赋值1,2,3... @@ -337,10 +335,10 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,Integer coefficient) { + public void sortByDurationAndSetLevel(List empList, Integer coefficient) { // 根据totalDuration倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(LogisticsOrders::getTotalDuration).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(InvoicingOrders::getTotalDuration).reversed()) .collect(Collectors.toList()); // 为level字段顺序赋值1,2,3... @@ -360,11 +358,11 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,Integer coefficient) { + public void sortByMaxTimeAndSetLevel(List empList, Integer coefficient) { // 根据maxTime倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() + List sortedEmployees = empList.stream() .sorted(Comparator.comparing( - LogisticsOrders::getMaxTime, + InvoicingOrders::getMaxTime, Comparator.nullsLast(Comparator.reverseOrder()) )) .collect(Collectors.toList()); @@ -386,7 +384,7 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,Integer coefficient) { + public void sortByLimit(List empList, Integer coefficient) { for (int i = 0; i < empList.size(); i++) { //工单超出接单上限，降4N级 if (empList.get(i).getOwnCn() >= empList.get(i).getOrderCap()) { @@ -401,10 +399,10 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList) { + public void sortEmpList(List empList) { //为level顺序 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(LogisticsOrders::getLevel).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(InvoicingOrders::getLevel).reversed()) .collect(Collectors.toList()); // 如果需要返回新列表，可以返回sortedEmployees // 如果要在原列表上修改，可以清空原列表并添加所有元素 @@ -417,10 +415,10 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl empList,String customerId) { - List newList = new ArrayList(); + public void getByOrderly(List empList, String customerId) { + List newList = new ArrayList(); for (int i = 0; i < empList.size(); i++) { - LogisticsOrders emp = empList.get(i); + InvoicingOrders emp = empList.get(i); String employeeId = emp.getEmployeeId(); Map orderlyMap = getEmpOrderly(customerId); if (orderlyMap != null) { @@ -434,7 +432,7 @@ public class LogisticsOrdersServiceImpl extends ServiceImpl serverList; + private List serverList; /**即时服务指令列表**/ @TableField(exist = false) private List instantList; @@ -128,6 +128,6 @@ public class PlanBizNuCustomerLogisticsServer implements Serializable { private List tagList; /**服务包中的服务列表**/ @TableField(exist = false) - private List directivesList; + private List directivesList; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/PlanBizNuCustomerInvoicingServerMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/PlanBizNuCustomerInvoicingServerMapper.java new file mode 100644 index 00000000..e678bdf7 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/PlanBizNuCustomerInvoicingServerMapper.java @@ -0,0 +1,15 @@ +package com.nu.modules.biz.invoicing.plan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.invoicing.plan.entity.PlanBizNuCustomerInvoicingServer; +import org.apache.ibatis.annotations.Param; + +/** + * @Description: 护理单元客户仓库类服务指令计划 + * @Author: caolei + * @Date: 2025-11-28 + * @Version: V1.0 + */ +public interface PlanBizNuCustomerInvoicingServerMapper extends BaseMapper { + int deleteByIdPhysic(@Param("id") String id); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/xml/PlanBizNuCustomerLogisticsServerMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml similarity index 73% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/xml/PlanBizNuCustomerLogisticsServerMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml index e80d826b..d4a4b4ec 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/xml/PlanBizNuCustomerLogisticsServerMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/mapper/xml/PlanBizNuCustomerInvoicingServerMapper.xml @@ -1,6 +1,6 @@ - + delete from nu_biz_nu_customer_care_server where id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/IPlanBizNuCustomerInvoicingServerService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/IPlanBizNuCustomerInvoicingServerService.java new file mode 100644 index 00000000..94a1828c --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/IPlanBizNuCustomerInvoicingServerService.java @@ -0,0 +1,15 @@ +package com.nu.modules.biz.invoicing.plan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.invoicing.plan.entity.PlanBizNuCustomerInvoicingServer; + + +/** + * @Description: 护理单元客户仓库类服务指令计划 + * @Author: caolei + * @Date: 2025-11-28 + * @Version: V1.0 + */ +public interface IPlanBizNuCustomerInvoicingServerService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/impl/PlanBizNuCustomerLogisticsServerServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java similarity index 68% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/impl/PlanBizNuCustomerLogisticsServerServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java index f8211bfa..50df032f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/impl/PlanBizNuCustomerLogisticsServerServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/plan/service/impl/PlanBizNuCustomerInvoicingServerServiceImpl.java @@ -1,14 +1,14 @@ -package com.nu.modules.biz.logistics.plan.service.impl; +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.modules.biz.logistics.datapool.service.ILogisticsDataPoolService; -import com.nu.modules.biz.logistics.plan.entity.PlanBizNuCustomerLogisticsServer; -import com.nu.modules.biz.logistics.plan.mapper.PlanBizNuCustomerLogisticsServerMapper; -import com.nu.modules.biz.logistics.plan.service.IPlanBizNuCustomerLogisticsServerService; -import com.nu.modules.care.api.ILogisticsDirectivePlanApi; +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; +import com.nu.modules.biz.invoicing.plan.service.IPlanBizNuCustomerInvoicingServerService; +import com.nu.modules.care.api.IInvoicingDirectivePlanApi; import com.nu.modules.sysconfig.ISysConfigApi; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -18,34 +18,34 @@ import java.util.List; import java.util.Map; /** - * @Description: 护理单元客户后勤类服务指令计划 + * @Description: 护理单元客户仓库类服务指令计划 * @Author: caolei * @Date: 2025-11-28 * @Version: V1.0 */ @Service -public class PlanBizNuCustomerLogisticsServerServiceImpl extends ServiceImpl implements IPlanBizNuCustomerLogisticsServerService, ILogisticsDirectivePlanApi { +public class PlanBizNuCustomerInvoicingServerServiceImpl extends ServiceImpl implements IPlanBizNuCustomerInvoicingServerService, IInvoicingDirectivePlanApi { @Autowired private ISysConfigApi sysConfigApi; @Autowired - private ILogisticsDataPoolService dataPoolServiceImpl; + private IInvoicingDataPoolService dataPoolServiceImpl; @Override public Map getPlanList(LogisticsDirectiveEntity logisticsDirectiveEntity) { Map resMap = new HashMap<>(); //服务指令计划 - QueryWrapper PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); + QueryWrapper PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(logisticsDirectiveEntity.getNuId()), "nu_id", logisticsDirectiveEntity.getNuId()); PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(logisticsDirectiveEntity.getCustomerId()), "customer_id", logisticsDirectiveEntity.getCustomerId()); - List groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper); + List groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper); resMap.put("serviceList", groupList);//服务指令计划 return resMap; } @Override public LogisticsDirectiveEntity addDirective(LogisticsDirectiveEntity logisticsDirectiveEntity) { - PlanBizNuCustomerLogisticsServer planBizNuCustomerServer = new PlanBizNuCustomerLogisticsServer(); + PlanBizNuCustomerInvoicingServer planBizNuCustomerServer = new PlanBizNuCustomerInvoicingServer(); BeanUtils.copyProperties(logisticsDirectiveEntity,planBizNuCustomerServer); baseMapper.insert(planBizNuCustomerServer); //TODO 增加日志 @@ -58,9 +58,9 @@ public class PlanBizNuCustomerLogisticsServerServiceImpl extends ServiceImpl { - List queryPlanList(LogisticsDataPool dataPool); - LogisticsDataPool queryPlanById(@Param("id") String id); - LogisticsDataPool queryPoolOne(LogisticsDataPool dataPool); - void createDataPoolLog(LogisticsDataPool dataPool); - void addDataPoolLog(LogisticsDataPool dataPool); - void deleteDataPool(LogisticsDataPool dataPool); - void createOrdersLog(LogisticsDataPool dataPool); - void addOrdersLog(LogisticsDataPool dataPool); - LogisticsDataPool queryOrdersOne(LogisticsDataPool dataPool); - void deleteOrders(LogisticsDataPool dataPool); - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/LogisticsOrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/LogisticsOrdersMapper.java deleted file mode 100644 index 39b07c67..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/mapper/LogisticsOrdersMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.nu.modules.biz.logistics.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.logistics.order.entity.LogisticsOrders; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @Description: 后勤类服务指令工单主表 - * @Author: caolei - * @Date: 2025-11-18 - * @Version: V1.0 - */ -public interface LogisticsOrdersMapper extends BaseMapper { - List queryDataPoolList(LogisticsOrders orders); - List getEmpPermissionAndOnline(@Param("directiveId") String directiveId, @Param("startTime") Date startTime); - LogisticsOrders getEmpOrderly(@Param("customerId") String customerId); - List getPermissionEmps(@Param("directiveIds") String directiveIds); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/ILogisticsOrdersService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/ILogisticsOrdersService.java deleted file mode 100644 index 5a8e08f5..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/order/service/ILogisticsOrdersService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.biz.logistics.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.logistics.order.entity.LogisticsOrders; -import org.jeecg.common.api.vo.Result; - -/** - * @Description: 后勤类服务指令工单主表 - * @Author: caolei - * @Date: 2025-12-1 - * @Version: V1.0 - */ -public interface ILogisticsOrdersService extends IService { - Result generateOrdersBatch(); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/PlanBizNuCustomerLogisticsServerMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/PlanBizNuCustomerLogisticsServerMapper.java deleted file mode 100644 index f26bd8f7..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/mapper/PlanBizNuCustomerLogisticsServerMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.biz.logistics.plan.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.logistics.plan.entity.PlanBizNuCustomerLogisticsServer; -import org.apache.ibatis.annotations.Param; - -/** - * @Description: 护理单元客户后勤类服务指令计划 - * @Author: caolei - * @Date: 2025-11-28 - * @Version: V1.0 - */ -public interface PlanBizNuCustomerLogisticsServerMapper extends BaseMapper { - int deleteByIdPhysic(@Param("id") String id); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/IPlanBizNuCustomerLogisticsServerService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/IPlanBizNuCustomerLogisticsServerService.java deleted file mode 100644 index fd43d9ea..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/logistics/plan/service/IPlanBizNuCustomerLogisticsServerService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.biz.logistics.plan.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.logistics.plan.entity.PlanBizNuCustomerLogisticsServer; - - -/** - * @Description: 护理单元客户后勤类服务指令计划 - * @Author: caolei - * @Date: 2025-11-28 - * @Version: V1.0 - */ -public interface IPlanBizNuCustomerLogisticsServerService extends IService { - -}