From 9fc119c1a7bf76ebad37c4a1cd78c428037e838e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 14 Nov 2025 10:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=92=8C?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=80=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/directive/datapool/entity/DataPool.java | 2 -- .../directive/datapool/mapper/xml/DataPoolMapper.xml | 8 +++++--- .../datapool/service/impl/DataPoolServiceImpl.java | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java index 28a2f9a..a9678ed 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java @@ -99,11 +99,9 @@ public class DataPool implements Serializable { private String cycleTypeId; /**周期类型*/ - @TableField(exist = false) private String cycleType; /**周期值*/ - @TableField(exist = false) private String cycleValue; /**服务时长*/ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml index 4c9688d..433f037 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml @@ -79,7 +79,7 @@ iz_package, start_time, end_time, - iz_send + iz_start from nu_biz_nu_directive_data_pool @@ -122,7 +122,7 @@ iz_package, start_time, end_time, - iz_send + iz_start from nu_biz_nu_directive_data_pool @@ -164,12 +164,14 @@ 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 '周期值', 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 '是否是服务指令包 0否 1是', start_time datetime(0) NULL DEFAULT NULL COMMENT '开始时间', end_time datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - iz_send varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否派发 0否 1是', + iz_start varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否派发 0否 1是', 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 '更新人', diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java index f686051..1bdfd02 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java @@ -258,6 +258,8 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setCustomerName(nuBizNuCustomerServer.getCustomerName()); dataPool.setServiceDuration(nuBizNuCustomerServer.getServiceDuration()); dataPool.setCycleTypeId(nuBizNuCustomerServer.getCycleTypeId()); + dataPool.setCycleType(nuBizNuCustomerServer.getCycleType()); + dataPool.setCycleValue(nuBizNuCustomerServer.getCycleValue()); dataPool.setIzPackage(nuBizNuCustomerServer.getIzPackage()); if(nuBizNuCustomerServer.getIzPackage().equals("1")){ dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); @@ -331,8 +333,7 @@ public class DataPoolServiceImpl extends ServiceImpl i DataPool dataPool = baseMapper.queryPlanById(nuBizNuCustomerServer.getId()); DataPool pool = baseMapper.queryPoolOne(dataPool); if(pool==null){ - - addDataPool(dataPool);; + addDataPool(dataPool); } }