Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -82,6 +82,8 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "条数")
    private Integer pageSize;
 
-
+   @ExcelIgnore
+   @ApiModelProperty(value = "ID")
+   private Long sequenceNbr;
 
 }

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

@@ -178,6 +178,7 @@
 
 	<select id="queryAlertListByQueryDto" resultType="java.util.Map">
 		SELECT
+		a.sequence_nbr AS sequenceNbr,
 		a.work_order_number AS workOrderNumber,
 		a.rec_user_name AS
 		creator,

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

@@ -321,7 +321,9 @@ public class DispatchTaskController extends BaseController {
 						temp.setActionResult(value);
 					}
 				});
-
+                imgMap = sourceFileService.getAttachments(temp.getPaperId());
+                imgDtos = imgMap.get("imgs");
+                temp.setFixImgs(imgDtos);
 				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
 				errorImgDtos = errorImgMap.get("imgs");
 				temp.setErrorImgs(errorImgDtos);

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

@@ -627,6 +627,9 @@ public class WechatController extends BaseController {
 						temp.setActionResult(value);
 					}
 				});
+                imgMap = sourceFileService.getAttachments(temp.getPaperId());
+                imgDtos = imgMap.get("imgs");
+                temp.setFixImgs(imgDtos);
 				errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());
 				errorImgDtos = errorImgMap.get("imgs");
 				temp.setErrorImgs(errorImgDtos);

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

@@ -529,6 +529,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     if (dispatchRepairFeedbackDto.getFeedbackFinishTime() != null) {
                         if(alertFormValue.getFieldValue() == null) {// 维修人员反馈
                             tempMap.put("WXFK",true);
+                            dispatchPaper.setRepairUser(dispatchRepairFeedbackDto.getFeedbackUname());
+                            dispatchPaper.setRepairOrgName("坐席");
                         }
                         alertFormValue.setFieldValue(DateUtils.date2LongStr(dispatchRepairFeedbackDto.getFeedbackFinishTime()));
                     }
@@ -590,7 +592,6 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackFinishTime(dispatchRepairFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchRepairFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchRepairFeedbackDto.getFeedbackUname());
-        dispatchPaper.setRepairUser(dispatchRepairFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchRepairFeedbackDto.getRemark());
         dispatchPaper.setFeedbackFinishTime(dispatchRepairFeedbackDto.getFixFeedbackTime());
         if(dispatchPaper.getFeedbackTime() == null && dispatchRepairFeedbackDto.getFixFeedbackTime() != null) { // 上报人反馈
@@ -742,6 +743,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     if (dispatchConsultFeedbackDto.getConsultFeedbackTime() != null) {
                         if(alertFormValue.getFieldValue() == null ) {
                             tempMap.put("FEEDBACK",true);
+                            dispatchPaper.setDealUser(dispatchConsultFeedbackDto.getFeedbackUname());
+                            dispatchPaper.setDealOrgName("坐席");
                         }
                         alertFormValue.setFieldValue(DateUtils.date2LongStr(dispatchConsultFeedbackDto.getConsultFeedbackTime()));
                     }
@@ -798,7 +801,6 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackFinishTime(dispatchConsultFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchConsultFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchConsultFeedbackDto.getFeedbackUname());
-        dispatchPaper.setDealUser(dispatchConsultFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchConsultFeedbackDto.getRemark());
         // 保存动态表单数据
         iAlertFormValueService.updateBatchById(dynamicFormAlert);

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

@@ -507,7 +507,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     }
                 });
 
-
+                imgMap = sourceFileService.getAttachments(temp.getPaperId());
+                imgDtos = imgMap.get("imgs");
+                temp.setFixImgs(imgDtos);
                 errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
                 errorImgDtos = errorImgMap.get("imgs");
                 temp.setErrorImgs(errorImgDtos);
@@ -526,6 +528,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                         temp.setActionResult(value);
                     }
                 });
+                imgMap = sourceFileService.getAttachments(temp.getPaperId());
+                imgDtos = imgMap.get("imgs");
+                temp.setFixImgs(imgDtos);
                 errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
                 errorImgDtos = errorImgMap.get("imgs");
                 temp.setErrorImgs(errorImgDtos);