派遣添加救出冗余字段

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchPaperDto.java

@@ -118,4 +118,7 @@ public class DispatchPaperDto  extends BaseDto {
     @ApiModelProperty(value = "到达反馈方式code")
     private String arriveFeedbackCode;
 
+    @ApiModelProperty(value = "救出时间-- 冗余字段便于查询")
+    private Date saveTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/DispatchPaper.java

@@ -217,5 +217,9 @@ public class DispatchPaper extends BaseEntity {
     @TableField("arrive_feedback_code")
     private String arriveFeedbackCode;
 
-
+    /**
+     * 救出时间-- 冗余字段便于查询
+     */
+    @TableField("save_time")
+    private Date saveTime;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -440,6 +440,7 @@
 			e.address,
 			e.rescue_code as rescueCode,
 			p.dispatch_time as dispatchTime,
+			p.save_time as saveTime,
 			e.use_unit as useUnit,
 			e.use_unit_id as useUnitId,
 			e.use_unit_authority as useUnitAuthority,

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/DispatchTaskMapper.xml

@@ -45,6 +45,7 @@
 			e.address,
 			e.rescue_code as rescueCode,
 			p.dispatch_time as dispatchTime,
+			p.save_time as saveTime,
 			e.use_unit as useUnit,
 			e.use_unit_id as useUnitId,
 			e.use_unit_authority as useUnitAuthority,

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

@@ -246,12 +246,7 @@ public class DispatchTaskController extends BaseController {
 				paperList = iAlertFormValueService.list(queryWrapper);
 				paperList.stream().forEach(t -> {
 					String value = t.getFieldValue();
-					if("save_time".equals(t.getFieldCode())) {
-						// 救援完成时间
-						if(StringUtils.isNotBlank(value)) {
-							temp.setSaveTime(DateUtils.longStr2Date(value));
-						}
-					} else if("error_result".equals(t.getFieldCode())) {
+					if("error_result".equals(t.getFieldCode())) {
 						// 故障原因
 						temp.setErrorResult(value);
 					} else if("fix_result".equals(t.getFieldCode())) {
@@ -279,12 +274,7 @@ public class DispatchTaskController extends BaseController {
 				paperList = iAlertFormValueService.list(queryWrapper);
 				paperList.stream().forEach(t -> {
 					String value = t.getFieldValue();
-					if("save_time".equals(t.getFieldCode())) {
-						// 救援完成时间
-						if(StringUtils.isNotBlank(value)) {
-							temp.setSaveTime(DateUtils.longStr2Date(value));
-						}
-					} else if("error_result".equals(t.getFieldCode())) {
+					if("error_result".equals(t.getFieldCode())) {
 						// 故障原因
 						temp.setErrorResult(value);
 					} else if("fix_result".equals(t.getFieldCode())) {

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

@@ -555,12 +555,7 @@ public class WechatController extends BaseController {
 				paperList = iAlertFormValueService.list(queryWrapper);
 				paperList.stream().forEach(t -> {
 					String value = t.getFieldValue();
-					if("save_time".equals(t.getFieldCode())) {
-						// 救援完成时间
-						if(StringUtils.isNotBlank(value)) {
-							temp.setSaveTime(DateUtils.longStr2Date(value));
-						}
-					} else if("error_result".equals(t.getFieldCode())) {
+					if("error_result".equals(t.getFieldCode())) {
 						// 故障原因
 						temp.setErrorResult(value);
 					} else if("fix_result".equals(t.getFieldCode())) {
@@ -585,12 +580,7 @@ public class WechatController extends BaseController {
 				paperList = iAlertFormValueService.list(queryWrapper);
 				paperList.stream().forEach(t -> {
 					String value = t.getFieldValue();
-					if("save_time".equals(t.getFieldCode())) {
-						// 救援完成时间
-						if(StringUtils.isNotBlank(value)) {
-							temp.setSaveTime(DateUtils.longStr2Date(value));
-						}
-					} else if("error_result".equals(t.getFieldCode())) {
+					if("error_result".equals(t.getFieldCode())) {
 						// 故障原因
 						temp.setErrorResult(value);
 					} else if("fix_result".equals(t.getFieldCode())) {

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

@@ -285,6 +285,10 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 set(AlertFormValue::getFieldValue,DateUtils.date2LongStr(now)).
                 eq(AlertFormValue::getFieldCode,"save_time").
                 eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+        // 更新救出冗余字段
+        dispatchPaperServiceImpl.update(new LambdaUpdateWrapper<DispatchPaper>().eq(DispatchPaper::getSequenceNbr,task.getPaperId())
+                .set(DispatchPaper::getSaveTime,now)
+        );
         // 如果存在救援过程表更新救援过程表中信息
         if(task.getIsSaveTask()) {
             rescueProcessServiceImpl.update(new LambdaUpdateWrapper<RescueProcess>().
@@ -457,12 +461,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 paperList = iAlertFormValueService.list(queryWrapper);
                 paperList.stream().forEach(t -> {
                     String value = t.getFieldValue();
-                    if("save_time".equals(t.getFieldCode())) {
-                        // 救援完成时间
-                        if(StringUtils.isNotBlank(value)) {
-                            temp.setSaveTime(DateUtils.longStr2Date(value));
-                        }
-                    } else if("error_result".equals(t.getFieldCode())) {
+                    if("error_result".equals(t.getFieldCode())) {
                         // 故障原因
                         temp.setErrorResult(value);
                     } else if("fix_result".equals(t.getFieldCode())) {
@@ -487,12 +486,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 paperList = iAlertFormValueService.list(queryWrapper);
                 paperList.stream().forEach(t -> {
                     String value = t.getFieldValue();
-                    if("save_time".equals(t.getFieldCode())) {
-                        // 救援完成时间
-                        if(StringUtils.isNotBlank(value)) {
-                            temp.setSaveTime(DateUtils.longStr2Date(value));
-                        }
-                    } else if("error_result".equals(t.getFieldCode())) {
+                    if("error_result".equals(t.getFieldCode())) {
                         // 故障原因
                         temp.setErrorResult(value);
                     } else if("fix_result".equals(t.getFieldCode())) {
@@ -676,12 +670,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 paperList = iAlertFormValueService.list(queryWrapper);
                 paperList.stream().forEach(t -> {
                     String value = t.getFieldValue();
-                    if("save_time".equals(t.getFieldCode())) {
-                        // 救援完成时间
-                        if(StringUtils.isNotBlank(value)) {
-                            temp.setSaveTime(DateUtils.longStr2Date(value));
-                        }
-                    } else if("error_result".equals(t.getFieldCode())) {
+                    if("error_result".equals(t.getFieldCode())) {
                         // 故障原因
                         temp.setErrorResult(value);
                     } else if("fix_result".equals(t.getFieldCode())) {
@@ -706,12 +695,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 paperList = iAlertFormValueService.list(queryWrapper);
                 paperList.stream().forEach(t -> {
                     String value = t.getFieldValue();
-                    if("save_time".equals(t.getFieldCode())) {
-                        // 救援完成时间
-                        if(StringUtils.isNotBlank(value)) {
-                            temp.setSaveTime(DateUtils.longStr2Date(value));
-                        }
-                    } else if("error_result".equals(t.getFieldCode())) {
+                    if("error_result".equals(t.getFieldCode())) {
                         // 故障原因
                         temp.setErrorResult(value);
                     } else if("fix_result".equals(t.getFieldCode())) {

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

@@ -211,6 +211,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
                 throw new BadRequest("派遣单信息未找到");
             }
             DispatchPaper dispatchPaper = dispatchPaperDto.getDispatchPaper();
+            dispatchPaper.setArriveTime(rescueProcessDto.getArriveTime());
             dispatchPaper.setArriveFeedbackCode(rescueProcessDto.getArriveFeedbackCode());
             dispatchPaper.setArriveFeedbackType(rescueProcessDto.getArriveFeedbackType());
             //  更新派遣单
@@ -239,6 +240,10 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
             if(taskId == null) {
                 throw new BadRequest("派遣任务单信息未找到");
             }
+            DispatchPaper dispatchPaper = dispatchPaperDto.getDispatchPaper();
+            dispatchPaper.setSaveTime(rescueProcessDto.getRescueTime());
+            //  更新派遣单
+            dispatchPaperServiceImpl.updateById(dispatchPaper);
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(rescueProcessDto.getAlertId(),"JC",taskId,sendUser); //保存接警日志
         }