坐席端 点击到达 救援完成 矩阵更新

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

@@ -301,14 +301,14 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         String [] str = new String[]{"使用单位","一级响应","二级响应","三级响应","市级监督"};
 
         if(null != dispatchPaper) {
+            map.put("adNotice",dispatchPaper.getDispatchTime());
+            map.put("aedArrive",dispatchPaper.getArriveTime());
+            map.put("afeComplete",dispatchPaper.getSaveTime());
             for(String s:str) {
                 AlertHandlerInfoDto alertHandlerInfoDto = new AlertHandlerInfoDto();
                 if(null != dispatchTask &&dispatchTask.size() > 0 ) {
                     List<DispatchTask> taskList =  dispatchTask.stream().filter(e->e.getOrgType().equals(s)).collect(Collectors.toList());
                     if(taskList.size() > 0) {
-                        map.put("adNotice",called.getRecDate());
-                        map.put("aedArrive",dispatchTask.get(0).getArriveTime());
-                        map.put("afeComplete",dispatchTask.get(0).getSaveTime());
                         dataInit(alertHandlerInfoDto,s,"", "","已派遣",
                                 dispatchTask.get(0).getArriveTime() == null ? "" : "已到达" ,dispatchTask.get(0).getSaveTime() == null ? "" : "已完成",
                                 dispatchPaper.getFeedbackTime() != null || dispatchPaper.getFeedbackFinishTime() != null ? "已回访" : "");

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

@@ -224,7 +224,8 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
             if(taskId == null) {
                 throw new BadRequest("派遣任务单信息未找到");
             }
-
+             // 更新派遣到达时间
+            dispatchTaskServiceImpl.update(new LambdaUpdateWrapper<DispatchTask>().eq(DispatchTask::getSequenceNbr,taskId).set(DispatchTask::getArriveTime,rescueProcessDto.getArriveTime()));
             repairConsultServiceImpl.saveRepairConsultByAlertIdType( rescueProcessDto.getAlertId(),"DD",taskId,sendUser); //保存接警日志
         }
         if(saveByUser) { // 手动救援
@@ -243,6 +244,8 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
             DispatchPaper dispatchPaper = dispatchPaperDto.getDispatchPaper();
             dispatchPaper.setSaveTime(rescueProcessDto.getRescueTime());
             //  更新派遣单
+            // 更新派遣救援时间
+            dispatchTaskServiceImpl.update(new LambdaUpdateWrapper<DispatchTask>().eq(DispatchTask::getSequenceNbr,taskId).set(DispatchTask::getSaveTime,rescueProcessDto.getRescueTime()));
             dispatchPaperServiceImpl.updateById(dispatchPaper);
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(rescueProcessDto.getAlertId(),"JC",taskId,sendUser); //保存接警日志
         }