接口测试修正

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

@@ -585,16 +585,6 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         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();
@@ -605,6 +595,16 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             alertCalledServiceImpl.updateAlertStageByAlertId(dispatchRepairFeedbackDto.getAlertId(),"WXFK");
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"WXFK",taskId,user);
         }
+        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");
+        }
         return flag;
     }
 
@@ -791,16 +791,6 @@ 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();
@@ -811,6 +801,16 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"WXFK");
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK-TS",taskId,user);
         }
+        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");
+        }
         return flag;
     }