接口测试修正

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java

@@ -35,7 +35,9 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 派遣单服务实现类
@@ -508,19 +510,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         // 动态字段
         List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String,Boolean> tempMap = new HashMap<String,Boolean>();
         dynamicFormAlert.stream().forEach(alertFormValue -> {
             switch (alertFormValue.getFieldCode()) {
                 case "fix_feedback_time":
                     if (dispatchRepairFeedbackDto.getFixFeedbackTime() != null) {
                         if(alertFormValue.getFieldValue() == null) {
-                            // 报修反馈
-                            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
-                            if(taskId == null) {
-                                throw new BadRequest("未找到反馈任务单");
-                            }
-                            // 修改警情到报修反馈
-                            alertCalledServiceImpl.updateAlertStageByAlertId(dispatchRepairFeedbackDto.getAlertId(),"BXFK");
-                            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"BXFK",taskId,user);
+                            tempMap.put("BXFK",true);
                         }
                         alertFormValue.setFieldValue(sdf.format(dispatchRepairFeedbackDto.getFixFeedbackTime()));
                     }
@@ -582,6 +578,24 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackUname(dispatchRepairFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchRepairFeedbackDto.getRemark());
         if(dispatchPaper.getFeedbackTime() == null && dispatchRepairFeedbackDto.getFeedbackTime() != null) {
+            tempMap.put("FEEDBACK",true);
+        }
+        dispatchPaper.setFeedbackTime(dispatchRepairFeedbackDto.getFeedbackTime());
+        // 保存动态表单数据
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
+        // 保存派遣表
+        flag = this.updateById(dispatchPaper);
+        if(tempMap.get("BXFK") != null) {
+            // 报修反馈
+            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+            if(taskId == null) {
+                throw new BadRequest("未找到反馈任务单");
+            }
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"BXFK",taskId,user);
+            // 修改警情到报修反馈
+            alertCalledServiceImpl.updateAlertStageByAlertId(dispatchRepairFeedbackDto.getAlertId(),"BXFK");
+        }
+        if(tempMap.get("FEEDBACK") != null) {
             // 维修反馈
             Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
             if(taskId == null) {
@@ -591,11 +605,6 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             alertCalledServiceImpl.updateAlertStageByAlertId(dispatchRepairFeedbackDto.getAlertId(),"WXFK");
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"WXFK",taskId,user);
         }
-        dispatchPaper.setFeedbackTime(dispatchRepairFeedbackDto.getFeedbackTime());
-        // 保存动态表单数据
-        iAlertFormValueService.updateBatchById(dynamicFormAlert);
-        // 保存派遣表
-        flag = this.updateById(dispatchPaper);
         return flag;
     }
 
@@ -716,19 +725,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         // 动态字段
         List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map<String,Boolean> tempMap = new HashMap<String,Boolean>();
         dynamicFormAlert.stream().forEach(alertFormValue -> {
             switch (alertFormValue.getFieldCode()) {
                 case "consult_feedback_time":
                     if (dispatchConsultFeedbackDto.getConsultFeedbackTime() != null) {
                         if(alertFormValue.getFieldValue() == null ) {
-                            // 投诉人反馈
-                            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
-                            if(taskId == null) {
-                                throw new BadRequest("未找到反馈任务单");
-                            }
-                            // 修改警情到投诉人反馈
-                            alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"TSRFK");
-                            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"TSRFK",taskId,user);
+                            tempMap.put("TSRFK",true);
                         }
                         alertFormValue.setFieldValue(sdf.format(dispatchConsultFeedbackDto.getConsultFeedbackTime()));
                     }
@@ -777,14 +780,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackCode(dispatchConsultFeedbackDto.getFeedbackCode());
         dispatchPaper.setFeedbackType(dispatchConsultFeedbackDto.getFeedbackType());
         if(dispatchPaper.getFeedbackTime() == null && dispatchConsultFeedbackDto.getFeedbackTime() != null) {
-            // 维修反馈
-            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
-            if(taskId == null) {
-                throw new BadRequest("未找到反馈任务单");
-            }
-            // 修改警情到维修反馈
-            alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"WXFK");
-            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK-TS",taskId,user);
+            tempMap.put("FEEDBACK",true);
         }
         dispatchPaper.setFeedbackTime(dispatchConsultFeedbackDto.getFeedbackTime());
         dispatchPaper.setFeedbackFinishTime(dispatchConsultFeedbackDto.getFeedbackFinishTime());
@@ -795,7 +791,26 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
         flag = this.updateById(dispatchPaper);
-
+        if(tempMap.get("TSRFK") != null) {
+            // 修改警情到投诉人反馈
+            // 投诉人反馈
+            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+            if(taskId == null) {
+                throw new BadRequest("未找到反馈任务单");
+            }
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"TSRFK",taskId,user);
+            alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"TSRFK");
+        }
+        if(tempMap.get("FEEDBACK") != null) {
+            // 维修反馈
+            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+            if(taskId == null) {
+                throw new BadRequest("未找到反馈任务单");
+            }
+            // 修改警情到维修反馈
+            alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"WXFK");
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK-TS",taskId,user);
+        }
         return flag;
     }