接口测试修正

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

@@ -365,7 +365,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             if(taskId == null) {
                 throw new BadRequest("未找到反馈任务单");
             }
-            // repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"WXFK",taskId,user);
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"WXFK",taskId,user);
         }
         dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
@@ -762,7 +762,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             if(taskId == null) {
                 throw new BadRequest("未找到反馈任务单");
             }
-            //repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK",taskId,user);
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK-TS",taskId,user);
         }
         dispatchPaper.setFeedbackTime(dispatchConsultFeedbackDto.getFeedbackTime());
         dispatchPaper.setFeedbackFinishTime(dispatchConsultFeedbackDto.getFeedbackFinishTime());

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
@@ -132,26 +133,37 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             String createUser = user.getUserName();
             String create = alertCalledVo.getEmergencyPerson();
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create);
-        } else if("WXFK".equals(type)) {
+        } else if("WXFK".equals(type)) { //从派遣单获取数据
             DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
             String person = dispatchTask.getResponseUserName();
-            String fix_result =
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
+            DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
-                if("fix_feedback_type".equals(alertFormValue.getFieldCode())) {
-                    tempMap.put("FKFS",alertFormValue.getFieldValue());
-                } else if("fix_result".equals(alertFormValue.getFieldCode())) {
+                 if("fix_result".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("fixResult",alertFormValue.getFieldValue());
+                }
+            });
+            content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
+        } else if("WXFK-TS".equals(type)) { //从派遣单获取数据
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String person = dispatchTask.getResponseUserName();
+            content = content.replace("$createTime",createTime).replace("$person",person);
+            DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
+            DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
+            List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
+            Map<String,String> tempMap = new HashMap<String,String>();
+            dynamicForm.stream().forEach(alertFormValue -> {
+                if("action_result".equals(alertFormValue.getFieldCode())) {
                     tempMap.put("fixResult",alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",tempMap.get("FKFS")).replace("$fixResult",tempMap.get("fixResult"));
+            content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
         } else if("BXFK".equals(type)) {
             DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
             String person = dispatchTask.getResponseUserName();
-            String fix_result =
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();