Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/SafetyProblemTypeEnum.java

@@ -17,7 +17,8 @@ public enum SafetyProblemTypeEnum {
     JYBJ("21", "检验报检", "设备报检", "safetyProblemTracing/jy/bj", null),
     WBCQ("1", "维保超期", "设备维保超期", "safetyProblemTracing/wb/cq", "outOfMaintenanceRecords"),
     WBBA("11", "维保合同备案", "设备维保合同备案", "safetyProblemTracing/wb/ba", null),
-    XKCQ("3", "许可超期", "企业许可超期", "safetyProblemTracing/xk/cq", null);
+    XKCQ("3", "许可超期", "企业许可超期", "safetyProblemTracing/xk/cq", null),
+    ZZCQ("4", "人员资质超期", "人员资质超期", "safetyProblemTracing/zz/cq", null);
 
     private final String code;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -146,7 +146,10 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * 查询许可超期的企业
      * */
     List<Map<String, Object>> queryOutOfQualificationRecord();
-
+    /**
+     * 查询资质超期的证书
+     **/
+    List<Map<String, Object>> queryOutOfCertificationRecord();
     /**
      * 大屏业务全过程统计已经完成的单据
      *
@@ -233,5 +236,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     void updateEnterpriseSafetyStatus(@Param("useUnitCodeList") Set<String> useUnitCodeList);
 
     List<EquipmentClassifyDto> getEquClassifyByCode(@Param("parentCode") String parentCode);
+
+
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -2618,4 +2618,23 @@
         )
         SELECT * FROM category_tree ORDER BY level;
     </select>
+    <select id="queryOutOfCertificationRecord" resultType="java.util.Map">
+        SELECT
+            ei.use_unit_code useUnitCode,
+            ei.use_unit useUnit,
+            ei.unit_type unitType,
+            ei.supervise_org_code superviseOrgCode,
+            ei.supervise_org_name superviseOrgName,
+            tup.sequence_nbr permissionSeq,
+            tup.cert_no certNo,
+            tup.expiry_date expiryDate,
+            tui.name  userName
+        FROM
+        tzs_user_permission tup
+        LEFT JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_unit_code = tui.unit_code
+        WHERE
+        tup.expiry_date <![CDATA[<]]>  CURRENT_DATE AND tup.permission_post IN ('permissionData66151', 'permissionData66152', 'permissionData6552');
+
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -27,9 +27,6 @@
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
             </if>
-            <if test="dto.orgBranchCode != null and dto.orgBranchCode != ''">
-                and tjvi.org_branch_code like concat(#{dto.orgBranchCode},'%')
-            </if>
             <if test="roleIds != null and dto.dataType == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -420,6 +420,19 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.getCreatTree());
     }
 
+    /**
+     * 获取当前登录人单位及以下管辖分局树
+     *
+     * @return result
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/loginUnitAndBelow/getCreatTree")
+    @ApiOperation(httpMethod = "GET", value = "获取当前登录人单位及以下管辖分局树", notes = "获取当前登录人单位及以下管辖分局树")
+    public ResponseModel<Object> loginUnitAndBelowGetTree() {
+        String orgCode = getSelectedOrgInfo().getCompany().getOrgCode();
+        return ResponseHelper.buildResponse(commonService.loginUnitAndBelowGetTree(orgCode));
+    }
+
 
     /**
      * 获取管辖分局树

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java

@@ -144,7 +144,7 @@ public class JgVehicleInformationController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
-            dto.setOrgBranchCode(info.getCompany().getOrgCode());
+            dto.setOrgBranchCode(dto.getOrgBranchCode() != null ? dto.getOrgBranchCode() : info.getCompany().getOrgCode());
         }
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/SafetyProblemEventHandlerFactory.java

@@ -30,6 +30,8 @@ public class SafetyProblemEventHandlerFactory {
             return new JYBJEventHandler(safetyProblemTracingService, idxBizJgOtherInfoService, esEquipmentCategory);
         } else if (topic.startsWith(SafetyProblemTypeEnum.XKCQ.getTopic())) {
             return new XKCQEventHandler(safetyProblemTracingService);
+        }else if (topic.startsWith(SafetyProblemTypeEnum.ZZCQ.getTopic())) {
+            return new ZZCQEventHandler(safetyProblemTracingService);
         } else {
             // 其他策略类的创建
             throw new IllegalArgumentException("Unsupported topic: " + topic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/ZZCQEventHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.handler;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
+import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
+import com.yeejoin.amos.boot.module.jg.biz.listener.SafetyProblemTopicMessage;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * ZZCQEventHandler 类实现了 SafetyProblemEventHandler 接口，
+ * 用于处理人员资质超期安全问题事件。
+ */
+@Component
+public class ZZCQEventHandler implements SafetyProblemEventHandler {
+
+    SafetyProblemTracingServiceImpl safetyProblemTracingService;
+
+    @Autowired
+    public ZZCQEventHandler(SafetyProblemTracingServiceImpl safetyProblemTracingService) {
+        this.safetyProblemTracingService = safetyProblemTracingService;
+    }
+
+    /**
+     * 处理安全问题事件。
+     *
+     * @param event 安全问题事件对象，包含事件的详细信息。
+     *              该参数用于描述发生的安全问题事件。
+     */
+    @Override
+    public void handle(SafetyProblemEvent event) {
+        // 此处为处理安全问题事件的逻辑代码
+        JSONArray jsonArray = JSONObject.parseArray(event.getMessage().toString());
+        generateProblem(jsonArray);
+    }
+
+    private void generateProblem(JSONArray jsonArray) {
+        SafetyProblemTopicMessage.generatePersonnelProblem(jsonArray, SafetyProblemTypeEnum.ZZCQ, safetyProblemTracingService);
+    }
+}
+

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/listener/SafetyProblemTopicMessage.java

@@ -186,6 +186,42 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                             .eq("problem_status_code", SafetyProblemStatusEnum.UNHANDLED.getCode()));}
     }
 
