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/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) {