Merge branch 'develop_tzs_register' of…

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

+package com.yeejoin.amos.boot.module.tcm.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 风险报送 处置过程表
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RiskProcessesDto", description="风险报送 处置过程表")
+public class RiskProcessesDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "风险报送主表seq，关联关系")
+    private String riskReportSeq;
+
+    @ApiModelProperty(value = "业务单位类型（处置单位/整改单位）")
+    private String unitType;
+
+    @ApiModelProperty(value = "业务处置方式code（确认已处置/无需处置/下发整改/整改上报）")
+    private String disposalWayCode;
+
+    @ApiModelProperty(value = "业务处置方式name（确认已处置/无需处置/下发整改/整改上报）")
+    private String disposalWayName;
+
+    @ApiModelProperty(value = "整改内容,监管下发的整改意见/企业上报的整改情况说明")
+    private String disposalContent;
+
+    @ApiModelProperty(value = "附件")
+    private String disposalFile;
+
+    @ApiModelProperty(value = "操作单位seq")
+    private String operationCompanySeq;
+
+    @ApiModelProperty(value = "操作单位name")
+    private String operationCompanyName;
+
+    @ApiModelProperty(value = "操作人userId")
+    private String operationUserId;
+
+    @ApiModelProperty(value = "操作人userName")
+    private String operationUserName;
+
+    @ApiModelProperty(value = "创建时间（根据此时间排序可获取一条风险的完整处置流程）")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人id ")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.tcm.api.dto;
+
+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;
+
+/**
+ * 风险报送表
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RiskReportDto", description="风险报送表")
+public class RiskReportDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "报送编号")
+    private String reportNo;
+
+    @ApiModelProperty(value = "风险类型")
+    private String riskType;
+
+    @ApiModelProperty(value = "报送单位seq")
+    private String reportCompanySeq;
+
+    @ApiModelProperty(value = "报送单位code")
+    private String reportCompanyCode;
+
+    @ApiModelProperty(value = "报送单位name")
+    private String reportCompanyName;
+
+    @ApiModelProperty(value = "风险企业seq")
+    private String riskCompanySeq;
+
+    @ApiModelProperty(value = "风险企业code")
+    private String riskCompanyCode;
+
+    @ApiModelProperty(value = "风险企业name")
+    private String riskCompanyName;
+
+    @ApiModelProperty(value = "风险处置单位seq")
+    private String riskDisposalUnitSeq;
+
+    @ApiModelProperty(value = "风险处置单位code")
+    private String riskDisposalUnitCode;
+
+    @ApiModelProperty(value = "风险处置单位name")
+    private String riskDisposalUnitName;
+
+    @ApiModelProperty(value = "风险处置单位orgCode（考虑到转办，当前单位和此orgCode相同才有处置权限，转办会更新此三项）")
+    private String riskDisposalUnitOrgCode;
+
+    @ApiModelProperty(value = "经手的风险处置单位orgCode（转办会增加此项内容）")
+    private String allRiskDisposalUnitOrgCode;
+
+    @ApiModelProperty(value = "风险关联设备recod(目前没用到，冗余)")
+    private String riskEquipRecord;
+
+    @ApiModelProperty(value = "操作人userId")
+    private String operationUserId;
+
+    @ApiModelProperty(value = "风险正文-标题")
+    private String riskMainTitle;
+
+    @ApiModelProperty(value = "风险正文-内容")
+    private String riskMainContent;
+
+    @ApiModelProperty(value = "风险正文-附件")
+    private String riskMainFile;
+
+    @ApiModelProperty(value = "报送员userId")
+    private String reportUserId;
+
+    @ApiModelProperty(value = "报送员userName")
+    private String reportUserName;
+
+    @ApiModelProperty(value = "报送员phone")
+    private String reportUserPhone;
+
+    @ApiModelProperty(value = "当前阶段（草稿/监管处置/企业整改）")
+    private String currentStage;
+
+    @ApiModelProperty(value = "当前状态（草稿/待处理/待整改/待确认/已办理）")
+    private String currentStatus;
+
+    @ApiModelProperty(value = "处置结束时间")
+    private Date endDate;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.tcm.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 风险报送 处置过程表
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_risk_processes")
+public class RiskProcesses extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 风险报送主表seq，关联关系
+     */
+	@TableField("risk_report_seq")
+    private String riskReportSeq;
+
+    /**
+     * 业务单位类型（处置单位/整改单位）
+     */
+	@TableField("unit_type")
+    private String unitType;
+
+    /**
+     * 业务处置方式code（确认已处置/无需处置/下发整改/整改上报）
+     */
+	@TableField("disposal_way_code")
+    private String disposalWayCode;
+
+    /**
+     * 业务处置方式name（确认已处置/无需处置/下发整改/整改上报）
+     */
+	@TableField("disposal_way_name")
+    private String disposalWayName;
+
+    /**
+     * 整改内容,监管下发的整改意见/企业上报的整改情况说明
+     */
+	@TableField("disposal_content")
+    private String disposalContent;
+
+    /**
+     * 附件
+     */
+	@TableField("disposal_file")
+    private String disposalFile;
+
+    /**
+     * 操作单位seq
+     */
+	@TableField("operation_company_seq")
+    private String operationCompanySeq;
+
+    /**
+     * 操作单位name
+     */
+	@TableField("operation_company_name")
+    private String operationCompanyName;
+
+    /**
+     * 操作人userId
+     */
+	@TableField("operation_user_id")
+    private String operationUserId;
+
+    /**
+     * 操作人userName
+     */
+	@TableField("operation_user_name")
+    private String operationUserName;
+
+    /**
+     * 创建时间（根据此时间排序可获取一条风险的完整处置流程）
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人id 
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.tcm.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 风险报送表
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_risk_report")
+public class RiskReport extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报送编号
+     */
+	@TableField("report_no")
+    private String reportNo;
+
+    /**
+     * 风险类型
+     */
+	@TableField("risk_type")
+    private String riskType;
+
+    /**
+     * 报送单位seq
+     */
+	@TableField("report_company_seq")
+    private String reportCompanySeq;
+
+    /**
+     * 报送单位code
+     */
+	@TableField("report_company_code")
+    private String reportCompanyCode;
+
+    /**
+     * 报送单位name
+     */
+	@TableField("report_company_name")
+    private String reportCompanyName;
+
+    /**
+     * 风险企业seq
+     */
+	@TableField("risk_company_seq")
+    private String riskCompanySeq;
+
+    /**
+     * 风险企业code
+     */
+	@TableField("risk_company_code")
+    private String riskCompanyCode;
+
+    /**
+     * 风险企业name
+     */
+	@TableField("risk_company_name")
+    private String riskCompanyName;
+
+    /**
+     * 风险处置单位seq
+     */
+	@TableField("risk_disposal_unit_seq")
+    private String riskDisposalUnitSeq;
+
+    /**
+     * 风险处置单位code
+     */
+	@TableField("risk_disposal_unit_code")
+    private String riskDisposalUnitCode;
+
+    /**
+     * 风险处置单位name
+     */
+	@TableField("risk_disposal_unit_name")
+    private String riskDisposalUnitName;
+
+    /**
+     * 风险处置单位orgCode（考虑到转办，当前单位和此orgCode相同才有处置权限，转办会更新此三项）
+     */
+	@TableField("risk_disposal_unit_org_code")
+    private String riskDisposalUnitOrgCode;
+
+    /**
+     * 经手的风险处置单位orgCode（转办会增加此项内容）
+     */
+	@TableField("all_risk_disposal_unit_org_code")
+    private String allRiskDisposalUnitOrgCode;
+
+    /**
+     * 风险关联设备recod(目前没用到，冗余)
+     */
+	@TableField("risk_equip_record")
+    private String riskEquipRecord;
+
+    /**
+     * 操作人userId
+     */
+    @TableField("operation_user_id")
+    private String operationUserId;
+
+    /**
+     * 风险正文-标题
+     */
+	@TableField("risk_main_title")
+    private String riskMainTitle;
+
+    /**
+     * 风险正文-内容
+     */
+	@TableField("risk_main_content")
+    private String riskMainContent;
+
+    /**
+     * 风险正文-附件
+     */
+	@TableField("risk_main_file")
+    private String riskMainFile;
+
+    /**
+     * 报送员userId
+     */
+	@TableField("report_user_id")
+    private String reportUserId;
+
+    /**
+     * 报送员userName
+     */
+	@TableField("report_user_name")
+    private String reportUserName;
+
+    /**
+     * 报送员phone
+     */
+	@TableField("report_user_phone")
+    private String reportUserPhone;
+
+    /**
+     * 当前阶段（草稿/监管处置/企业整改）
+     */
+	@TableField("current_stage")
+    private String currentStage;
+
+    /**
+     * 当前状态（草稿/待处理/待整改/待确认/已办理）
+     */
+	@TableField("current_status")
+    private String currentStatus;
+
+    /**
+     * 处置结束时间
+     */
+	@TableField("end_date")
+    private Date endDate;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+}

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