+    public static void generatePersonnelProblem(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
+        if (jsonArray == null || problemTypeEnum == null) {
+            throw new IllegalArgumentException("jsonObject and problemTypeEnum must not be null.");
+        }
+        if (!ValidationUtil.isEmpty(jsonArray)) {
+            List<SafetyProblemTracing> safetyProblemTracingList = jsonArray.stream().map(item -> {
+                if (!(item instanceof JSONObject)) {
+                    throw new IllegalArgumentException("item is not a JSONObject.");
+                }
+                JSONObject json = (JSONObject) item;
+                SafetyProblemTracing safetyProblemTracing = new SafetyProblemTracing();
+                safetyProblemTracing.setProblemType(problemTypeEnum.getName());
+                safetyProblemTracing.setProblemTypeCode(problemTypeEnum.getCode());
+                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc() + "-" + json.getOrDefault("userName", "") + "-" + json.getOrDefault("certNo", ""));
+                safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.PERSONNEL.getName());
+                safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.PERSONNEL.getCode());
+                safetyProblemTracing.setSourceId(json.getOrDefault("permissionSeq", "").toString());
+                safetyProblemTracing.setProblemTime(new Date());
+                safetyProblemTracing.setPrincipalUnit(json.getOrDefault("useUnit", "").toString());
+                safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
+                safetyProblemTracing.setPrincipalUnitType(json.getOrDefault("unitType", "").toString());
+                safetyProblemTracing.setGoverningBody(json.getOrDefault("superviseOrgName", "").toString());
+                safetyProblemTracing.setGoverningBodyCode(json.getOrDefault("useUnitCode", "").toString());
+                safetyProblemTracing.setGoverningBodyOrgCode(json.getOrDefault("superviseOrgCode", "").toString());
+                safetyProblemTracing.setCreateDate(new Date());
+                safetyProblemTracing.setProblemStatus(SafetyProblemStatusEnum.UNHANDLED.getName());
+                safetyProblemTracing.setProblemStatusCode(SafetyProblemStatusEnum.UNHANDLED.getCode());
+                return safetyProblemTracing;
+            }).collect(Collectors.toList());
+            safetyProblemTracingService.saveOrUpdateBatchByColumns(safetyProblemTracingList,
+                    safetyProblemTracing -> new QueryWrapper<>()
+                            .eq("problem_type_code", safetyProblemTracing.getProblemTypeCode())
+                            .eq("source_id", safetyProblemTracing.getSourceId())
+                            .eq("problem_status_code", SafetyProblemStatusEnum.UNHANDLED.getCode()));}
+    }
+
     public String buildTopic(String topic) {
         String topicPrefix = "$share/" + applicationName;
         return String.format("%s/%s", topicPrefix, topic);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -80,6 +80,8 @@ public interface ICommonService {
 
     List<LinkedHashMap> getCreatTree();
 
+    List<LinkedHashMap> loginUnitAndBelowGetTree(String orgCode);
+
     List<LinkedHashMap> getCreatTreeByInstallation();
 
     List<LinkedHashMap> getCreatTreeByInstallationTree();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -422,6 +422,13 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    public List<LinkedHashMap> loginUnitAndBelowGetTree(String orgCode) {
+        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE + "_" + orgCode);
+        // 判断redis是否存在管辖机构树
+        return !ObjectUtils.isEmpty(result) ? result : creatlLoginUnitAndBelowGetTree(orgCode);
+    }
+
+    @Override
     public List<LinkedHashMap> getCreatTreeByInstallation() {
         List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE_ALL);
         // 判断redis是否存在管辖机构树
@@ -632,6 +639,34 @@ public class CommonServiceImpl implements ICommonService {
         return resultTree;
     }
 
+    public List<LinkedHashMap> creatlLoginUnitAndBelowGetTree(String orgCode) {
+        FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
+        List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
+        List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
+        List<LinkedHashMap> supervisionTree = orgCodeAndBelowGetTree(treeData, orgCode);
+        List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
+        redisUtils.set(REGULATOR_UNIT_TREE + "_" + orgCode, resultTree);
+        return resultTree;
+    }
+
+    private List<LinkedHashMap> orgCodeAndBelowGetTree(List<LinkedHashMap> treeData, String orgCode) {
+        if (treeData != null) {
+            for (LinkedHashMap node : treeData) {
+                if (orgCode.equals(node.get("orgCode"))) {
+                    return Collections.singletonList(node);
+                }
+                if (node.get("children") != null) {
+                    List<LinkedHashMap> result = orgCodeAndBelowGetTree((List<LinkedHashMap>) node.get("children"), orgCode);
+                    if (!result.isEmpty()) {
+                        return result;
+                    }
+                }
+            }
+        }
+        return Collections.emptyList();
+    }
+
+
     private List<LinkedHashMap> creatReceiveUnitTree(String bizType) {
         FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingGenServiceImpl.java

@@ -60,9 +60,17 @@ public class SafetyProblemTracingGenServiceImpl{
     public void executeSafetyProblemCheck() {
         executeMaintenanceCheck();
         executeInspectionCheck();
+        executePersonnalCertificationCheck();
         executeEnterpriseQualificationCheck();
     }
 
+    private void executePersonnalCertificationCheck() {
+        logger.info("开始人员资质超期检查");
+        List<Map<String, Object>> certificationRecords = commonMapper.queryOutOfCertificationRecord();
+        sendSafetyProblemMessage(certificationRecords, SafetyProblemTypeEnum.ZZCQ);
+        logger.info("人员资质超期检查结束");
+    }
+
     public void executeInspectionCheck() {
         logger.info("开始检验检测超期检查");
         // 查询当天检验超期的设备

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/SafetyProblemTracingDto.java

+package com.yeejoin.amos.boot.module.tcm.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 安全追溯问题
+ *
+ * @author system_generator
+ * @date 2024-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "SafetyProblemTracingDto", description = "安全追溯问题")
+public class SafetyProblemTracingDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "问题编号")
+    private String problemNum;
+
+    @ApiModelProperty(value = "问题类型（维保超期、检验超期、资质超期等）")
+    private String problemType;
+
+    @ApiModelProperty(value = "问题类型图片")
+    private String problemTypePic;
+
+    @ApiModelProperty(value = "问题来源类型（1个人、2设备、3企业）")
+    private String sourceType;
+
+    @ApiModelProperty(value = "问题来源ID（个人ID、设备ID、企业ID）")
+    private String sourceId;
+
+    @ApiModelProperty(value = "问题描述")
+    private String problemDesc;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "问题产生查询开始时间")
+    private Date problemTimeStart;
+
+    @ApiModelProperty(value = "问题产生时间")
+    private Date problemTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "问题产生查询结束时间")
+    private Date problemTimeEnd;
+
+    @ApiModelProperty(value = "主体单位名称")
+    private String principalUnit;
+
+    @ApiModelProperty(value = "主体单位统一代码")
+    private String principalUnitCode;
+
+    @ApiModelProperty(value = "主体单位类型（使用、安改维、检验检测等）")
+    private String principalUnitType;
+
+    @ApiModelProperty(value = "管辖机构名称")
+    private String governingBody;
+
+    @ApiModelProperty(value = "管辖机构单位代码")
+    private String governingBodyCode;
+
+    @ApiModelProperty(value = "管辖机构组织机构代码（例如50*60*70）")
+    private String governingBodyOrgCode;
+
+    @ApiModelProperty(value = "主体单位所属区域名称（陕西省/西安市/莲湖区）")
+    private String regionName;
+
+    @ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
+    private String regionCode;
+
+    @ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
+    private String cityCode;
+
+    @ApiModelProperty(value = "问题状态（0未处理、1已处理）")
+    private String problemStatus;
+
+    @ApiModelProperty(value = "问题状态代码（0未处理、1已处理）")
+    private String problemStatusCode;
+
+    @ApiModelProperty(value = "问题状态对象")
+    private Map<String, String> problemStatusObj;
+
+    @ApiModelProperty(value = "更新人员")
+    private String recUser;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "企业负责人")
+    private String unitCharger;
+
+    @ApiModelProperty(value = "企业负责人联系电话")
+    private String unitChargerPhone;
+
+    @ApiModelProperty(value = "设备监管码")
+    private String equipSuperviseCode;
+
+    @ApiModelProperty(value = "设备种类")
+    private String equipList;
+
+    @ApiModelProperty(value = "人员名称")
+    private String userName;
+
+    @ApiModelProperty(value = "人员电话")
+    private String userPhone;
+
+    @ApiModelProperty(value = "人员岗位")
+    private String userPost;
+
+    @ApiModelProperty(value = "扩展信息")
+    private String extraInfo;
+
+    @ApiModelProperty(value = "设备种类代码")
+    private String equipListCode;
+
+    @ApiModelProperty(value = "问题类型代码（维保超期、检验超期、资质超期等）")
+    private String problemTypeCode;
+
+    @ApiModelProperty(value = "问题来源类型code（1个人、2设备、3企业）")
+    private String sourceTypeCode;
+
+    @ApiModelProperty(value = "问题等级（一级、二级、三级）")
+    private String problemLevel;
+
+    @ApiModelProperty(value = "问题等级code")
+    private String problemLevelCode;
+
+    @ApiModelProperty(value = "隐患等级（红：隐患状态为未处理、黄：暂无、绿：隐患状态为已处理、灰：暂无）")
+    private String hiddenDangersLevel;
+
+    @ApiModelProperty(value = "设备类别code")
+    private String equCategoryCode;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/SafetyProblemTracing.java

