更新

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RiskDynamicDetailsVo.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author keyong
@@ -18,4 +19,6 @@ public class RiskDynamicDetailsVo {
     private String tabName;
 
     private List<TableContentVo> tabContent;
+
+    private Map<String, Object> specialMap;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -159,4 +159,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     void updatePersonStatus(String status, String id);
 
     List<Map<String, Object>> getFireProtectionAndMaintenance();
+
+    Map<String, Object> getPersonType(@Param("typeCode") String typeCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1414,4 +1414,17 @@ LEFT JOIN (
             postName
     </select>
 
+    <select id="getPersonType" resultType="Map">
+        SELECT
+            dfi.field_value_label AS peopleType
+        FROM
+            cb_org_usr u
+            LEFT JOIN cb_dynamic_form_instance dfi ON dfi.instance_id = u.sequence_nbr
+        WHERE
+            u.is_delete = FALSE
+          AND u.amos_org_id IS NOT NULL
+          AND dfi.field_value = #{typeCode}
+          AND dfi.field_code = 'peopleType'
+        limit 1
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/RiskDynamicDetailsVo.java

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.vo;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author keyong
@@ -18,4 +19,6 @@ public class RiskDynamicDetailsVo {
     private String tabName;
 
     private List<TableContentVo> tabContent;
+
+    private Map<String, Object> specialMap;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3574,6 +3574,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	private RiskBizInfoVo getRiskBizInfo(RiskBizInfoVo riskBizInfoVo, PeopleInfoDto peopleInfoDto,String id) {
+		Map<String, Object> map = new HashMap<>();
 		riskBizInfoVo.setWarningObjectName(peopleInfoDto.getFirefighters().getName());
 		riskBizInfoVo.setWarningObjectCode(id); // 存为cb_org_user 表id 返回给idx 为附码业务后续处理
 		riskBizInfoVo.setSourceAttribution(peopleInfoDto.getFirefighters().getBizOrgCode());
@@ -3584,6 +3585,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			e.printStackTrace();
 		}
 
+		map.put("bizOrgName", peopleInfoDto.getFirefighters().getBizOrgName());
+		map.put("bizOrgCode", peopleInfoDto.getFirefighters().getBizOrgCode());
+		map.put("userName", peopleInfoDto.getFirefighters().getName());
+		map.put("gender", peopleInfoDto.getFirefighters().getGender());
+		map.put("phone", peopleInfoDto.getFirefighters().getMobilePhone());
+		Map<String, Object> typeMap = orgUsrMapper.getPersonType(peopleInfoDto.getFirefighters().getPeopleType());
+		map.put("userType", typeMap.get("peopleType"));
+		map.put("jobType", peopleInfoDto.getFirefighters().getJobTitle());
+		map.put("jobZz", peopleInfoDto.getPostEduDtoObj().getFirefightersPost().getPostQualification());
+
 		List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
 		RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
 		dynamicDetailsVo.setTabName("人员基本信息");
@@ -3674,8 +3685,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			}
 			contentVos.add(contentVo);
 		}
-
 		dynamicDetailsVo.setTabContent(contentVos);
+		dynamicDetailsVo.setSpecialMap(map);
 		detailsVos.add(dynamicDetailsVo);
 		riskBizInfoVo.setDynamicDetails(detailsVos);
 		return riskBizInfoVo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -284,8 +284,12 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     Map<String, Object> getPointById(@Param(value = "pointId")  Long id);
 
+    Map<String, Object> getPatrolData(@Param(value = "checkId")  Long checkId);
+
     List<Map<String, Object>> getListByIds(@Param("list") String[] list, @Param("bizOrgCode") String bizOrgCode);
 
     List<Map<String, Object>> getListByCode(@Param("code") String code, @Param("bizOrgCode") String bizOrgCode);
 
+    String getCheckId(@Param("id") String id);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceServiceImpl.java

@@ -73,8 +73,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         SendToMsgRiskDetailVo detailVo = new SendToMsgRiskDetailVo();
         SendToMsgRiskEquipInfoVo equipInfoVo = new SendToMsgRiskEquipInfoVo();
         SendToMsgRiskAlarmInfoVo equipAlarm = new SendToMsgRiskAlarmInfoVo();
+        Map<String, Object> m = new HashMap<>();
         if (source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
-            List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(id);
+            String checkId = equipmentSpecificMapper.getCheckId(id);
+            List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(checkId);
             Map<String, Object> map = checkInputItems.get(0);
             if (map.containsKey("equipId")) {
                 equipmentSpecId = String.valueOf(map.get("equipId"));
@@ -90,6 +92,17 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 equipInfoVo.setCode(String.valueOf(map.get("item_no")));
                 equipInfoVo.setBizOrgCode(String.valueOf(map.get("biz_org_code")));
                 equipInfoVo.setBizOrgName(String.valueOf(map.get("biz_org_name")));
+
+                Map<String, Object> patrolMap = equipmentSpecificMapper.getPatrolData(Long.valueOf(String.valueOf(checkId)));
+                m.put("station", String.valueOf(map.get("biz_org_name")));
+                m.put("stationCode", String.valueOf(map.get("biz_org_code")));
+                m.put("planName", String.valueOf(patrolMap.get("planName")));
+                m.put("routeName", String.valueOf(patrolMap.get("routeName")));
+                m.put("pointName", String.valueOf(patrolMap.get("pointName")));
+                m.put("inputItemName", String.valueOf(patrolMap.get("inputName")));
+                m.put("checkUser", String.valueOf(patrolMap.get("username")));
+                m.put("checkResult", String.valueOf(patrolMap.get("inputStatus")));
+                m.put("checkTime", String.valueOf(patrolMap.get("checkTime")));
             }
         } else if (source.equalsIgnoreCase(RiskSourceTypeEnum.EQUIP.getName())) {
             equipmentSpecId = id;
@@ -129,6 +142,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 equipInfoVo.setReportIsAlarm(Boolean.TRUE);
                 equipInfoVo.setEquipSpeId(equipmentSpecId);
             }
+
+            m.put("equipSpeId", equipmentSpecId);
+            m.put("checkEquipName", specific.getName());
+            m.put("equipPosition", specific.getPosition());
         }
         detailVo.setEquipInfo(equipInfoVo);
         detailVo.setAlarmInfo(equipAlarm);
@@ -199,6 +216,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
 
         dynamicDetailsVo.setTabContent(contentVos);
+        dynamicDetailsVo.setSpecialMap(m);
         detailsVos.add(dynamicDetailsVo);
         infoVo.setDynamicDetails(detailsVos);
         return infoVo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

 package com.yeejoin.amos.patrol.business.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.patrol.business.dao.repository.ICheckInputDao;
 import com.yeejoin.amos.patrol.business.dto.*;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
 import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
@@ -51,8 +51,10 @@ import javax.xml.transform.*;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -116,6 +118,9 @@ public class CheckController extends AbstractBaseController {
     private CheckMapper checkMapper;
 
     @Autowired
+    private ICheckInputDao checkInputDao;
+
+    @Autowired
     PointMapper pointMapper;
 
     /**

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2461,6 +2461,47 @@
         where p.id = #{pointId}
     </select>
 
+    <select id="getPatrolData" resultType="Map">
+        SELECT
+            pp.id pointId,
+            pp.NAME pointName,
+            pp.point_no pointNo,
+            pc.is_ok pointStatus,
+            ppl. NAME planName,
+            pc.dep_name departmentName,
+            pc.user_name username,
+            pc.check_time checkTime,
+            pc.remark checkRemark,
+            pci.check_id checkId,
+            pci.remark,
+            pii.name inputName,
+            pii.risk_desc riskDesc,
+            pii.item_type itemType,
+            pii.item_type itemType,
+            pii.data_json dataJson,
+            pii.is_must isMust,
+            pii.picture_json pictureJson,
+            pii.is_multiline isMultiline,
+            pci.input_value inputValue,
+            pci.is_ok inputStatus,
+            pci.input_id checkInputId,
+            pci.order_no orderNo,
+            pci.point_classify_name classifyName,
+            pci.point_classify_id classifyId,
+            pr.name routeName
+        FROM
+            p_check_input pci
+            INNER JOIN p_input_item pii ON  pii.id = pci.input_id
+            LEFT JOIN p_check pc ON pc.id = pci.check_id
+            LEFT JOIN p_point pp ON pp.id = pc.point_id
+            LEFT JOIN p_plan ppl ON ppl.id = pc.plan_id
+            LEFT JOIN `p_route` pr ON pr.id = pc.`route_id`
+        WHERE
+            pci.check_id = #{checkId}
+        order by pci.order_no
+        limit 1
+    </select>
+
     <select id="getListByIds" resultType="Map">
         SELECT
             wes.id,
@@ -2515,4 +2556,14 @@
         </where>
     </select>
 
+    <select id="getEquipStatusList" resultType="java.lang.String">
+        SELECT
+            pci.check_id AS `id`
+        FROM
+            p_check_input pci
+        WHERE
+            pci.id = #{id}
+            limit 1
+    </select>
+
 </mapper>
\ No newline at end of file