@@ -12,6 +12,7 @@ public enum PersonManageRoleEnum {
     /**
      * 人员管理角色枚举
      */
+    // 业务办理人员 -> 6616
     code("人员管理角色字典code", 6616L),
 
     use("使用单位", 1735591519093547010L),
@@ -23,7 +24,13 @@ public enum PersonManageRoleEnum {
     // jyjc("检验检测机构", 1735590873120399362L);
 
     jyjg("检验机构", 1947231335688990722L),
-    jcjg("检测机构", 1947231362847109122L);
+    jcjg("检测机构", 1947231362847109122L),
+
+    /**
+     * 风险报送员
+     */
+    risk_code("风险报送员", 6766L),
+    fxbsy("风险报送员", 1953650773397106689L);
     String name;
     Long id;
 

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

+package com.yeejoin.amos.boot.module.tcm.api.mapper;
+
+import com.yeejoin.amos.boot.module.tcm.api.entity.RiskProcesses;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 风险报送 处置过程表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+public interface RiskProcessesMapper extends BaseMapper<RiskProcesses> {
+
+}

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

+package com.yeejoin.amos.boot.module.tcm.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tcm.api.entity.RiskReport;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 风险报送表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+public interface RiskReportMapper extends BaseMapper<RiskReport> {
+
+    Page<Map<String, String>> allAgencyWithPage(@Param("page") Page<Map<String, String>> page,
+                                                @Param("isAdmin") boolean isAdmin,
+                                                @Param("companyName") String companyName);
+}

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

+package com.yeejoin.amos.boot.module.tcm.api.service;
+
+/**
+ * 风险报送 处置过程表接口类
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+public interface IRiskProcessesService {}

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

+package com.yeejoin.amos.boot.module.tcm.api.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 风险报送表接口类
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+public interface IRiskReportService {
+
+    Page<Map<String, String>> allAgencyWithPage(int current, int size, boolean isAdmin, String companyName);
+
+    JSONObject superviseOrgForEnter(String enterSeq);
+
+    List<DictionarieValueModel> riskTypeByPermission();
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/RiskProcessesMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.RiskProcessesMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/RiskReportMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.RiskReportMapper">
+
+    <select id="allAgencyWithPage" resultType="java.util.Map">
+        SELECT
+        sequence_nbr AS "key",
+        CONCAT(sequence_nbr, '_', company_name) AS "value",
+        company_name AS "label"
+        FROM
+        privilege_company
+        <where>
+            <if test="companyName != null and companyName != ''">
+                AND company_name LIKE CONCAT('%', TRIM(#{companyName}), '%')
+            </if>
+            <if test="isAdmin != null and isAdmin != '' and isAdmin == true">
+                AND company_type = '监管机构'
+            </if>
+        </where>
+        ORDER BY
+        sequence_nbr
+    </select>
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/RiskProcessesController.java

+package com.yeejoin.amos.boot.module.tcm.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.tcm.api.entity.RiskProcesses;
+import com.yeejoin.amos.boot.module.tcm.biz.service.impl.RiskProcessesServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/risk-processes")
+public class RiskProcessesController extends BaseController {
+
+    @Autowired
+    RiskProcessesServiceImpl riskProcessesServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<RiskProcesses> save(@RequestBody RiskProcesses entity) {
+        entity = riskProcessesServiceImpl.createWithModel(entity);
+        return ResponseHelper.buildResponse(entity);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<RiskProcesses> updateBySequenceNbrRiskProcesses(@RequestBody RiskProcesses entity, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        entity.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(riskProcessesServiceImpl.updateWithModel(entity));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(riskProcessesServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<RiskProcesses> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(riskProcessesServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    public ResponseModel<Page<RiskProcesses>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<RiskProcesses> page = new Page<RiskProcesses>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(riskProcessesServiceImpl.queryForRiskProcessesPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<RiskProcesses>> selectForList() {
+        return ResponseHelper.buildResponse(riskProcessesServiceImpl.queryForRiskProcessesList());
+    }
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/RiskReportController.java

+package com.yeejoin.amos.boot.module.tcm.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.tcm.api.entity.RiskReport;
+import com.yeejoin.amos.boot.module.tcm.api.service.IRiskReportService;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@RestController
+@Api(tags = "Api")
+@RequiredArgsConstructor
+@RequestMapping(value = "/risk-report")
+public class RiskReportController extends BaseController {
+
+    private final IRiskReportService iRiskReportService;
+
+    /**
+     * 包含全部监管机构及企业的分页列表
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/allAgency/page")
+    @ApiOperation(httpMethod = "GET", value = "包含全部监管机构及企业的分页列表", notes = "包含全部监管机构及企业的分页列表")
+    public ResponseModel<Page<Map<String, String>>> allAgencyWithPage(@RequestParam(value = "current") int current,
+                                                                      @RequestParam(value = "size") int size,
+                                                                      @RequestParam(value = "isAdmin", required = false) String isAdmin,
+                                                                      @RequestParam(value = "companyName", required = false) String companyName) {
+        return ResponseHelper.buildResponse(iRiskReportService.allAgencyWithPage(current, size, Boolean.parseBoolean(isAdmin), companyName));
+    }
+
+    /**
+     * 查询企业的监管机构
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/superviseOrgForEnter")
+    @ApiOperation(httpMethod = "GET", value = "查询企业的监管机构", notes = "查询企业的监管机构")
+    public ResponseModel<JSONObject> superviseOrgForEnter(@RequestParam(value = "enterSeq") String enterSeq) {
+        return ResponseHelper.buildResponse(iRiskReportService.superviseOrgForEnter(enterSeq));
+    }
+
+
+    /**
+     * 根据是否有权限返回风险类型列表
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/riskTypeByPermission")
+    @ApiOperation(httpMethod = "GET", value = "根据是否有权限返回风险类型列表", notes = "根据是否有权限返回风险类型列表")
+    public ResponseModel<List<DictionarieValueModel>> riskTypeByPermission() {
+        return ResponseHelper.buildResponse(iRiskReportService.riskTypeByPermission());
+    }
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<RiskReport> save(@RequestBody RiskReport entity) {
+        // entity = riskReportServiceImpl.createWithModel(entity);
+        return ResponseHelper.buildResponse(entity);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<RiskReport> updateBySequenceNbrRiskReport(@RequestBody RiskReport entity, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        entity.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<RiskReport> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    public ResponseModel<Page<RiskReport>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<RiskReport> page = new Page<RiskReport>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<RiskReport>> selectForList() {
+        return ResponseHelper.buildResponse(null);
+    }
+}

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

+package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tcm.api.entity.RiskProcesses;
+import com.yeejoin.amos.boot.module.tcm.api.mapper.RiskProcessesMapper;
+import com.yeejoin.amos.boot.module.tcm.api.service.IRiskProcessesService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 风险报送 处置过程表服务实现类
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@Service
+public class RiskProcessesServiceImpl extends BaseService<RiskProcesses,RiskProcesses,RiskProcessesMapper> implements IRiskProcessesService {
+    /**
+     * 分页查询
+     */
+    public Page<RiskProcesses> queryForRiskProcessesPage(Page<RiskProcesses> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<RiskProcesses> queryForRiskProcessesList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/RiskReportServiceImpl.java

+package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.tcm.api.entity.RiskReport;
+import com.yeejoin.amos.boot.module.tcm.api.enums.PersonManageRoleEnum;
+import com.yeejoin.amos.boot.module.tcm.api.mapper.RiskReportMapper;
+import com.yeejoin.amos.boot.module.tcm.api.service.IRiskReportService;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * 风险报送表服务实现类
+ *
+ * @author system_generator
+ * @date 2025-08-08
+ */
+@Service
+@RequiredArgsConstructor
+public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, RiskReportMapper> implements IRiskReportService {
+
+    /**
+     * 风险类型
+     */
+    public static final String RISK_TYPE = "RISK_TYPE";
+
+    /**
+     * 分页查询
+     */
+    public Page<RiskReport> queryForRiskReportPage(Page<RiskReport> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<RiskReport> queryForRiskReportList() {
+        return this.queryForList("", false);
+    }
+
+    private final RedisUtils redisUtils;
+    private final RiskReportMapper riskReportMapper;
+
+    /**
+     * 包含全部监管机构及企业的分页列表
+     *
+     * @param current     当前页
+     * @param size        每页数量
+     * @param isAdmin     是否是监管机构
+     * @param companyName 公司名称
+     * @return 列表
+     */
+    @Override
+    public Page<Map<String, String>> allAgencyWithPage(int current, int size, boolean isAdmin, String companyName) {
+        Page<Map<String, String>> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return riskReportMapper.allAgencyWithPage(page, isAdmin, companyName);
+    }
+
+    /**
+     * 查询企业的监管机构
+     *
+     * @param enterSeq 企业seq
+     * @return result
+     */
+    @Override
+    public JSONObject superviseOrgForEnter(String enterSeq) {
+        CompanyModel enter = Privilege.companyClient.seleteOne(Long.valueOf(enterSeq)).getResult();
+        CompanyModel companyModel = Privilege.companyClient.seleteOne(enter.getParentId()).getResult();
+        return new JSONObject().fluentPut("key", companyModel.getSequenceNbr())
+                .fluentPut("value", companyModel.getSequenceNbr() + "_" + companyModel.getCompanyName())
+                .fluentPut("label", companyModel.getCompanyName());
+    }
+
+    /**
+     * 根据是否有权限返回风险类型列表
+     *
+     * @return response
+     */
+    @Override
+    public List<DictionarieValueModel> riskTypeByPermission() {
+        List<DictionarieValueModel> result = new ArrayList<>();
+        AtomicBoolean hasPermission = new AtomicBoolean(false);
+        AgencyUserModel currentUserInfo = Privilege.agencyUserClient.getme().getResult();
+        currentUserInfo.getOrgRoleSeqs().values().forEach(roleSeqs -> {
+            roleSeqs.forEach(roleSeq -> {
+                if (roleSeq.equals(PersonManageRoleEnum.fxbsy.getId())) {
+                    hasPermission.set(true);
+                }
+            });
+        });
+        // 有权限
+        if (hasPermission.get()) {
+            return Systemctl.dictionarieClient.dictValues(RISK_TYPE).getResult();
+        }
+        // 无报送权限
+        return Collections.emptyList();
+    }
+}
\ 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/TzsUserInfoServiceImpl.java

@@ -340,6 +340,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(Object[] ids1) {
+        // 删除校验
+        checkInternalStaff(Arrays.stream(ids1).map(obj -> Long.valueOf(obj.toString())).collect(Collectors.toList()));
+
         LambdaQueryWrapper<TzsUserInfo> lambda = new QueryWrapper<TzsUserInfo>().lambda();
         lambda.in(TzsUserInfo::getSequenceNbr, ids1);
         TzsUserInfo tzsUserInfo = new TzsUserInfo();
@@ -358,6 +361,37 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         publisher.publish(new DataRefreshEvent(this, ids, DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.DELETE));
     }
 
+    /**
+     * 检查是否为本单位下人员
+     *
+     * @param ids 人员ids
+     */
+    private void checkInternalStaff(List<Long> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return;
+        }
+
+        // 获取当前登录单位信息
+        ReginParams reginParams = JSON.parseObject(
+                redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+                ReginParams.class
+        );
+
+        if (ObjectUtils.isEmpty(reginParams) || ObjectUtils.isEmpty(reginParams.getCompany())) {
+            throw new BadRequest("未获取到单位信息");
+        }
+
+        String companyCode = reginParams.getCompany().getCompanyCode();
+
+        // 检查要删除的人员是否都属于当前单位
+        List<TzsUserInfo> userInfos = tzsUserInfoMapper.selectBatchIds(ids);
+        for (TzsUserInfo userInfo : userInfos) {
+            if (!companyCode.equals(userInfo.getUnitCode())) {
+                throw new BadRequest("不能删除非本单位人员: " + userInfo.getName());
+            }
+        }
+    }
+
 
     @Override
     public void deleteGroupAndPersonRelation(String postName, String amosUserId) {
@@ -496,10 +530,16 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
             // 添加人员管理角色
 
-            String post = tzsUserInfo.getPost();
-            if (post.contains(PersonManageRoleEnum.code.getId().toString())) {
-                String companyType = tzsUserInfoMapper.selectCompanyTypeById(companySeq);
-                setBizOperateUserRole(companyType, roleIds);
+            String newPostStr = tzsUserInfo.getNewPost();
+            if (newPostStr != null) {
+                JSONArray newPost = JSON.parseArray(newPostStr);
+                if (newPost.contains(PersonManageRoleEnum.code.getId().toString())) {
+                    String companyType = tzsUserInfoMapper.selectCompanyTypeById(companySeq);
+                    setBizOperateUserRole(companyType, roleIds);
+                }
+                if (newPost.contains(PersonManageRoleEnum.risk_code.getId().toString())) {
+                    setBizOperateUserRoleWithPost(newPost, roleIds);
+                }
             }
 
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
@@ -524,8 +564,8 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     Privilege.groupUserClient.create(Long.valueOf(roleGroup.getExtend()), userIds);
                 }
                 // 绑定两个规定用户组
-                post = post.replace("[", "").replace("]", "").replace("\"", "");
-                for (String code : post.split(",")) {
+                newPostStr = newPostStr.replace("[", "").replace("]", "").replace("\"", "");
+                for (String code : newPostStr.split(",")) {
                     bind2PermissionGroup(userIds, code);
                 }
                 tzsUserInfoMapper.updateById(tzsUserInfo);
@@ -2064,9 +2104,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             agencyUserModel.setMobile(tzsUserInfo.getPhone());
             agencyUserModel.setEmail(tzsUserInfo.getEmail());
             // 添加业务办理人员角色
-            String post = tzsUserInfo.getPost();
-            if (post.contains(PersonManageRoleEnum.code.getId().toString())) {
-                setBizOperateUserRole(companyType, roleIds);
+            String newPostStr = tzsUserInfo.getNewPost();
+            if (newPostStr != null) {
+                JSONArray newPost = JSON.parseArray(newPostStr);
+                if (newPost.contains(PersonManageRoleEnum.code.getId().toString())) {
+                    setBizOperateUserRole(companyType, roleIds);
+                }
+                if (newPost.contains(PersonManageRoleEnum.risk_code.getId().toString())) {
+                    setBizOperateUserRoleWithPost(newPost, roleIds);
+                }
             }
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
@@ -2421,12 +2467,18 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             }
         });
         // 添加人员管理角色
-        String post = tzsUserInfoDto.getPost();
-        if (post != null && post.contains(PersonManageRoleEnum.code.getId().toString())) {
-            CompanyModel companyModel = Optional.ofNullable(Privilege.companyClient.seleteOne(companySeq)).map(FeignClientResult::getResult).orElse(null);
-            if (!ValidationUtil.isEmpty(companyModel)) {
-                String companyType = companyModel.getCompanyType();
-                setBizOperateUserRole(companyType, roleIds);
+        String newPostStr = tzsUserInfoDto.getNewPost();
+        if (newPostStr != null) {
+            JSONArray newPost = JSON.parseArray(newPostStr);
+            if (newPost.contains(PersonManageRoleEnum.code.getId().toString())) {
+                CompanyModel companyModel = Optional.ofNullable(Privilege.companyClient.seleteOne(companySeq)).map(FeignClientResult::getResult).orElse(null);
+                if (!ValidationUtil.isEmpty(companyModel)) {
+                    String companyType = companyModel.getCompanyType();
+                    setBizOperateUserRole(companyType, roleIds);
+                }
+            }
+            if (newPost.contains(PersonManageRoleEnum.risk_code.getId().toString())) {
+                setBizOperateUserRoleWithPost(newPost, roleIds);
             }
         }
         Map<Long, List<Long>> roleSeqMap = new HashMap<>();
@@ -2448,10 +2500,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             if (!ObjectUtils.isEmpty(roleGroup) && roleGroup.getExtend() != null) {
                 Privilege.groupUserClient.create(Long.valueOf(roleGroup.getExtend()), userIds);
             }
-            if (post != null) {
+            if (newPostStr != null) {
                 // 绑定两个规定用户组
-                post = post.replace("[", "").replace("]", "").replace("\"", "");
-                for (String code : post.split(",")) {
+                newPostStr = newPostStr.replace("[", "").replace("]", "").replace("\"", "");
+                for (String code : newPostStr.split(",")) {
                     DataDictionary groupId = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, code).likeRight(DataDictionary::getType, QYRYGW));
                     if (!ObjectUtils.isEmpty(groupId) && groupId.getExtend() != null) {
                         Privilege.groupUserClient.deleteGroupUser(Long.valueOf(groupId.getExtend()), userResult.getResult().getUserId());
@@ -2462,6 +2514,12 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         }
     }
 
+    private void setBizOperateUserRoleWithPost(JSONArray newPost, List<Long> roleIds) {
+        if (newPost.contains(PersonManageRoleEnum.risk_code.getId().toString())) {
+            roleIds.add(PersonManageRoleEnum.fxbsy.getId());
+        }
+    }
+
     public void refreshAdminUserRole(List<TzsUserInfo> userInfos, List<String> userId) {
         List<String> adminUserIdList;
         if (ValidationUtil.isEmpty(userInfos)) {
@@ -2594,10 +2652,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
         // 监管查询自己单位下 + 管辖辖区下的数据
         if (companyType.equals(BaseController.COMPANY_TYPE_SUPERVISION)) {
+            // 和综合统计处查询逻辑保持一致
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            meBuilder.should(QueryBuilders.termQuery("unitCode", company.getCompanyCode()));
-            meBuilder.should(QueryBuilders.prefixQuery("superviseOrgCode", company.getOrgCode()));
-            meBuilder.minimumShouldMatch(1);
+            // meBuilder.should(QueryBuilders.termQuery("unitCode", company.getCompanyCode()));
+            meBuilder.must(QueryBuilders.prefixQuery("superviseOrgCode", company.getOrgCode()));
+            // meBuilder.minimumShouldMatch(1);
             boolMust.must(meBuilder);
         }