接口测试修正

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,8 +313,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dynamicFormAlert.stream().forEach(alertFormValue -> {
                     switch (alertFormValue.getFieldCode()) {
                         case "save_feedback_time":
-                            if (dispatchSaveFeedbackDto.getSaveFeedbackTime() != null)
+                            if (dispatchSaveFeedbackDto.getSaveFeedbackTime() != null) {
+                                if(alertFormValue.getFieldValue() == null ) {
+                                    // 坐席回访
+                                    repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"JYHF",null,user);
+                                }
                                 alertFormValue.setFieldValue(sdf.format(dispatchSaveFeedbackDto.getSaveFeedbackTime()));
+                            }
                             break;
                         case "save_feedback_user":
                             if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getSaveFeedbackUser()))
@@ -354,19 +359,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackUid(dispatchSaveFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchSaveFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchSaveFeedbackDto.getRemark());
+        if(dispatchPaper.getFeedbackTime() == null && dispatchSaveFeedbackDto.getFeedbackTime() != null) {
+            // 维修反馈
+            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+            if(taskId == null) {
+                throw new BadRequest("未找到反馈任务单");
+            }
+            // repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"WXFK",taskId,user);
+        }
         dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
         iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
         flag = this.updateById(dispatchPaper);
-        // 坐席回访
-        repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"JYHF",null,user);
-        Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
-        if(taskId == null) {
-            throw new BadRequest("未找到反馈任务单");
-        }
-        // 维修反馈
-        repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"WXFK",taskId,user);
         return flag;
     }
 
@@ -493,8 +498,17 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dynamicFormAlert.stream().forEach(alertFormValue -> {
             switch (alertFormValue.getFieldCode()) {
                 case "fix_feedback_time":
-                    if (dispatchRepairFeedbackDto.getFixFeedbackTime() != null)
+                    if (dispatchRepairFeedbackDto.getFixFeedbackTime() != null) {
+                        if(alertFormValue.getFieldValue() == null) {
+                            // 报修反馈
+                            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+                            if(taskId == null) {
+                                throw new BadRequest("未找到反馈任务单");
+                            }
+                            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"BXFK",taskId,user);
+                        }
                         alertFormValue.setFieldValue(sdf.format(dispatchRepairFeedbackDto.getFixFeedbackTime()));
+                    }
                     break;
                 case "feedback_result":
                     if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFeedbackResult())) {
@@ -552,17 +566,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackUid(dispatchRepairFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchRepairFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchRepairFeedbackDto.getRemark());
+        if(dispatchPaper.getFeedbackTime() == null && dispatchRepairFeedbackDto.getFeedbackTime() != null) {
+            // 维修反馈
+            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+            if(taskId == null) {
+                throw new BadRequest("未找到反馈任务单");
+            }
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"WXFK",taskId,user);
+        }
         dispatchPaper.setFeedbackTime(dispatchRepairFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
         iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
         flag = this.updateById(dispatchPaper);
-        // 报修反馈
-        Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
-        if(taskId == null) {
-            throw new BadRequest("未找到反馈任务单");
-        }
-        repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchRepairFeedbackDto.getAlertId(),"BXFK",taskId,user);
         return flag;
     }
 
@@ -685,8 +701,17 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dynamicFormAlert.stream().forEach(alertFormValue -> {
             switch (alertFormValue.getFieldCode()) {
                 case "consult_feedback_time":
-                    if (dispatchConsultFeedbackDto.getConsultFeedbackTime() != null)
+                    if (dispatchConsultFeedbackDto.getConsultFeedbackTime() != null) {
+                        if(alertFormValue.getFieldValue() == null ) {
+                            // 投诉人反馈
+                            Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
+                            if(taskId == null) {
+                                throw new BadRequest("未找到反馈任务单");
+                            }
+                            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"TSRFK",taskId,user);
+                        }
                         alertFormValue.setFieldValue(sdf.format(dispatchConsultFeedbackDto.getConsultFeedbackTime()));
+                    }
                     break;
                 case "action_result":
                     if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getActionResult())) {
@@ -731,6 +756,14 @@ 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("未找到反馈任务单");
+            }
+            //repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK",taskId,user);
+        }
         dispatchPaper.setFeedbackTime(dispatchConsultFeedbackDto.getFeedbackTime());
         dispatchPaper.setFeedbackFinishTime(dispatchConsultFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchConsultFeedbackDto.getFeedbackUid());
@@ -740,12 +773,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
         flag = this.updateById(dispatchPaper);
-        // 投诉人反馈
-        Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
-        if(taskId == null) {
-            throw new BadRequest("未找到反馈任务单");
-        }
-        repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"TSRFK",taskId,user);
+
         return flag;
     }