保养计划新增修改通知状态

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java

@@ -133,26 +133,28 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
         CmmsUpkeepPlan cmmsUpkeepPlan = new CmmsUpkeepPlan();
         //保养计划编号
         if(cmmsUpkeepPlanDto.getPlancode() == null || "".equals(cmmsUpkeepPlanDto.getPlancode())) cmmsUpkeepPlan.setPlancode(autoCodeUtil.genSerialCode(UserConstants.CMMSUPKEEPPLAN_CODE, null));
-        if(cmmsUpkeepPlanDto.getPlanname() != null) cmmsUpkeepPlan.setPlanname(cmmsUpkeepPlanDto.getPlanname());//保养计划名称
-        if(cmmsUpkeepPlanDto.getUpkeepprojid() != null) cmmsUpkeepPlan.setUpkeepprojid(cmmsUpkeepPlanDto.getUpkeepprojid());//保养工作项目id
-        if(cmmsUpkeepPlanDto.getProjectname() != null) cmmsUpkeepPlan.setProjectname(cmmsUpkeepPlanDto.getProjectname());//保养工作项目名称
-        if(cmmsUpkeepPlanDto.getAddress() != null) cmmsUpkeepPlan.setAddress(cmmsUpkeepPlanDto.getAddress());//地点
-        if(cmmsUpkeepPlanDto.getSupplier() != null) cmmsUpkeepPlan.setSupplier(cmmsUpkeepPlanDto.getSupplier());//厂商名称
-        if(cmmsUpkeepPlanDto.getSuppliertel() != null) cmmsUpkeepPlan.setSuppliertel(cmmsUpkeepPlanDto.getSuppliertel());//厂商电话
-        if(cmmsUpkeepPlanDto.getLinker() != null) cmmsUpkeepPlan.setLinker(cmmsUpkeepPlanDto.getLinker());//联系人
-        if(cmmsUpkeepPlanDto.getLinkertel() != null) cmmsUpkeepPlan.setLinkertel(cmmsUpkeepPlanDto.getLinkertel());//联系人电话
-        if(cmmsUpkeepPlanDto.getChargeruser() != null) cmmsUpkeepPlan.setChargeruser(cmmsUpkeepPlanDto.getChargeruser());//负责人
-        if(cmmsUpkeepPlanDto.getPlandesc() != null) cmmsUpkeepPlan.setPlandesc(cmmsUpkeepPlanDto.getPlandesc());//描述
-        if(cmmsUpkeepPlanDto.getBegintime() != null) cmmsUpkeepPlan.setBegintime(cmmsUpkeepPlanDto.getBegintime());//保养计划第一次开始时间
-        if(cmmsUpkeepPlanDto.getBegintime() != null) cmmsUpkeepPlan.setNexttime(cmmsUpkeepPlanDto.getBegintime());//保养计划下次执行开始时间
+        if(cmmsUpkeepPlanDto.getPlanname() != null && !("".equals(cmmsUpkeepPlan.getPlanname()))) cmmsUpkeepPlan.setPlanname(cmmsUpkeepPlanDto.getPlanname());//保养计划名称
+        if(cmmsUpkeepPlanDto.getUpkeepprojid() != null && !("".equals(cmmsUpkeepPlan.getUpkeepprojid()))) cmmsUpkeepPlan.setUpkeepprojid(cmmsUpkeepPlanDto.getUpkeepprojid());//保养工作项目id
+        if(cmmsUpkeepPlanDto.getProjectname() != null && !("".equals(cmmsUpkeepPlan.getProjectname()))) cmmsUpkeepPlan.setProjectname(cmmsUpkeepPlanDto.getProjectname());//保养工作项目名称
+        if(cmmsUpkeepPlanDto.getAddress() != null && !("".equals(cmmsUpkeepPlan.getAddress()))) cmmsUpkeepPlan.setAddress(cmmsUpkeepPlanDto.getAddress());//地点
+        if(cmmsUpkeepPlanDto.getSupplier() != null && !("".equals(cmmsUpkeepPlan.getSupplier()))) cmmsUpkeepPlan.setSupplier(cmmsUpkeepPlanDto.getSupplier());//厂商名称
+        if(cmmsUpkeepPlanDto.getSuppliertel() != null && !("".equals(cmmsUpkeepPlan.getSuppliertel()))) cmmsUpkeepPlan.setSuppliertel(cmmsUpkeepPlanDto.getSuppliertel());//厂商电话
+        if(cmmsUpkeepPlanDto.getLinker() != null && !("".equals(cmmsUpkeepPlan.getLinker()))) cmmsUpkeepPlan.setLinker(cmmsUpkeepPlanDto.getLinker());//联系人
+        if(cmmsUpkeepPlanDto.getLinkertel() != null && !("".equals(cmmsUpkeepPlan.getLinkertel()))) cmmsUpkeepPlan.setLinkertel(cmmsUpkeepPlanDto.getLinkertel());//联系人电话
+        if(cmmsUpkeepPlanDto.getChargeruser() != null && !("".equals(cmmsUpkeepPlan.getChargeruser()))) cmmsUpkeepPlan.setChargeruser(cmmsUpkeepPlanDto.getChargeruser());//负责人
+        if(cmmsUpkeepPlanDto.getPlandesc() != null && !("".equals(cmmsUpkeepPlan.getPlandesc()))) cmmsUpkeepPlan.setPlandesc(cmmsUpkeepPlanDto.getPlandesc());//描述
+        if(cmmsUpkeepPlanDto.getBegintime() != null){
+            cmmsUpkeepPlan.setBegintime(cmmsUpkeepPlanDto.getBegintime());//保养计划第一次开始时间
+            cmmsUpkeepPlan.setNexttime(cmmsUpkeepPlanDto.getBegintime());//保养计划下次执行开始时间
+        }
         if(cmmsUpkeepPlanDto.getRepeatnum() != null) cmmsUpkeepPlan.setRepeatnum(cmmsUpkeepPlanDto.getRepeatnum());//保养计划间隔重复的时间
