From 9c96c55158050de1dfdcf799615a823293083f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 16 Jan 2026 16:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B1=A0=E7=BC=A9=E5=87=8F=E6=97=A0=E7=94=A8=E5=86=97?= =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datapool/entity/DirectiveDataPoolSub.java | 109 ------- .../mapper/DirectiveDataPoolMapper.java | 5 - .../mapper/DirectiveDataPoolSubMapper.java | 16 -- .../mapper/InvoicingDataPoolMapper.java | 1 + .../mapper/LogisticsDataPoolMapper.java | 1 + .../mapper/xml/CareDataPoolMapper.xml | 10 +- .../mapper/xml/DirectiveDataPoolMapper.xml | 155 ---------- .../mapper/xml/DirectiveDataPoolSubMapper.xml | 59 ---- .../mapper/xml/InvoicingDataPoolMapper.xml | 82 +++--- .../mapper/xml/LogisticsDataPoolMapper.xml | 86 +++--- .../service/IDirectiveDataPoolService.java | 2 - .../service/IDirectiveDataPoolSubService.java | 16 -- .../service/impl/CareDataPoolServiceImpl.java | 173 +---------- .../impl/DirectiveDataPoolServiceImpl.java | 64 ----- .../impl/DirectiveDataPoolSubServiceImpl.java | 30 -- .../impl/InvoicingDataPoolServiceImpl.java | 262 +++-------------- .../impl/LogisticsDataPoolServiceImpl.java | 268 +++--------------- 17 files changed, 172 insertions(+), 1167 deletions(-) delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolSubMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolSubMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolSubService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/DirectiveDataPoolSubServiceImpl.java diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java deleted file mode 100644 index 44a3db2e..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPoolSub.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.nu.modules.biz.datapool.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 服务指令数据池子表 - * @Author: caolei - * @Date: 2026-1-6 - * @Version: V1.0 - */ -@Data -@TableName("nu_biz_nu_directive_data_pool_sub") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_directive_data_pool对象", description="服务指令数据池子表") -public class DirectiveDataPoolSub implements Serializable { - private static final long serialVersionUID = 1L; - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - /**数据池类型 1护理;2医疗:3仓库;4行政*/ - private String poolType; - /**主表id*/ - private String mainId; - /**护理单元id*/ - private String nuId; - /**护理单元名称*/ - private String nuName; - /**长者id*/ - private String elderId; - /**长者姓名*/ - private String elderName; - /**分类标签id*/ - private String instructionTagId; - /**分类标签*/ - private String instructionTagName; - /**服务类别id*/ - private String categoryId; - /**服务类别名称*/ - private String categoryName; - /**服务类型id*/ - private String typeId; - /**服务类型名称*/ - private String typeName; - /**服务指令id*/ - private String directiveId; - /**服务指令名称*/ - private String directiveName; - /**指令类型ID*/ - private String cycleTypeId; - /**指令类型*/ - private String cycleType; - /**周期值*/ - private String cycleValue; - /**服务指令图片大图*/ - private String previewFile; - private String netPreviewFile; - /**服务指令图片小图*/ - private String previewFileSmall; - private String netPreviewFileSmall; - /**指令音频文件*/ - private String mp3File; - private String netMp3File; - /**指令视频文件*/ - private String mp4File; - private String netMp4File; - /**服务时长（分钟）*/ - private String serviceDuration; - /**服务描述*/ - private String serviceContent; - /**指令包id*/ - private String packageId; - /**指令包名称*/ - private String packageName; - /**是否是服务指令包 Y是 N否*/ - private String izPackage; - /**开始时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date startTime; - /**结束时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date endTime; - /**创建人*/ - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date createTime; - /**更新人*/ - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date updateTime; - /**是否删除 0未删除 1删除*/ - private String delFlag; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolMapper.java index c9d5066c..28b55f41 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolMapper.java @@ -17,19 +17,14 @@ public interface DirectiveDataPoolMapper extends BaseMapper { DirectiveDataPool queryPoolOne(DirectiveDataPool dataPool); void createDataPoolLog(DirectiveDataPool dataPool); - void createDataPoolLogSub(DirectiveDataPool dataPool); void addDataPoolLog(DirectiveDataPool dataPool); - void addDataPoolSubLog(DirectiveDataPool dataPool); void deleteDataPool(DirectiveDataPool dataPool); - void deleteDataPoolSub(DirectiveDataPool dataPool); void createOrdersLog(DirectiveDataPool dataPool); - void createOrdersLogSub(DirectiveDataPool dataPool); void addOrdersLog(DirectiveDataPool dataPool); - void addOrdersSubLog(DirectiveDataPool dataPool); DirectiveDataPool queryOrdersOne(DirectiveDataPool dataPool); void deleteOrders(DirectiveDataPool dataPool); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolSubMapper.java deleted file mode 100644 index 53747fd5..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/DirectiveDataPoolSubMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nu.modules.biz.datapool.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.datapool.entity.DirectiveDataPoolSub; -import java.util.List; - -/** - * @Description: 服务指令数据池管理子表 - * @Author: caolei - * @Date: 2026-1-6 - * @Version: V1.0 - */ -public interface DirectiveDataPoolSubMapper extends BaseMapper { - DirectiveDataPoolSub queryDirectiveOne(DirectiveDataPoolSub dataPoolSub); - List queryDirectiveList(DirectiveDataPoolSub dataPoolSub); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/InvoicingDataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/InvoicingDataPoolMapper.java index 7ff6d8fd..85d7fb7d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/InvoicingDataPoolMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/InvoicingDataPoolMapper.java @@ -15,4 +15,5 @@ import java.util.List; public interface InvoicingDataPoolMapper extends BaseMapper { List queryPlanList(DirectiveDataPool dataPool); DirectiveDataPool queryPlanById(@Param("id") String id); + int getOrderOptCount(DirectiveDataPool dataPool); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/LogisticsDataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/LogisticsDataPoolMapper.java index b43ec43c..1f2b2eaf 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/LogisticsDataPoolMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/LogisticsDataPoolMapper.java @@ -15,4 +15,5 @@ import java.util.List; public interface LogisticsDataPoolMapper extends BaseMapper { List queryPlanList(DirectiveDataPool dataPool); DirectiveDataPool queryPlanById(@Param("id") String id); + int getOrderOptCount(DirectiveDataPool dataPool); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml index 688f71bd..91835fee 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/CareDataPoolMapper.xml @@ -4,13 +4,14 @@ select + '1' as poolType, a.id as bizId, a.nu_id as nuId, a.directive_id as directiveId, - a.iz_package as izPackage, - CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, a.cycle_type_id as cycleTypeId, a.cycle_value as cycleValue, + a.iz_package as izPackage, + CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, a.opt_time as optTime, a.opt_count as optCount from nu_biz_nu_care_directive_plan a diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index 67197fb2..558db4a0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -44,29 +44,11 @@ pool_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据池类型 1护理;2医疗:3仓库;4行政', biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_nu_care_directive_plan.id;即时指令计划ID,nu_biz_nu_care_directive_plan_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 '护理单元名称', - elder_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者ID，nu_biz_elder_info.id', - elder_name varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者名称', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', - directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型', cycle_value varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期值', - preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图', - net_preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图-网络地址', - preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图', - net_preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图-网络地址', - mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件', - net_mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件-网络地址', - mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件', - net_mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件-网络地址', - service_duration varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务时长（分钟）', - service_content varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务说明', - package_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包ID', - package_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包名称', iz_package varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是服务指令包 Y是 N否', start_time datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - end_time datetime(0) NULL DEFAULT NULL COMMENT '结束时间', iz_orders varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否生成工单 Y是 N否', iz_start varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否开始 Y是 N否', create_by varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -79,51 +61,6 @@ ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-数据池日志主表' ROW_FORMAT = Dynamic; - - CREATE TABLE IF NOT EXISTS ${tableName} ( - id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - pool_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据池类型 1护理;2医疗:3仓库;4行政', - main_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主表ID，nu_biz_nu_directive_data_pool.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 '护理单元名称', - elder_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者ID，nu_biz_elder_info.id', - elder_name varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者名称', - instruction_tag_id varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类标签', - instruction_tag_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类标签名称', - category_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类别ID，nu_config_service_category.id', - category_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类别名称', - type_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型ID，nu_config_service_type.id', - type_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型名称', - directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', - directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', - cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型', - cycle_value varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期值', - preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图', - net_preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图-网络地址', - preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图', - net_preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图-网络地址', - mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件', - net_mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件-网络地址', - mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件', - net_mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件-网络地址', - service_duration varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务时长（分钟）', - service_content varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务说明', - package_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包ID', - package_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包名称', - iz_package varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是服务指令包 Y是 N否', - start_time datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - end_time datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - create_by varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', - create_time datetime(0) NULL DEFAULT NULL COMMENT '创建日期', - update_by varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', - update_time datetime(0) NULL DEFAULT NULL COMMENT '更新日期', - del_flag varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否删除 0未删除 1删除', - operation_flag varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作标记 1正常删除入库 2撤回删除入库', - PRIMARY KEY (id) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-数据池日志子表' ROW_FORMAT = Dynamic; - - insert into ${tableName} select a.*,#{operationFlag} @@ -138,20 +75,6 @@ - - insert into ${tableName} - select a.*,#{operationFlag} - from nu_biz_nu_directive_data_pool_sub a - - - AND main_id = #{id} - - - AND a.create_time <= #{endTime} - - - - delete from nu_biz_nu_directive_data_pool a @@ -164,18 +87,6 @@ - - delete from nu_biz_nu_directive_data_pool_sub a - - - AND main_id = #{id} - - - AND a.create_time <= #{endTime} - - - - CREATE TABLE IF NOT EXISTS ${tableName} ( id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', @@ -234,65 +145,6 @@ ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志主表' ROW_FORMAT = Dynamic; - - CREATE TABLE IF NOT EXISTS ${tableName} ( - id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - order_no varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - order_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '工单类型 1护理;2医疗:3仓库;4行政', - main_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主表ID，nu_biz_nu_directive_data_pool.id', - pool_sub_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据池子表ID，nu_biz_nu_directive_data_pool_sub.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 '护理单元名称', - elder_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者ID，nu_biz_elder_info.id', - elder_name varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '长者名称', - employee_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '员工ID', - employee_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '员工姓名', - instruction_tag_id varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类标签', - instruction_tag_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类标签名称', - category_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类别ID，nu_config_service_category.id', - category_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类别名称', - type_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型ID，nu_config_service_type.id', - type_name varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型名称', - directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', - directive_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令名称', - cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', - cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型', - cycle_value varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期值', - preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图', - net_preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图-网络地址', - preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图', - net_preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图-网络地址', - mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件', - net_mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件-网络地址', - mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件', - net_mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件-网络地址', - service_duration varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务时长（分钟）', - service_content varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务说明', - toll_price decimal(12, 4) NULL DEFAULT NULL COMMENT '收费价格', - com_price decimal(12, 4) NULL DEFAULT NULL COMMENT '收费价格', - real_com_price decimal(12, 4) NULL DEFAULT NULL COMMENT '收费价格', - package_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包ID', - package_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包名称', - iz_package varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是服务指令包 Y是 N否', - start_time datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - end_time datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - begin_time datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - finish_time datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - iz_start varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否开始 Y是 N否', - iz_finish varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否开始 Y是 N否', - create_by varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', - create_time datetime(0) NULL DEFAULT NULL COMMENT '创建日期', - update_by varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', - update_time datetime(0) NULL DEFAULT NULL COMMENT '更新日期', - del_flag varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否删除 0未删除 1删除', - tplink_path varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'tplink下载地址', - manually_pic_path text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手动拍照', - manually_mp4_path text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手动录制', - remarks varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - PRIMARY KEY (id) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志子表' ROW_FORMAT = Dynamic; - - - select - a.instruction_tag_id as instructionTagId, - b.instruction_name as instructionTagName, - a.category_id as categoryId, - c.category_name AS categoryName, - a.type_id as typeId, - d.type_name as typeName, - a.id as directiveId, - a.directive_name as directiveName, - a.cycle_type as cycleTypeId, - f.item_text AS cycleType, - a.preview_file as previewFile, - a.preview_file_small as previewFileSmall, - a.mp3_file as mp3File, - a.mp4_file as mp4File, - a.service_duration as serviceDuration, - a.service_content as serviceContent - from nu_config_service_directive a - left join nu_config_service_instruction_tag b on a.instruction_tag_id = b.id - left join nu_config_service_category c on a.category_id = c.id - left join nu_config_service_type d on a.type_id = d.id - left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = a.cycle_type - where a.id = #{directiveId} - - - - - \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml index 8ff58bc0..f7c44538 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/InvoicingDataPoolMapper.xml @@ -4,29 +4,16 @@ select - id as bizId, - nu_id as nuId, - nu_name as nuName, - (case when iz_package = 'Y' then '' else directive_id end) as directiveId, - (case when iz_package = 'Y' then '' else directive_name end) as directiveName, - (case when iz_package = 'Y' then directive_id else '' end) as packageId, - (case when iz_package = 'Y' then directive_name else '' end) as packageName, - iz_package as izPackage, - CONCAT(CURDATE(), ' ',STR_TO_DATE(start_time, '%H:%i')) as startTime, - CONCAT(CURDATE(), ' ',STR_TO_DATE(end_time, '%H:%i')) as endTime, - cycle_type_id as cycleTypeId, - cycle_type as cycleType, - cycle_value as cycleValue, - preview_file as previewFile, - net_preview_file as netPreviewFile, - preview_file_small as previewFileSmall, - net_preview_file_small as netPreviewFileSmall, - mp3_file as mp3File, - net_mp3_file as netMp3File, - mp4_file as mp4File, - net_mp4_file as netMp4File, - service_duration as serviceDuration, - service_content as serviceContent + '3' as poolType, + a.id as bizId, + a.nu_id as nuId, + a.directive_id as directiveId, + a.cycle_type_id as cycleTypeId, + a.cycle_value as cycleValue, + a.iz_package as izPackage, + CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, + a.opt_time as optTime, + a.opt_count as optCount from nu_biz_nu_invoicing_directive_plan where id = #{id} + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml index dc947523..443e4b6d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/LogisticsDataPoolMapper.xml @@ -4,31 +4,16 @@ select - id as bizId, - nu_id as nuId, - nu_name as nuName, - elder_id as elderId, - elder_name as elderName, - (case when iz_package = 'Y' then '' else directive_id end) as directiveId, - (case when iz_package = 'Y' then '' else directive_name end) as directiveName, - (case when iz_package = 'Y' then directive_id else '' end) as packageId, - (case when iz_package = 'Y' then directive_name else '' end) as packageName, - iz_package as izPackage, - CONCAT(CURDATE(), ' ',STR_TO_DATE(start_time, '%H:%i')) as startTime, - CONCAT(CURDATE(), ' ',STR_TO_DATE(end_time, '%H:%i')) as endTime, - cycle_type_id as cycleTypeId, - cycle_type as cycleType, - cycle_value as cycleValue, - preview_file as previewFile, - net_preview_file as netPreviewFile, - preview_file_small as previewFileSmall, - net_preview_file_small as netPreviewFileSmall, - mp3_file as mp3File, - net_mp3_file as netMp3File, - mp4_file as mp4File, - net_mp4_file as netMp4File, - service_duration as serviceDuration, - service_content as serviceContent + '4' as poolType, + a.id as bizId, + a.nu_id as nuId, + a.directive_id as directiveId, + a.cycle_type_id as cycleTypeId, + a.cycle_value as cycleValue, + a.iz_package as izPackage, + CONCAT(CURDATE(), ' ',STR_TO_DATE(a.start_time, '%H:%i')) as startTime, + a.opt_time as optTime, + a.opt_count as optCount from nu_biz_nu_logistics_directive_plan where id = #{id} + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolService.java index b79001e8..fa36dff0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolService.java @@ -19,8 +19,6 @@ public interface IDirectiveDataPoolService extends IService { void addDataPoolLog(String dateStr,String id); - void addDataPoolSubLog(String dateStr,String id); - /** * 清理 */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolSubService.java deleted file mode 100644 index 0043838d..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IDirectiveDataPoolSubService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nu.modules.biz.datapool.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.datapool.entity.DirectiveDataPoolSub; -import java.util.List; - -/** - * @Description: 服务指令数据池管理子表 - * @Author: caolei - * @Date: 2026-1-6 - * @Version: V1.0 - */ -public interface IDirectiveDataPoolSubService extends IService { - DirectiveDataPoolSub queryDirectiveOne(DirectiveDataPoolSub dataPoolSub); - List queryDirectiveList(DirectiveDataPoolSub dataPoolSub); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java index ebbf1689..7f51125b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java @@ -1,23 +1,16 @@ package com.nu.modules.biz.datapool.service.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.biz.datapool.entity.DirectiveDataPool; -import com.nu.modules.biz.datapool.entity.DirectiveDataPoolSub; import com.nu.modules.biz.datapool.mapper.CareDataPoolMapper; -import com.nu.modules.biz.datapool.mapper.DirectiveDataPoolMapper; import com.nu.modules.biz.datapool.service.ICareDataPoolService; import com.nu.modules.biz.datapool.service.IDirectiveDataPoolService; -import com.nu.modules.biz.datapool.service.IDirectiveDataPoolSubService; import com.nu.modules.biz.plan.care.entity.CareDirectivePlan; -import com.nu.modules.sysconfig.ISysConfigApi; 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; - import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -35,11 +28,6 @@ public class CareDataPoolServiceImpl extends ServiceImpl planList = baseMapper.queryPlanList(entity);//获取计划 if(planList.size()>0){ for(DirectiveDataPool plan : planList){ - plan.setPoolType("1"); DirectiveDataPool pool = dataPoolService.queryPoolOne(plan); if(pool!=null){ continue; @@ -115,16 +102,8 @@ public class CareDataPoolServiceImpl extends ServiceImpl subList = dataPoolSubService.queryDirectiveList(entity); - for(int i=0;i implements IDirectiveDataPoolService { - @Autowired - IDirectiveDataPoolSubService dataPoolSubService; - @Autowired - private ISysConfigApi sysConfigApi; - /** * 创建工单日志表 */ @@ -48,18 +34,6 @@ public class DirectiveDataPoolServiceImpl extends ServiceImpl implements IDirectiveDataPoolSubService { - - @Override - public DirectiveDataPoolSub queryDirectiveOne(DirectiveDataPoolSub dataPoolSub){ - return baseMapper.queryDirectiveOne(dataPoolSub); - } - - @Override - public List queryDirectiveList(DirectiveDataPoolSub dataPoolSub){ - return baseMapper.queryDirectiveList(dataPoolSub); - } -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java index e3f90954..1235fc0d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java @@ -1,22 +1,16 @@ package com.nu.modules.biz.datapool.service.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.biz.datapool.entity.DirectiveDataPool; -import com.nu.modules.biz.datapool.entity.DirectiveDataPoolSub; import com.nu.modules.biz.datapool.mapper.InvoicingDataPoolMapper; import com.nu.modules.biz.datapool.service.IDirectiveDataPoolService; -import com.nu.modules.biz.datapool.service.IDirectiveDataPoolSubService; import com.nu.modules.biz.datapool.service.IInvoicingDataPoolService; import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlan; -import com.nu.modules.sysconfig.ISysConfigApi; 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 java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -34,11 +28,6 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl1){ - //月周期 - addMonthDay(dataPool); - }else{ - //星期周期 - addWeekDay(dataPool); - } - } + String typeId = dataPool.getCycleTypeId(); + if(typeId!=null){ + //每天 + if(typeId.equals("1")){ + addDaily(dataPool); + } + //星期 + if(typeId.equals("3")){ + addWeekDay(dataPool); + } + //日期 + if(typeId.equals("4")){ + addMonthDay(dataPool); + } + //频率 + if(typeId.equals("5")){ + addFrequency(dataPool); } } } @@ -119,8 +104,6 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl subList = dataPoolSubService.queryDirectiveList(entity); - for(int i=0;i1){ - //指令包中月周期指令 - Calendar calendar = Calendar.getInstance(); - int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); - Integer cv = Integer.valueOf(cycleValue); - //计划执行月中的几号是当天，则入指令池 - if(dayOfMonth == cv){ - addPackageSub(dataPool,dataPoolSub); - } - }else{ - //指令包中星期周期指令 - Calendar calendar = Calendar.getInstance(); - int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); //1周日 2周一 3周二 4周三 5周四 6周五 7周六 - //cycleValue 存js的星期 0周一 1周二 2周三 3周四 4周五 5周六 6周日 js +2 2 3 4 5 6 7 8 /7 % - Integer cv = Integer.valueOf(cycleValue); - //处理js星期，使其能和java的星期进行比较 - cv = cv + 2; - if(cv-7>0){ - cv = cv -7; - } - //计划执行星期几是当天，则入指令池 - if(dayOfWeek == cv){ - addPackageSub(dataPool,dataPoolSub); - } + int orderOptCount = baseMapper.getOrderOptCount(dataPool); + if(orderOptCount1){ - //月周期 - addMonthDay(dataPool); - }else{ - //星期周期 - addWeekDay(dataPool); - } - } + String typeId = dataPool.getCycleTypeId(); + if(typeId!=null){ + //每天 + if(typeId.equals("1")){ + addDaily(dataPool); + } + //星期 + if(typeId.equals("3")){ + addWeekDay(dataPool); + } + //日期 + if(typeId.equals("4")){ + addMonthDay(dataPool); + } + //频率 + if(typeId.equals("5")){ + addFrequency(dataPool); } } } @@ -118,8 +104,6 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl subList = dataPoolSubService.queryDirectiveList(entity); - for(int i=0;i1){ - //指令包中月周期指令 - Calendar calendar = Calendar.getInstance(); - int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); - Integer cv = Integer.valueOf(cycleValue); - //计划执行月中的几号是当天，则入指令池 - if(dayOfMonth == cv){ - addPackageSub(dataPool,dataPoolSub); - } - }else{ - //指令包中星期周期指令 - Calendar calendar = Calendar.getInstance(); - int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); //1周日 2周一 3周二 4周三 5周四 6周五 7周六 - //cycleValue 存js的星期 0周一 1周二 2周三 3周四 4周五 5周六 6周日 js +2 2 3 4 5 6 7 8 /7 % - Integer cv = Integer.valueOf(cycleValue); - //处理js星期，使其能和java的星期进行比较 - cv = cv + 2; - if(cv-7>0){ - cv = cv -7; - } - //计划执行星期几是当天，则入指令池 - if(dayOfWeek == cv){ - addPackageSub(dataPool,dataPoolSub); - } + int orderOptCount = baseMapper.getOrderOptCount(dataPool); + if(orderOptCount