Merge branch 'developer' into developer-latentDanger

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

@@ -25,7 +25,10 @@
         a.alert_stage alertStage,
         a.call_time callTime,
         a.rescue_grid rescueGrid,
-        a.alert_type alertType,
+--         a.alert_type alertType,
+
+
+        CONCAT('【',a.alert_type,'】',IFNULL((select  field_value from  jc_alert_form_value  where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType,
         a.alert_type_code alarmTypeCode,
         a.unit_involved unitInvolved,
         a.trapped_num trappedNum,

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -227,7 +227,7 @@ public class InputItem extends BasicEntity {
     private String ext;
 
     @Column(name = "item_type_classify_ids")
-    private Integer itemTypeClassifyIds;
+    private String itemTypeClassifyIds;
 
     public Integer getItemStart() {
         return itemStart;
@@ -522,11 +522,11 @@ public class InputItem extends BasicEntity {
         return ext;
     }
 
-    public Integer getItemTypeClassifyIds() {
+    public String getItemTypeClassifyIds() {
         return itemTypeClassifyIds;
     }
 
-    public void setItemTypeClassifyIds(Integer itemTypeClassifyIds) {
+    public void setItemTypeClassifyIds(String itemTypeClassifyIds) {
         this.itemTypeClassifyIds = itemTypeClassifyIds;
     }
 }
\ No newline at end of file

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-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/InputItemParam.java

@@ -31,6 +31,7 @@ public class InputItemParam {
 	private String itemTypeClassify;
 	private String itemLevel;
 	private String itemStart;
+	private String itemTypeClassifyIds;
 
 	public String getItemStart() {
 		return itemStart;
@@ -227,4 +228,11 @@ public class InputItemParam {
 	}
 
 
+	public String getItemTypeClassifyIds() {
+		return itemTypeClassifyIds;
+	}
+
+	public void setItemTypeClassifyIds(String itemTypeClassifyIds) {
+		this.itemTypeClassifyIds = itemTypeClassifyIds;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -1544,6 +1544,7 @@ public class CheckServiceImpl implements ICheckService {
                     d.setBizId(c.getId());
                     d.setBizType(contextPath.substring(1));
                     d.setCheckMode(DangerHandleTypeEnum.SUPERVISION.getCode());
+                    d.setInputItemName(c.getInputName());
                 });
                 allDanger.addAll(c.getDangerDtoList());
 
@@ -1587,6 +1588,7 @@ public class CheckServiceImpl implements ICheckService {
                 hiddenDangerDto.setPlanId(planTask.getPlanId());
                 hiddenDangerDto.setPointId(recordParam.getPointId());
                 hiddenDangerDto.setCheckInputId(dangerDto.getBizId());
+                hiddenDangerDto.setInputItemName(dangerDto.getInputItemName());
                 hiddenDangerDto.setDangerType(DangerHandleTypeEnum.SUPERVISION.getCode());
                 try {
                     dangerDto.setBizInfo(iHiddenDangerService.buildBizInfo(hiddenDangerDto));

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/AlertCalledServiceImpl.java

@@ -468,7 +468,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             // 警情报送
             alertCalled.setAlertStatus(false);
             alertCalled.setAlertSource(AlertStageEnums.APPJJ.getValue());
-            alertCalled.setAlertSourceCode(AlertStageEnums.APPJJ.getCode());
+            alertCalled.setAlertSourceCode(AlertStageEnums.APPJJ.getId());
             alertCalled.setIsDelete(false);
             alertCalled.setAlertStage(AlertStageEnums.JJ.getValue());
             alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());

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);