Merge remote-tracking branch 'origin/master' into dev_20230205_mq

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

@@ -159,7 +159,10 @@ public class TaskController {
         List<ChAprReportFraction> chTaskReportFractionDtls = reportDetailVo.getChAprReportFractions();
 
         if (person1 == null) {
-            return Result.failed("鉴定人员1不能为空!");
+            return Result.failed("评估专家不能为空!");
+        }
+        if (person2 == null) {
+            return Result.failed("评估员不能为空!");
         }
         if (taskId == null) {
             return Result.failed("评定任务id不能为空!");

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

@@ -163,7 +163,7 @@ public class TaskServiceImpl implements TaskService {
         if (fileDataList != null && fileDataList.size() > 0) {
             updateAttachs(fileDataList, report.getReportId().longValue());
         }
-        //插入评定任务关联人员1.2.3(至少一位,最多三位)
+        //插入评定任务关联人员1.2(两位)
         //person1
         ChAprPersonInfo person1Info = new ChAprPersonInfo();
         person1Info.setReportId(report.getReportId());
@@ -177,13 +177,13 @@ public class TaskServiceImpl implements TaskService {
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
         }
-        if (person3 != null) {
+        /*if (person3 != null) {
             ChAprPersonInfo personInfo = new ChAprPersonInfo();
             personInfo.setReportId(report.getReportId());
             personInfo.setEmpId(person1);
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
-        }
+        }*/
         if(!chAprReportFractions.isEmpty() && chAprReportFractions.size()>0){
             for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
                 chAprReportFraction.setReportId(report.getReportId());

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprReport.java

@@ -14,6 +14,7 @@ public class ChAprReport {
     private Integer reportId;
     private Integer checkName;
     private Integer evaluateRatingType;
+    private Integer evaluateType;
     private Integer status;
     private java.util.Date endTime;
     private String polNo;

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskReportVO.java

@@ -70,6 +70,8 @@ public class TaskReportVO {
     private String acptSrvAddress;
     //评定结果
     private String riskLevel;
+    //评估类型
+    private Integer evaluateType;
 
     private Map<String,Object> chAprReportFractions;
 

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml

@@ -92,6 +92,8 @@
         disable.ACPT_SRV_ADDRESS acptSrvAddress,
         --评定等级
         report.evaluate_rating_type evaluateRatingType,
+        --评定类型
+        report.EVALUATE_TYPE evaluateType,
         --评定完成日期
         aprtask.finish_time finishTime,
         --服务方式