添加校验

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -129,6 +129,15 @@ public class TaskController {
         if (person1 == null) {
             return Result.failed("鉴定人员1不能为空!");
         }
+        if (taskId == null) {
+            return Result.failed("评定任务id不能为空!");
+        }
+        if (disableLevelId == null) {
+            return Result.failed("失能等级id不能为空!");
+        }
+        if (StringUtils.isBlank(evaluateTime)) {
+            return Result.failed("评估时间不能为空!");
+        }
         Date evaluateDate;
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -136,7 +145,11 @@ public class TaskController {
         } catch (ParseException e) {
             return Result.failed("评估时间格式不正确!");
         }
-        taskService.addReport(taskId, person1, person2, person3, evaluateDate, disableLevelId, polNo, remark);
+        Result<Object> objectResult = taskService.addReport(taskId, person1, person2, person3, evaluateDate, disableLevelId, polNo, remark);
+        if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
+            //失败
+            return Result.failed(objectResult.getMsg());
+        }
         return Result.success();
     }
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -51,7 +51,7 @@ public interface TaskService {
 
     List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader);
 
-    void addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark);
+    Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark);
 
     void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark);
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -63,7 +63,11 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public void addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark) {
+    public Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark) {
+        ChAprTask task = taskMapper.selectById(taskId);
+        if (task != null) {
+            return Result.failed("已存在的评定任务报告!");
+        }
         ChAprReport report = new ChAprReport();
         report.setTaskId(taskId);
         report.setEffTime(new Date());
@@ -93,6 +97,7 @@ public class TaskServiceImpl implements TaskService {
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
         }
+        return Result.success();
     }
 
     @Override