Merge remote-tracking branch 'origin/master'

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);
@@ -3493,9 +3495,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             tThisYear.setEvaluationTotal(BigDecimal.ZERO);
             tThisYear.setEvaluationContractTotal(BigDecimal.ZERO);
         }
-        tThisYear.setNum(tThisYear.getNum() + zLastYear.getNum());
-        tThisYear.setEvaluationTotal(tThisYear.getEvaluationTotal().add(zLastYear.getEvaluationTotal()));
-        tThisYear.setEvaluationContractTotal(tThisYear.getEvaluationContractTotal().add(zLastYear.getEvaluationContractTotal()));
+        tThisYear.setNum(ObjectUtils.isEmpty(tThisYear.getNum()) ? 0 : tThisYear.getNum() + (ObjectUtils.isEmpty(zLastYear.getNum()) ? 0 : zLastYear.getNum()));
+        tThisYear.setEvaluationTotal((ObjectUtils.isEmpty(tThisYear.getEvaluationTotal()) ? BigDecimal.ZERO : tThisYear.getEvaluationTotal()).add((ObjectUtils.isEmpty(zLastYear.getEvaluationTotal()) ? BigDecimal.ZERO : zLastYear.getEvaluationTotal())));
+        tThisYear.setEvaluationContractTotal((ObjectUtils.isEmpty(tThisYear.getEvaluationContractTotal()) ? BigDecimal.ZERO : tThisYear.getEvaluationContractTotal()).add(ObjectUtils.isEmpty(zLastYear.getEvaluationContractTotal()) ? BigDecimal.ZERO : zLastYear.getEvaluationContractTotal()));
         tThisYear.setColumnName("上年度结转和本年度提报的采购需求");
         tThisYear.setColumnNamePlus("累计完成采购任务数量");
         byChange.add(tThisYear);

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

@@ -8,6 +8,7 @@ import javax.validation.Validator;
 
 import com.ozs.common.config.PurchaseConfig;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.system.domain.SysPost;
 import com.ozs.system.domain.SysUserPost;
 import com.ozs.system.domain.SysUserRole;
@@ -556,11 +557,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public int saveUser(SysUser user) {
-        return 0;
+        // 新增用户信息
+        int rows = userMapper.insertUser(user);
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return rows;
     }
 
     @Override
     public int updateUsers(SysUser user) {
-        return 0;
+        // 删除用户与角色关联
+        userRoleMapper.deleteUserRoleByUserId(user.getUserId());
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return userMapper.updateUser(user);
     }
 }