yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令计划调整时，数据池页即时做相应的调整

This commit is contained in:
曹磊 2025-11-13 17:35:41 +08:00
parent 41338cb5da
commit 8a62b582d5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java
View File

@ -74,8 +74,8 @@ public class DataPool implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime; private Date endTime;
/**是否派发 0否 1是*/ /**是否开始 0否 1是*/
private String izSend; private String izStart;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")

4
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
View File

@ -100,8 +100,8 @@
<if test="startTime != null"> <if test="startTime != null">
AND start_time = #{startTime} AND start_time = #{startTime}
</if> </if>
<if test="izSend != null and izSend != ''"> <if test="izStart != null and izStart != ''">
AND iz_send = #{izSend} AND iz_start = #{izStart}
</if> </if>
</where> </where>
</select> </select>

6
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java
View File

@ -75,7 +75,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
Date endTime = c.getTime(); Date endTime = c.getTime();
if(dataTime.getTime()>=startTime.getTime()){ if(dataTime.getTime()>=startTime.getTime()){
if(dataTime.getTime()<=endTime.getTime()){ if(dataTime.getTime()<=endTime.getTime()){
dataPool.setIzSend("0"); dataPool.setIzStart("0");
dataPool.setDelFlag("0"); dataPool.setDelFlag("0");
String izPackage = dataPool.getIzPackage(); String izPackage = dataPool.getIzPackage();
if(izPackage!=null&&izPackage.equals("1")){ if(izPackage!=null&&izPackage.equals("1")){
@ -305,7 +305,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPool.setNuId(nuBizNuCustomerServer.getNuId()); dataPool.setNuId(nuBizNuCustomerServer.getNuId());
dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId());
dataPool.setStartTime(c.getTime()); dataPool.setStartTime(c.getTime());
dataPool.setIzSend("0"); dataPool.setIzStart("0");
String izPackage = nuBizNuCustomerServer.getIzPackage(); String izPackage = nuBizNuCustomerServer.getIzPackage();
if(izPackage.equals("1")){ if(izPackage.equals("1")){
dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId());
@ -434,7 +434,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPool.setEndTime(c.getTime()); dataPool.setEndTime(c.getTime());
dataPool.setCycleTypeId("3"); dataPool.setCycleTypeId("3");
dataPool.setIzPackage("0"); dataPool.setIzPackage("0");
dataPool.setIzSend("0"); dataPool.setIzStart("0");
dataPool.setDelFlag("0"); dataPool.setDelFlag("0");
addDaily(dataPool); addDaily(dataPool);
return Result.OK(); return Result.OK();