接口测试修正

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

@@ -313,13 +313,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
         // 动态字段
         List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
+        Map<String,Boolean> tempMap = new HashMap<String,Boolean>();
         dynamicFormAlert.stream().forEach(alertFormValue -> {
                     switch (alertFormValue.getFieldCode()) {
                         case TzsCommonParam.SAVE_FEEDBACK_TIME:
                             if (dispatchSaveFeedbackDto.getSaveFeedbackTime() != null) {
                                 if(alertFormValue.getFieldValue() == null ) {
-                                    // 坐席回访
-                                    repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.JYHF,null,user);
+                                    tempMap.put(TzsCommonParam.BXFK,true);
                                 }
                                 alertFormValue.setFieldValue(DateUtils.date2LongStr(dispatchSaveFeedbackDto.getSaveFeedbackTime()));
                             }
@@ -368,6 +368,17 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackUid(dispatchSaveFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchSaveFeedbackDto.getFeedbackUname());
         if(dispatchPaper.getFeedbackTime() == null && dispatchSaveFeedbackDto.getFeedbackFinishTime() != null) {
+            tempMap.put("FEEDBACK",true);
+        }
+        // 保存派遣表
+        flag = this.updateById(dispatchPaper);
+        // 保存动态表单数据
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
+        if(tempMap.get("BXFK") != null) {
+            // 救援回访
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.JYHF,null,user);
+        }
+        if(tempMap.get("FEEDBACK") != null) {
             // 维修反馈
             Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
             if(taskId == null) {
@@ -376,10 +387,6 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK,taskId,user);
             dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackFinishTime()); // 没有回访时间只有维修完成时间 2021.8.18 演示沟通 维修完成时间即为 反馈时间
         }
-        // 保存动态表单数据
-        iAlertFormValueService.updateBatchById(dynamicFormAlert);
-        // 保存派遣表
-        flag = this.updateById(dispatchPaper);
         return flag;
     }