+package com.yeejoin.amos.boot.module.tcm.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 安全追溯问题
+ *
+ * @author system_generator
+ * @date 2024-05-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_safety_problem_tracing")
+public class SafetyProblemTracing extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 问题编号
+     */
+	@TableField("problem_num")
+    private String problemNum;
+
+    /**
+     * 问题类型（维保超期、检验超期、资质超期等）
+     */
+	@TableField("problem_type")
+    private String problemType;
+
+    /**
+     * 问题来源类型（1个人、2企业、3设备）
+     */
+	@TableField("source_type")
+    private String sourceType;
+
+    /**
+     * 问题来源ID（个人ID、设备ID、企业ID）
+     */
+	@TableField("source_id")
+    private String sourceId;
+
+    /**
+     * 问题描述
+     */
+	@TableField("problem_desc")
+    private String problemDesc;
+
+    /**
+     * 问题产生时间
+     */
+	@TableField("problem_time")
+    private Date problemTime;
+
+    /**
+     * 主体单位名称
+     */
+	@TableField("principal_unit")
+    private String principalUnit;
+
+    /**
+     * 主体单位统一代码
+     */
+	@TableField("principal_unit_code")
+    private String principalUnitCode;
+
+    /**
+     * 主体单位类型（使用、安改维、检验检测等）
+     */
+	@TableField("principal_unit_type")
+    private String principalUnitType;
+
+    /**
+     * 管辖机构名称
+     */
+	@TableField("governing_body")
+    private String governingBody;
+
+    /**
+     * 管辖机构单位代码
+     */
+	@TableField("governing_body_code")
+    private String governingBodyCode;
+
+    /**
+     * 管辖机构组织机构代码（例如50*60*70）
+     */
+	@TableField("governing_body_org_code")
+    private String governingBodyOrgCode;
+
+    /**
+     * 主体单位所属区域名称（陕西省/西安市/莲湖区）
+     */
+	@TableField("region_name")
+    private String regionName;
+
+    /**
+     * 所属区域代码（6100000/6100010/6100011）
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 问题状态（0未处理、1已处理）
+     */
+	@TableField("problem_status")
+    private String problemStatus;
+
+    /**
+     * 问题状态代码（0未处理、1已处理）
+     */
+    @TableField("problem_status_code")
+    private String problemStatusCode;
+
+    /**
+     * 更新人员
+     */
+	@TableField("rec_user")
+    private String recUser;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user")
+    private String createUser;
+
+    /**
+     * 企业负责人
+     */
+	@TableField("unit_charger")
+    private String unitCharger;
+
+    /**
+     * 企业负责人联系电话
+     */
+	@TableField("unit_charger_phone")
+    private String unitChargerPhone;
+
+    /**
+     * 设备监管码
+     */
+	@TableField("equip_supervise_code")
+    private String equipSuperviseCode;
+
+    /**
+     * 设备种类
+     */
+	@TableField("equip_list")
+    private String equipList;
+
+    /**
+     * 人员名称
+     */
+	@TableField("user_name")
+    private String userName;
+
+    /**
+     * 人员电话
+     */
+	@TableField("user_phone")
+    private String userPhone;
+
+    /**
+     * 人员岗位
+     */
+	@TableField("user_post")
+    private String userPost;
+
+    /**
+     * 扩展信息
+     */
+	@TableField("extraInfo")
+    private String extraInfo;
+
+    /**
+     * 设备种类代码
+     */
+	@TableField("equip_list_code")
+    private String equipListCode;
+
+    /**
+     * 问题类型代码（维保超期、检验超期、资质超期等）
+     */
+	@TableField("problem_type_code")
+    private String problemTypeCode;
+
+    /**
+     * 问题来源类型code（1个人、2企业、3设备）
+     */
+	@TableField("source_type_code")
+    private String sourceTypeCode;
+
+    /**
+     * 问题等级（一级、二级、三级）
+     */
+	@TableField("problem_level")
+    private String problemLevel;
+
+    /**
+     * 问题等级code
+     */
+	@TableField("problem_level_code")
+    private String problemLevelCode;
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/SafetyProblemSourceTypeEnum.java

