查看详情

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

@@ -146,7 +146,7 @@ public class TaskServiceImpl implements TaskService {
         }
         //插入评定任报告
         ChAprReport report = new ChAprReport();
-        //report.setTaskId(taskId);
+        report.setTaskId(taskId);
         report.setEffTime(new Date());
         report.setRemark(remark);
         report.setDisableLevelId(disableLevelId);
@@ -197,7 +197,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public TaskReportVO getReportById(String reportId) {
         TaskReportVO reportById = taskMapper.getReportById(reportId);
-        List<ChAprReportFraction> chAprReportFractions = chAprReportFractionMapper.selectList(new LambdaQueryWrapper<ChAprReportFraction>().eq(ChAprReportFraction::getReportId, 125));
+        List<ChAprReportFraction> chAprReportFractions = chAprReportFractionMapper.selectList(new LambdaQueryWrapper<ChAprReportFraction>().eq(ChAprReportFraction::getReportId, reportId));
         if(chAprReportFractions.isEmpty()|| chAprReportFractions.size()==0){
             return reportById;
         }
@@ -289,8 +289,14 @@ public class TaskServiceImpl implements TaskService {
             }
         }
         if(!chAprReportFractions.isEmpty() && chAprReportFractions.size()>0){
-            chAprReportFractionService.updateChAprReportFraction(chAprReportFractions);
-
+            for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
+                chAprReportFraction.setReportId(chAprReport.getReportId());
+                if(chAprReportFraction.getChAprReportFractionId()==null){
+                    chAprReportFractionMapper.insert(chAprReportFraction);
+                }else {
+                    chAprReportFractionMapper.updateById(chAprReportFraction);
+                }
+            }
         }