Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmDemandController.java

@@ -148,9 +148,15 @@ public class PmDemandController extends BaseController {
             if (ObjectUtils.isEmpty(pmBookBuildingReqVo.getBudgetAmount())) {
                 return error("预算金额不能为空");
             }
+            if (pmBookBuildingReqVo.getBudgetAmount() > pmDemand.getEvaluation()) {
+                return error("需求建档的预算金额不能大于计划的预算金额");
+            }
             if (ObjectUtils.isEmpty(pmBookBuildingReqVo.getDemandCommitTime())) {
                 return error("需求提报时间不能为空");
             }
+            if (ObjectUtils.isEmpty(pmBookBuildingReqVo.getSysFileRefs())) {
+                return error("需求建档的附件不能为空");
+            }
             LoginUser loginUser = tokenService.getLoginUser(request);
             pmBookBuildingReqVo.setCreateBy(String.valueOf(loginUser.getUserId()));
             pmBookBuildingReqVo.setCreateTime(new Date());

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -661,6 +661,7 @@ public class PmPurchaseExecutionController extends BaseController {
             pmDemandUpdate.setDemandId(demandId);
             pmDemandUpdate.setProjectStatus(PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
             pmDemandUpdate.setRealPurchaseFinishTime(new Date());
+            pmDemandUpdate.setWarnStatus(WarnStatus.NORMAL.getCode());
             pmDemandUpdate.setUpdateTime(new Date());
             pmDemandUpdate.setUpdateBy(getUserId().toString());
             return success(pmDemandService.updateById(pmDemandUpdate));

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

@@ -61,7 +61,7 @@ public class PmTaskServer {
             } else {
                 //采购完成时间：根据数据阈值中设置的采购完成时间进行判断，进行预警
                 int diff2 = DateUtils.differentDaysByMillisecond(item.getPlanPurchaseFinishTime(), now);
-                if ( ObjectUtils.isEmpty(item.getRealDemandCommitTime()) && diff2 >= setting2) {
+                if ( ObjectUtils.isEmpty(item.getRealPurchaseFinishTime()) && diff2 >= setting2) {
                     log.info("******** 采购完成预警: " + item.getProjectName());
                     PmDemand pmDemand = new PmDemand();
                     pmDemand.setDemandId(item.getDemandId());
@@ -70,7 +70,7 @@ public class PmTaskServer {
                 } else {
                     //计划交付时间：根据数据阈值中设置的交付时间进行判断，进行预警
                     int diff3 = DateUtils.differentDaysByMillisecond(item.getPlanDeliverTime(), now);
-                    if (ObjectUtils.isEmpty(item.getRealDemandCommitTime()) && diff3 >= setting3) {
+                    if (ObjectUtils.isEmpty(item.getRealDeliverTime()) && diff3 >= setting3) {
                         log.info("******** 计划交付预警: " + item.getProjectName());
                         PmDemand pmDemand = new PmDemand();
                         pmDemand.setDemandId(item.getDemandId());

purchase-system/src/main/java/com/ozs/base/domain/BaseAgency.java

@@ -41,7 +41,7 @@ public class BaseAgency extends BaseDto {
     // 注册时间
     @ApiModelProperty("注册时间")
     @NotEmpty(message = "注册时间不能为空")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date registTime;
     // 公司性质
     @ApiModelProperty("公司性质")

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

@@ -790,6 +790,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         PmDemand pmDemandUpdate = new PmDemand();
         pmDemandUpdate.setDemandId(pmDemand.getDemandId());
         pmDemandUpdate.setProjectStatus(PmProjectStatus.DEMAND_WAIT_AUDIT.getCode());
+        pmDemandUpdate.setWarnStatus(WarnStatus.NORMAL.getCode());
         pmDemandUpdate.setRealDemandCommitTime(DateUtils.getNowDate());
         pmDemandUpdate.setUpdateBy(pmDemandReqVo.getUpdateBy());
         pmDemandUpdate.setUpdateTime(DateUtils.getNowDate());
@@ -1721,6 +1722,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             pmDemandUpdate.setDemandId(demandId);
             pmDemandUpdate.setProjectStatus(PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
             pmDemandUpdate.setRealDeliverTime(pmProjectConstructionReqVo.getUpdateTime());
+            pmDemandUpdate.setWarnStatus(WarnStatus.NORMAL.getCode());
             pmDemandUpdate.setUpdateTime(pmProjectConstructionReqVo.getUpdateTime());
             pmDemandUpdate.setUpdateBy(pmProjectConstructionReqVo.getUpdateBy());
             return this.updateById(pmDemandUpdate);