+package com.yeejoin.amos.boot.module.tcm.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 业务类型枚举
+ *
+ * @author Administrator
+ */
+@Getter
+public enum SafetyProblemSourceTypeEnum {
+
+    /**
+     * 问题主体类型
+     */
+    UNIT("2", "企业"),
+
+    EQUIP("3", "设备"),
+
+    PERSONNEL("1", "个人");
+
+    private final String code;
+
+    private final String name;
+
+    SafetyProblemSourceTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (SafetyProblemSourceTypeEnum enumOne : SafetyProblemSourceTypeEnum.values()) {
+            if (enumOne.getCode().equals(code)) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/SafetyProblemStatusEnum.java

+package com.yeejoin.amos.boot.module.tcm.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 业务类型枚举
+ *
+ * @author Administrator
+ */
+@Getter
+public enum SafetyProblemStatusEnum {
+
+    /**
+     * 问题主体类型
+     */
+    UNHANDLED("0", "未处理", "red"),
+
+    HANDLED("1", "已处理", "green");
+
+    private final String code;
+
+    private final String name;
+
+    private final String color;
+
+    SafetyProblemStatusEnum(String code, String name, String color) {
+        this.code = code;
+        this.name = name;
+        this.color = color;
+    }
+
+    public static String getNameByType(String code) {
+        String name = null;
+        for (SafetyProblemStatusEnum enumOne : SafetyProblemStatusEnum.values()) {
+            if (enumOne.getCode().equals(code)) {
+                name = enumOne.getName();
+                break;
+            }
+        }
+        return name;
+    }
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/SafetyProblemTracingMapper.java

+package com.yeejoin.amos.boot.module.tcm.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tcm.api.entity.SafetyProblemTracing;
+
+/**
+ * 安全追溯问题 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-05-21
+ */
+public interface SafetyProblemTracingMapper extends BaseMapper<SafetyProblemTracing> {
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ISafetyProblemTracingService.java

+package com.yeejoin.amos.boot.module.tcm.api.service;
+
+/**
+ * 安全追溯问题接口类
+ *
+ * @author system_generator
+ * @date 2024-05-21
+ */
+public interface ISafetyProblemTracingService {}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/SafetyProblemTracingServiceImpl.java

+package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tcm.api.dto.SafetyProblemTracingDto;
+import com.yeejoin.amos.boot.module.tcm.api.entity.SafetyProblemTracing;
+import com.yeejoin.amos.boot.module.tcm.api.mapper.SafetyProblemTracingMapper;
+import com.yeejoin.amos.boot.module.tcm.api.service.ISafetyProblemTracingService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * 安全追溯问题服务实现类
+ *
+ * @author system_generator
+ * @date 2024-05-21
+ */
+@Service
+public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTracingDto, SafetyProblemTracing, SafetyProblemTracingMapper> implements ISafetyProblemTracingService {
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserPermissionServiceImpl.java

 package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.TzsUserPermissionDto;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.entity.SafetyProblemTracing;
+import com.yeejoin.amos.boot.module.tcm.api.enums.SafetyProblemSourceTypeEnum;
+import com.yeejoin.amos.boot.module.tcm.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -66,6 +72,8 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
     public List<TzsUserPermissionDto> queryForTzsUserPermissionList() {
         return this.queryForList("", false);
     }
+    @Autowired
+    private SafetyProblemTracingServiceImpl safetyProblemTracingService;
 
     /**
      * 更新资质权限数据
@@ -151,12 +159,35 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
                 .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
                 .toFormatter();
 
+        Object sequenceNbr = permissionData.get("sequenceNbr");
+        if(Objects.nonNull(sequenceNbr)){
+            permission.setSequenceNbr(Long.valueOf(String.valueOf(sequenceNbr)));
+        }
+
         String expiryDateString = String.valueOf(Optional.ofNullable(permissionData.get("expiryDate")).orElse(""));
         if (!ValidationUtil.isEmpty(expiryDateString)) {
             LocalDate localDate1 = LocalDate.parse(expiryDateString, formatter);
             LocalDateTime localDateTime1 = localDate1.atStartOfDay();
             Date expiryDate = Date.from(localDateTime1.atZone(ZoneId.systemDefault()).toInstant());
             permission.setExpiryDate(expiryDate);
+            //如果有效期大于当前日期，同时问题列表有未处理的问题，则修改成已处理
+            LocalDate now = LocalDate.now();
+            if(!localDate1.isBefore(now) && Objects.nonNull(sequenceNbr)){
+                LambdaQueryWrapper<SafetyProblemTracing> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(SafetyProblemTracing::getSourceId,sequenceNbr)
+                        .eq(SafetyProblemTracing::getSourceTypeCode, SafetyProblemSourceTypeEnum.PERSONNEL.getCode())
+                        .eq(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.UNHANDLED.getCode());
+                List<SafetyProblemTracing> safetyProblemTracingList = safetyProblemTracingService.list(wrapper);
+                if(CollUtil.isNotEmpty(safetyProblemTracingList)){
+                    LambdaUpdateWrapper<SafetyProblemTracing> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.set(SafetyProblemTracing::getProblemStatusCode, SafetyProblemStatusEnum.HANDLED.getCode())
+                            .set(SafetyProblemTracing::getProblemStatus, SafetyProblemStatusEnum.HANDLED.getName())
+                            .set(SafetyProblemTracing::getRecDate,new Date())
+                            .eq(SafetyProblemTracing::getSourceId,sequenceNbr)
+                            .eq(SafetyProblemTracing::getSourceTypeCode, SafetyProblemSourceTypeEnum.PERSONNEL.getCode());
+                    safetyProblemTracingService.update(updateWrapper);
+                }
+            }
         }
 
         String issueDateString = String.valueOf(Optional.ofNullable(permissionData.get("issueDate")).orElse(""));
@@ -166,7 +197,6 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
             Date issueDate = Date.from(localDateTime2.atZone(ZoneId.systemDefault()).toInstant());
             permission.setIssueDate(issueDate);
         }
-
         permission.setApprovedOrgan((String) permissionData.get("approvedOrgan"));
         permission.setCertAttachment(JSONArray.toJSONString(permissionData.get("certAttachment")));
         permission.setCertType(ZYRY_TYPE.equals(type) ? String.valueOf(permissionData.get("certType")) : null);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/UseInfoMapper.xml

@@ -27,7 +27,7 @@
             register.EQU_CODE,
             register.EQU_LIST,
             supervision.ORG_BRANCH_CODE,
-            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.REC_DATE desc limit 1) as NEXT_INSPECT_DATE
+            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.INSPECT_DATE desc limit 1) as NEXT_INSPECT_DATE
             FROM
             idx_biz_jg_use_info use
             LEFT JOIN	idx_biz_jg_register_info register on register.RECORD = use.RECORD