feat(tcm): 风险报送 接口联调

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

@@ -64,4 +64,7 @@ public class RiskProcessesDto  extends BaseDto {
     @ApiModelProperty(value = "风险处置单位/监管单位")
     private String riskDisposalUnit;
 
+    @ApiModelProperty("备注")
+    private String remark;
+
 }

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.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.RiskProcesses;
 import io.swagger.annotations.ApiModel;
@@ -79,7 +80,7 @@ public class RiskReportDto extends BaseDto {
     private String riskMainContent;
 
     @ApiModelProperty(value = "风险正文-附件")
-    private String riskMainFile;
+    private JSONArray riskMainFile;
 
     @ApiModelProperty(value = "报送员userId")
     private String reportUserId;

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

@@ -101,4 +101,10 @@ public class RiskProcesses extends BaseEntity {
 	@TableField("create_user_name")
     private String createUserName;
 
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
 }

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

@@ -6,7 +6,8 @@
         SELECT sequence_nbr AS "companySeq",
                company_code AS "companyCode",
                company_name AS "companyName",
-               org_code     AS "companyOrgCode"
+               org_code  AS "companyOrgCode",
+               parent_id AS "companyParentId"
         FROM privilege_company
         WHERE sequence_nbr = #{companySeq}
     </select>
@@ -93,7 +94,7 @@
         </if>
         ) AS temp
         <where>
-            temp."is_delete" = 'f'
+            temp."is_delete" = 0
             <if test="dto.riskTypeCode != null and dto.riskTypeCode != ''">
                 AND temp."risk_type_code" = #{dto.riskTypeCode}
             </if>
