项目评审的时候 bug处理

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -56,6 +56,7 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as statusValue
@@ -98,6 +99,7 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as 状态
@@ -125,11 +127,12 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as statusValue,
         p.name as projectName,p.code as projectCode,
-         c.name as clientName, su.name as userName,
+        c.name as clientName, su.name as userName,
         su.phone as userPhone, su.fax as userFax
         from entrust e
         left join project p on p.id = e.project_id
@@ -154,6 +157,7 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as statusValue,
@@ -213,6 +217,7 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as statusValue,
@@ -272,6 +277,7 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as statusValue
@@ -472,6 +478,7 @@
         WHEN 7 THEN '校核中'
         WHEN 8 THEN '校核完成'
         WHEN 9 THEN '修改待确认'
+        WHEN 10 THEN '已作废'
         ELSE ''
         END
         ) as statusValue,

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/ApprovalQuery.java

@@ -33,4 +33,7 @@ public class ApprovalQuery {
 	@ApiModelProperty("审批意见/驳回原因")
 	private String auditReason;
 
+	@ApiModelProperty("项目id")
+	private Integer projectId;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -269,6 +269,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 return BaseResponse.errorMsg("请填写项目编号");
             }
         }
+        if(query.getProjectId() != null){
+            Project project = projectMapper.selectById(query.getProjectId());
+            if(project == null){
+                return BaseResponse.errorMsg("项目信息错误");
+            }
+        }
         if (StringUtils.isEmpty(query.getSendName()) || StringUtils.isEmpty(query.getSendPhone())) {
             return BaseResponse.errorMsg("请填写送样人信息");
         }
@@ -1284,7 +1290,18 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             return BaseResponse.errorMsg("当前状态不允许评审");
         }
         Entrust entrust = entrustMapper.selectById(entrustVo.getId());
-        //如果项目id或者项目编号为空，根据项目名称获取项目信息
+        if(entrust.getProjectId() == null){
+            if(query.getProjectId() == null){
+                return BaseResponse.errorMsg("请添加项目信息");
+            }
+            Project project = projectMapper.selectById(entrust.getId());
+            if(project == null){
+                return BaseResponse.errorMsg("项目信息有误");
+            }
+            entrust.setProjectCode(project.getCode())
+                    .setProjectName(project.getName());
+        }
+      /*  //如果项目id或者项目编号为空，根据项目名称获取项目信息
         if (StringUtils.isEmpty(entrust.getProjectCode())) {
             ProjectVo projectVo = projectMapper.getByName(entrust.getProjectName());
             if (projectVo == null) {
@@ -1293,7 +1310,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             entrust.setProjectId(projectVo.getId())
                     .setProjectCode(projectVo.getCode())
                     .setProjectName(projectVo.getName());
-        }
+        }*/
+
         //审批后生成委托编号
         String entrustCode = entrust.getProjectCode()+"-"+query.getSampleList().get(0).getCementCode();
         entrust.setEntrustCode(entrustCode);