From 8a62b582d54d8e102afdbcbea0e5b341d357ec83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 13 Nov 2025 17:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=B0=83=E6=95=B4=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B1=A0=E9=A1=B5=E5=8D=B3=E6=97=B6=E5=81=9A=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/directive/datapool/entity/DataPool.java | 4 ++-- .../directive/datapool/mapper/xml/DataPoolMapper.xml | 4 ++-- .../datapool/service/impl/DataPoolServiceImpl.java | 6 +++--- 3 files changed, 7 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 010fe52..28a2f9a 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 @@ -74,8 +74,8 @@ public class DataPool implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endTime; - /**是否派发 0否 1是*/ - private String izSend; + /**是否开始 0否 1是*/ + private String izStart; /**创建人*/ @ApiModelProperty(value = "创建人") 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 2de529d..4c9688d 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 @@ -100,8 +100,8 @@ AND start_time = #{startTime} - - AND iz_send = #{izSend} + + AND iz_start = #{izStart} 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 9a358d9..f686051 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 @@ -75,7 +75,7 @@ public class DataPoolServiceImpl extends ServiceImpl i Date endTime = c.getTime(); if(dataTime.getTime()>=startTime.getTime()){ if(dataTime.getTime()<=endTime.getTime()){ - dataPool.setIzSend("0"); + dataPool.setIzStart("0"); dataPool.setDelFlag("0"); String izPackage = dataPool.getIzPackage(); if(izPackage!=null&&izPackage.equals("1")){ @@ -305,7 +305,7 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setNuId(nuBizNuCustomerServer.getNuId()); dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); dataPool.setStartTime(c.getTime()); - dataPool.setIzSend("0"); + dataPool.setIzStart("0"); String izPackage = nuBizNuCustomerServer.getIzPackage(); if(izPackage.equals("1")){ dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); @@ -434,7 +434,7 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setEndTime(c.getTime()); dataPool.setCycleTypeId("3"); dataPool.setIzPackage("0"); - dataPool.setIzSend("0"); + dataPool.setIzStart("0"); dataPool.setDelFlag("0"); addDaily(dataPool); return Result.OK();