@@ -109,8 +110,8 @@
             <if test="dto.riskCompanyName != null and dto.riskCompanyName != ''">
                 AND temp."risk_company_name" LIKE CONCAT('%', #{dto.riskCompanyName}, '%')
             </if>
-            <if test="dto.riskDisposalUnitName != null and dto.riskDisposalUnitName != ''">
-                AND temp."risk_disposal_unit_name" LIKE CONCAT('%', #{dto.riskDisposalUnitName}, '%')
+            <if test="dto.riskDisposalUnit != null and dto.riskDisposalUnit != ''">
+                AND temp."risk_disposal_unit_name" LIKE CONCAT('%', #{dto.riskDisposalUnit}, '%')
             </if>
         </where>
         ) as t

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

@@ -48,9 +48,6 @@ import java.util.stream.Collectors;
 
 /**
  * 风险报送表服务实现类
- *
- * @author system_generator
- * @date 2025-08-08
  */
 @Slf4j
 @Service
@@ -74,6 +71,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
     private final RiskReportMapper riskReportMapper;
     private final RiskProcessesServiceImpl riskProcessesService;
     private final RedissonClient redissonClient;
+    private final TzsUserInfoServiceImpl userInfoService;
     private final RedisTemplate<String, String> redisTemplate;
 
 
@@ -109,8 +107,9 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
      */
     @Override
     public JSONObject superviseOrgForEnter(String enterSeq) {
-        CompanyModel enter = Privilege.companyClient.seleteOne(Long.valueOf(enterSeq)).getResult();
-        CompanyModel companyModel = Privilege.companyClient.seleteOne(enter.getParentId()).getResult();
+        log.info("查询企业的监管机构:{}", enterSeq);
+        Map<String, String> company = riskReportMapper.getCompanyBySeq(enterSeq);
+        CompanyModel companyModel = Privilege.companyClient.seleteOne(Long.parseLong(String.valueOf(company.get("companyParentId")))).getResult();
         return new JSONObject().fluentPut("key", companyModel.getSequenceNbr())
                 .fluentPut("value", companyModel.getSequenceNbr() + "_" + companyModel.getCompanyName())
                 .fluentPut("label", companyModel.getCompanyName());
@@ -123,16 +122,13 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
      */
     @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 -> {
+        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();
@@ -156,7 +152,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
         }
         reportDto.setReportCompanyCode(company.getCompanyCode());
         reportDto.setRiskCompanyCode(company.getCompanyCode());
-        reportDto.setRiskDisposalUnitOrgCode(company.getCompanyCode());
+        reportDto.setRiskDisposalUnitOrgCode(company.getOrgCode());
         reportDto.setCreateUserId(RequestContext.getExeUserId());
         return riskReportMapper.queryForRiskReportPage(page, reportDto);
     }
@@ -171,10 +167,14 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
         AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
         Date now = new Date();
         Boolean submitFlag = dto.getSubmitFlag();
-        String[] riskCompany = dto.getRiskCompany().split("_");
-        Map<String, String> riskCompanyMap = this.getCompanyBySeq(riskCompany[0]);
-        String[] riskDisposalUnit = dto.getRiskDisposalUnit().split("_");
-        Map<String, String> riskDisposalUnitMap = this.getCompanyBySeq(riskDisposalUnit[0]);
+        String[] riskCompany = ObjectUtils.isEmpty(dto.getRiskCompany()) ? new String[]{} : dto.getRiskCompany().split("_");
+        String[] riskDisposalUnit = ObjectUtils.isEmpty(dto.getRiskDisposalUnit()) ? new String[]{} : dto.getRiskDisposalUnit().split("_");
+        Map<String, String> riskCompanyMap = new HashMap<>();
+        Map<String, String> riskDisposalUnitMap = new HashMap<>();
+        if (riskCompany.length > 1 && riskDisposalUnit.length > 1) {
+            riskCompanyMap = this.getCompanyBySeq(riskCompany[0]);
+            riskDisposalUnitMap = this.getCompanyBySeq(riskDisposalUnit[0]);
+        }
         RiskReport riskReport = RiskReport.builder()
                 .reportNo(ObjectUtils.isEmpty(dto.getSequenceNbr()) ? generateReportNo() : null)
                 .riskTypeCode(dto.getRiskTypeCode())
@@ -182,10 +182,10 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
                 .reportCompanySeq(company.getSequenceNbr().toString())
                 .reportCompanyCode(company.getCompanyCode())
                 .reportCompanyName(company.getCompanyName())
-                .riskCompanySeq(String.valueOf(riskCompanyMap.get(COMPANY_SEQ)))
+                .riskCompanySeq(Objects.toString(riskCompanyMap.get(COMPANY_SEQ), null))
                 .riskCompanyCode(riskCompanyMap.get(COMPANY_CODE))
                 .riskCompanyName(riskCompanyMap.get(COMPANY_NAME))
-                .riskDisposalUnitSeq(String.valueOf(riskDisposalUnitMap.get(COMPANY_SEQ)))
+                .riskDisposalUnitSeq(Objects.toString(riskDisposalUnitMap.get(COMPANY_SEQ), null))
                 .riskDisposalUnitCode(riskDisposalUnitMap.get(COMPANY_CODE))
                 .riskDisposalUnitName(riskDisposalUnitMap.get(COMPANY_NAME))
                 .riskDisposalUnitOrgCode(riskDisposalUnitMap.get(COMPANY_ORG_CODE))
@@ -194,10 +194,10 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
                 .operationUserId(userModel.getUserId())
                 .riskMainTitle(dto.getRiskMainTitle())
                 .riskMainContent(dto.getRiskMainContent())
-                .riskMainFile(ObjectUtils.isEmpty(dto.getRiskMainFile()) ? null : JSONObject.toJSONString(JSONArray.parseObject(dto.getRiskMainFile())))
+                .riskMainFile(ObjectUtils.isEmpty(dto.getRiskMainFile()) ? null : JSONObject.toJSONString(dto.getRiskMainFile()))
                 .reportUserId(userModel.getUserId())
                 .reportUserName(userModel.getRealName())
-                .reportUserPhone(userModel.getLandlinePhone())
+                .reportUserPhone(userModel.getMobile())
                 .currentStage(submitFlag ? RiskReportStage.SUPERVISION.getName() : RiskReportStage.DRAFT.getName())
                 .currentStatus(submitFlag ? RiskReportProcessStatus.TO_HANDLE.getName() : RiskReportProcessStatus.DRAFT.getName())
                 .createDate(now)
@@ -213,11 +213,13 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
     private String buildAllRiskDisposalUnitOrgCode(String defaultOrgCode, Long sequenceNbr) {
         if (!ObjectUtils.isEmpty(sequenceNbr)) {
             String riskDisposalUnitOrgCode = riskReportMapper.getRiskDisposalUnitOrgCode(sequenceNbr);
+            if (!ObjectUtils.isEmpty(riskDisposalUnitOrgCode)) {
                 String collect = Arrays.stream(riskDisposalUnitOrgCode.split(","))
                         .filter(item -> !item.equals(defaultOrgCode))
                         .collect(Collectors.joining(","));
                 return defaultOrgCode + "," + collect;
             }
+        }
         return defaultOrgCode;
     }
 
@@ -300,7 +302,8 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
                         RiskReport::getEndDate,
                         RiskReport::getCreateDate,
                         RiskReport::getCreateUserId,
-                        RiskReport::getCreateUserName
+                        RiskReport::getCreateUserName,
+                        RiskReport::getReportUserPhone
                 )
                 .eq(RiskReport::getSequenceNbr, sequenceNbr));
         List<RiskProcesses> riskProcesses = riskProcessesService.getBaseMapper().selectList(new LambdaQueryWrapper<RiskProcesses>()
@@ -312,14 +315,20 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
         RiskReportDto riskReportDto = new RiskReportDto();
         BeanUtils.copyProperties(riskReport, riskReportDto);
         riskReportDto.setRiskProcesses(riskProcesses);
+        if (riskReport.getRiskCompanySeq() != null) {
             riskReportDto.setRiskCompany(riskReport.getRiskCompanySeq() + "_" + riskReport.getRiskCompanyName());
+        }
+        if (riskReport.getRiskDisposalUnitSeq() != null) {
             riskReportDto.setRiskDisposalUnit(riskReport.getRiskDisposalUnitSeq() + "_" + riskReport.getRiskDisposalUnitName());
+        }
+        riskReportDto.setRiskMainFile(JSONArray.parseArray(riskReport.getRiskMainFile()));
         return riskReportDto;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean forWardeBySeq(Long riskReportSeq, RiskProcessesDto riskProcessesDto) {
+        RiskReport riskReport = this.getById(riskReportSeq);
         ReginParams selectedOrgInfo = getSelectedOrgInfo();
         AgencyUserModel userModel = selectedOrgInfo.getUserModel();
         CompanyBo company = getSelectedOrgInfo().getCompany();
@@ -348,6 +357,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
                 .createDate(new Date())
                 .createUserId(userModel.getUserId())
                 .createUserName(userModel.getRealName())
+                .remark(riskReport.getRiskDisposalUnitName() + "已转办至:" + riskDisposalUnitName)
                 .build();
 
         return riskProcessesService.save(processes);

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

@@ -486,6 +486,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean BindAccount(Map<String, Object> map) {
         String loginName = map.get("userName").toString();
         String pwd = map.get("password").toString();
@@ -569,6 +570,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     bind2PermissionGroup(userIds, code);
                 }
                 tzsUserInfoMapper.updateById(tzsUserInfo);
+                publisher.publish(new DataRefreshEvent(this, Collections.singletonList(sequenceNbr), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.UPDATE));
             }
             return true;
         } catch (Exception e) {