退回清空提报时间

purchase-admin/src/main/java/com/ozs/web/controller/tool/PmTaskServer.java

@@ -50,29 +50,25 @@ public class PmTaskServer {
             if(PmProjectStatus.DEMAND_WAIT_FILL.getCode().equals(item.getProjectStatus())
                     || PmProjectStatus.DEMAND_WAIT_COMMIT.getCode().equals(item.getProjectStatus())
                     || PmProjectStatus.DEMAND_AUDIT_RETURN.getCode().equals(item.getProjectStatus())){
-                //采购需求管理:针对项目计划中提报需求时间截止时间前一个月还未提报采购需求材料的，进行预警
+                //需求提报时间：根据数据阈值中设置的提报时间进行判断，进行预警
                 int diff = DateUtils.differentDaysByMillisecond(item.getPlanDemandSubTime(), new Date());
                 if (diff > 30 && ObjectUtils.isEmpty(item.getRealDemandCommitTime())) {
                     updateList.add(item);
                 }
             } else if(PmProjectStatus.TASK_WAIT_RELEASE.getCode().equals(item.getProjectStatus())){
-                //任务下达管理:针对采购需求已完成提报X天的项目，且尚未进行任务下达的，进行预警
+                //采购完成时间：根据数据阈值中设置的采购完成时间进行判断，进行预警
                 int diff = DateUtils.differentDaysByMillisecond(item.getPlanDemandSubTime(), new Date());
                 if (diff > 30 && ObjectUtils.isEmpty(item.getRealDemandCommitTime())) {
                     updateList.add(item);
                 }
 
             } else if(PmProjectStatus.CONTRACT_WAIT_FILL.getCode().equals(item.getProjectStatus())){
-                //合同信息管理:针对中标通知书发放25天，且尚未提交合同相关材料的项目，进行预警
+                //计划交付时间：根据数据阈值中设置的交付时间进行判断，进行预警和发函催告
                 int diff = DateUtils.differentDaysByMillisecond(item.getPlanDemandSubTime(), new Date());
                 if (diff > 30 && ObjectUtils.isEmpty(item.getRealDemandCommitTime())) {
                     updateList.add(item);
                 }
 
-            } else if(PmProjectStatus.UNDER_CONSTRUCTION.getCode().equals(item.getProjectStatus())){
-                //项目建设管理:针对各阶段预置的起始时间期限，进行预警
-
-
             }
 
         });

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -741,14 +741,16 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean reviewReturn(PmDemandReqVo pmDemandReqVo) {
-        PmDemand pmDemand = new PmDemand();
-        pmDemand.setDemandId(pmDemandReqVo.getDemandId());
-        pmDemand.setProjectStatus(PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
-        pmDemand.setAdjustReason(pmDemandReqVo.getRefuseReason());
-        pmDemand.setUpdateBy(pmDemandReqVo.getUpdateBy());
-        pmDemand.setUpdateTime(DateUtils.getNowDate());
-        pmDemand.setAuditTime(DateUtils.getNowDate());
-        return this.updateById(pmDemand);
+        UpdateWrapper<PmDemand> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(PmDemand::getDemandId,pmDemandReqVo.getDemandId())
+                .set(PmDemand::getProjectStatus,PmProjectStatus.DEMAND_AUDIT_RETURN.getCode())
+                .set(PmDemand::getAdjustReason,pmDemandReqVo.getRefuseReason())
+                .set(PmDemand::getRealDemandCommitTime,null)
+                .set(PmDemand::getUpdateBy,pmDemandReqVo.getUpdateBy())
+                .set(PmDemand::getUpdateTime,DateUtils.getNowDate())
+                .set(PmDemand::getAuditTime,DateUtils.getNowDate());
+
+        return this.update(updateWrapper);
     }
 
     /**