接口测试修正

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java

@@ -70,33 +70,4 @@ public class RescueProcessController extends BaseController {
 	    return ResponseHelper.buildResponse(rescueProcessServiceImpl.getProcessByAlertId(alertId));
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "救援过程表分页查询",  notes = "救援过程表分页查询")
-	public ResponseModel<Page<RescueProcessDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<RescueProcessDto> page = new Page<RescueProcessDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(rescueProcessServiceImpl.queryForRescueProcessPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "救援过程表列表全部数据查询",   notes = "救援过程表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<RescueProcessDto>> selectForList() {
-	    return ResponseHelper.buildResponse(rescueProcessServiceImpl.queryForRescueProcessList());
-	}
 }

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

@@ -338,19 +338,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                             break;
                         case "fix_result":
                             if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getFixResult())) {
-                                alertFormValue.setFieldValue(dispatchSaveFeedbackDto.getFixResult());
                                 QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                                queryWrapper.eq("type", "WXJG").eq("name", dispatchSaveFeedbackDto.getFixResult());
+                                queryWrapper.eq("type", "WXJG").eq("code", dispatchSaveFeedbackDto.getFixResult());
                                 DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
+                                alertFormValue.setFieldValue(fixResult.getName());
                                 alertFormValue.setFieldValueCode(fixResult.getCode());
                             }
                             break;
                         case "error_result":
                             if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getErrorResult())) {
-                                alertFormValue.setFieldValue(dispatchSaveFeedbackDto.getErrorResult());
                                 QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                                queryWrapper.eq("type", "GZYY").eq("name", dispatchSaveFeedbackDto.getErrorResult());
+                                queryWrapper.eq("type", "GZYY").eq("code", dispatchSaveFeedbackDto.getErrorResult());
                                 DataDictionary errorResult = iDataDictionaryService.getOne(queryWrapper);
+                                alertFormValue.setFieldValue(errorResult.getName());
                                 alertFormValue.setFieldValueCode(errorResult.getCode());
                             }
                             break;
@@ -519,19 +519,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     break;
                 case "feedback_result":
                     if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFeedbackResult())) {
-                        alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getFeedbackResult());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "FKJG").eq("name", dispatchRepairFeedbackDto.getFeedbackResult());
+                        queryWrapper.eq("type", "FKJG").eq("code", dispatchRepairFeedbackDto.getFeedbackResult());
                         DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(feedbackType.getName());
                         alertFormValue.setFieldValueCode(feedbackType.getCode());
                     }
                     break;
                 case "fix_feedback_type":
                     if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixFeedbackType())) {
-                        alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getFixFeedbackType());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "FKFS").eq("name", dispatchRepairFeedbackDto.getFixFeedbackType());
+                        queryWrapper.eq("type", "FKFS").eq("code", dispatchRepairFeedbackDto.getFixFeedbackType());
                         DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(feedbackType.getName());
                         alertFormValue.setFieldValueCode(feedbackType.getCode());
                     }
                     break;
@@ -545,19 +545,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     break;
                 case "fix_result":
                     if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixResult())) {
-                        alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getFixResult());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "WXJG").eq("name", dispatchRepairFeedbackDto.getFixResult());
+                        queryWrapper.eq("type", "WXJG").eq("code", dispatchRepairFeedbackDto.getFixResult());
                         DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(fixResult.getName());
                         alertFormValue.setFieldValueCode(fixResult.getCode());
                     }
                     break;
                 case "error_result":
                     if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getErrorResult())) {
-                        alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getErrorResult());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "GZYY").eq("name", dispatchRepairFeedbackDto.getErrorResult());
+                        queryWrapper.eq("type", "GZYY").eq("code", dispatchRepairFeedbackDto.getErrorResult());
                         DataDictionary errorResult = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(errorResult.getName());
                         alertFormValue.setFieldValueCode(errorResult.getCode());
                     }
                     break;
@@ -726,19 +726,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     break;
                 case "action_result":
                     if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getActionResult())) {
-                        alertFormValue.setFieldValue(dispatchConsultFeedbackDto.getActionResult());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "CZJG").eq("name", dispatchConsultFeedbackDto.getActionResult());
+                        queryWrapper.eq("type", "CZJG").eq("code", dispatchConsultFeedbackDto.getActionResult());
                         DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(feedbackType.getName());
                         alertFormValue.setFieldValueCode(feedbackType.getCode());
                     }
                     break;
                 case "consult_feedback_type":
                     if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getConsultFeedbackType())) {
-                        alertFormValue.setFieldValue(dispatchConsultFeedbackDto.getConsultFeedbackType());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "FKFS").eq("name", dispatchConsultFeedbackDto.getConsultFeedbackType());
+                        queryWrapper.eq("type", "FKFS").eq("code", dispatchConsultFeedbackDto.getConsultFeedbackType());
                         DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(feedbackType.getName());
                         alertFormValue.setFieldValueCode(feedbackType.getCode());
                     }
                     break;
@@ -756,10 +756,10 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     break;
                 case "feedback_result":
                     if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getFeedbackResult())) {
-                        alertFormValue.setFieldValue(dispatchConsultFeedbackDto.getFeedbackResult());
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "FKJG").eq("name", dispatchConsultFeedbackDto.getFeedbackResult());
+                        queryWrapper.eq("type", "FKJG").eq("code", dispatchConsultFeedbackDto.getFeedbackResult());
                         DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
+                        alertFormValue.setFieldValue(feedbackType.getName());
                         alertFormValue.setFieldValueCode(feedbackType.getCode());
                     }
                     break;

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

@@ -126,6 +126,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
         } else if("DD".equals(type)) {
             DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
             String person = dispatchTask.getResponseUserName();
+            content = content.replace("$createTime",createTime).replace("$person",person);
             RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(alertId);
             String FKFS = rescueProcessDto.getArriveFeedbackType();
             content = content.replace("$FKFS",FKFS);

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

@@ -142,6 +142,13 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
                 repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
             }
         }
+
+        rescueProcessDto.setSequenceNbr(rescueProcess.getSequenceNbr());
+        rescueProcessDto.setRecDate(rescueProcess.getRecDate());
+        rescueProcessDto.setRecUserId(rescueProcess.getRecUserId());
+        rescueProcessDto.setRecUserName(rescueProcess.getRecUserName());
+        rescueProcess = BeanDtoVoUtils.convert(rescueProcessDto, RescueProcess.class);
+        Boolean flag =this.updateById(rescueProcess);
         if(rescueProcessDto.getArriveByUser()) { // 手动到达
             DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(rescueProcessDto.getAlertId());
             if (dispatchPaperDto == null || dispatchPaperDto.getDispatchPaper() == null) {
@@ -172,11 +179,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
             }
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(rescueProcessDto.getAlertId(),"JC",taskId,sendUser); //保存接警日志
         }
-        rescueProcessDto.setSequenceNbr(rescueProcess.getSequenceNbr());
-        rescueProcessDto.setRecDate(rescueProcess.getRecDate());
-        rescueProcessDto.setRecUserId(rescueProcess.getRecUserId());
-        rescueProcessDto.setRecUserName(rescueProcess.getRecUserName());
-        rescueProcess = BeanDtoVoUtils.convert(rescueProcessDto, RescueProcess.class);
-        return this.updateById(rescueProcess);
+
+        return flag;
     }
 }
\ No newline at end of file