-        if(cmmsUpkeepPlanDto.getRepeattype() != null) cmmsUpkeepPlan.setRepeattype(cmmsUpkeepPlanDto.getRepeattype());//保养计划间隔重复的时间单位
+        if(cmmsUpkeepPlanDto.getRepeattype() != null && !("".equals(cmmsUpkeepPlan.getRepeattype()))) cmmsUpkeepPlan.setRepeattype(cmmsUpkeepPlanDto.getRepeattype());//保养计划间隔重复的时间单位
         if(cmmsUpkeepPlanDto.getNoticenum() != null) cmmsUpkeepPlan.setNoticenum(cmmsUpkeepPlanDto.getNoticenum());//保养计划执行提前通知时间
-        if(cmmsUpkeepPlanDto.getNoticetype() != null) cmmsUpkeepPlan.setNoticetype(cmmsUpkeepPlanDto.getNoticetype());//保养计划执行提前通知时间单位
-        if(cmmsUpkeepPlanDto.getStatus() != null) cmmsUpkeepPlan.setStatus(cmmsUpkeepPlanDto.getStatus());//保养计划是否启用状态 0启用 1停用
-        if(cmmsUpkeepPlanDto.getIfnotice() != null) cmmsUpkeepPlan.setIfnotice("否");//保养计划即将执行是否已通知 是/否
-        if(cmmsUpkeepPlanDto.getEquipmentid() != null) cmmsUpkeepPlan.setEquipmentid(cmmsUpkeepPlanDto.getEquipmentid());//保养计划对应的设备id
-        if(cmmsUpkeepPlanDto.getRemark() != null & (!("".equals(cmmsUpkeepPlanDto.getRemark())))) cmmsUpkeepPlan.setRemark(cmmsUpkeepPlanDto.getRemark());//保养计划备注
+        if(cmmsUpkeepPlanDto.getNoticetype() != null && !("".equals(cmmsUpkeepPlan.getNoticetype()))) cmmsUpkeepPlan.setNoticetype(cmmsUpkeepPlanDto.getNoticetype());//保养计划执行提前通知时间单位
+        if(cmmsUpkeepPlanDto.getStatus() != null && !("".equals(cmmsUpkeepPlan.getStatus()))) cmmsUpkeepPlan.setStatus(cmmsUpkeepPlanDto.getStatus());//保养计划是否启用状态 0启用 1停用
+        if(cmmsUpkeepPlanDto.getEquipmentid() != null && !("".equals(cmmsUpkeepPlan.getEquipmentid()))) cmmsUpkeepPlan.setEquipmentid(cmmsUpkeepPlanDto.getEquipmentid());//保养计划对应的设备id
+        if(cmmsUpkeepPlanDto.getRemark() != null && (!("".equals(cmmsUpkeepPlanDto.getRemark())))) cmmsUpkeepPlan.setRemark(cmmsUpkeepPlanDto.getRemark());//保养计划备注
+        cmmsUpkeepPlan.setIfnotice("否");//保养计划即将执行是否已通知 是/否  第一次创建计划时都为否
 //        cmmsUpkeepPlan.setNexttime(getNextTime(cmmsUpkeepPlanDto.getBegintime(), cmmsUpkeepPlanDto.getRepeattype(), cmmsUpkeepPlanDto.getRepeatnum()));//下次保养计划执行时间
         cmmsUpkeepPlan.setNoticetime(getNextTime(cmmsUpkeepPlanDto.getBegintime(), cmmsUpkeepPlanDto.getNoticetype(), -(cmmsUpkeepPlanDto.getNoticenum())));//保养计划执行提醒时间
         boolean b1 = this.save(cmmsUpkeepPlan);