楚江erp：客户资信工商、股东信息支持批量上传

+package com.lframework.xingyun.sc.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FileInfo {
+
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty("文件ID")
+    private String fileId;
+
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty("文件名称")
+    private String fileName;
+}

 package com.lframework.xingyun.sc.bo.customer.credit;
 package com.lframework.xingyun.sc.bo.customer.credit;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.xingyun.sc.bo.FileInfo;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
-import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
 
 
@@ -14,7 +13,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 
 import lombok.Data;
 import lombok.Data;
@@ -409,6 +407,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     private String businessFileId;
     private String businessFileId;
 
 
     /**
     /**
+     * 工商信息文件列表（JSON数组）
+     */
+    @ApiModelProperty(value = "工商信息文件列表（JSON数组）")
+    private List<FileInfo> businessFileInfoList;
+
+    /**
      * 股东信息文件名
      * 股东信息文件名
      */
      */
     @ApiModelProperty(value = "股东信息文件名")
     @ApiModelProperty(value = "股东信息文件名")
@@ -421,6 +425,12 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     private String shareholderFileId;
     private String shareholderFileId;
 
 
     /**
     /**
+     * 股东信息文件列表（JSON数组）
+     */
+    @ApiModelProperty(value = "股东信息文件列表（JSON数组）")
+    private List<FileInfo> shareholderFileInfoList;
+
+    /**
      * 所属营销部分管
      * 所属营销部分管
      */
      */
     @ApiModelProperty(value = "所属营销部分管")
     @ApiModelProperty(value = "所属营销部分管")

@@ -20,6 +20,7 @@ import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.sc.bo.FileInfo;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
@@ -485,6 +486,12 @@ public class CustomerCreditController extends DefaultBaseController {
     private GetCustomerCreditBo packCustomerCreditData(CustomerCredit credit) {
     private GetCustomerCreditBo packCustomerCreditData(CustomerCredit credit) {
         // 处理关联数据
         // 处理关联数据
         GetCustomerCreditBo data = new GetCustomerCreditBo(credit);
         GetCustomerCreditBo data = new GetCustomerCreditBo(credit);
+        if (StringUtil.isNotEmpty(credit.getBusinessFileList())) {
+            data.setBusinessFileInfoList(JsonUtil.parseList(credit.getBusinessFileList(), FileInfo.class));
+        }
+        if (StringUtil.isNotEmpty(credit.getShareholderFileList())) {
+            data.setShareholderFileInfoList(JsonUtil.parseList(credit.getShareholderFileList(), FileInfo.class));
+        }
         //获取核心人员信息
         //获取核心人员信息
         QueryCorePersonnelVo vo = new QueryCorePersonnelVo();
         QueryCorePersonnelVo vo = new QueryCorePersonnelVo();
         vo.setCreditId(credit.getId());
         vo.setCreditId(credit.getId());

@@ -323,6 +323,11 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private String businessFileId;
     private String businessFileId;
 
 
     /**
     /**
+     * 工商信息文件列表(JSON文本)
+     */
+    private String businessFileList;
+
+    /**
      * 股东信息文件名
      * 股东信息文件名
      */
      */
     private String shareholderFileName;
     private String shareholderFileName;
@@ -333,6 +338,11 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     private String shareholderFileId;
     private String shareholderFileId;
 
 
     /**
     /**
+     * 股东信息文件列表(JSON文本)
+     */
+    private String shareholderFileList;
+
+    /**
      * 所属营销部分管
      * 所属营销部分管
      */
      */
     private String marketingDepartmentManagement;
     private String marketingDepartmentManagement;

@@ -1134,10 +1134,8 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .set(CustomerCredit::getCompanyCreditLimit, StringUtil.isBlank(vo.getCompanyCreditLimit()) ? null : vo.getCompanyCreditLimit())
                 .set(CustomerCredit::getCompanyCreditLimit, StringUtil.isBlank(vo.getCompanyCreditLimit()) ? null : vo.getCompanyCreditLimit())
                 .set(CustomerCredit::getCompanyMaterialSupplyPlan, StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan()) ? null : vo.getCompanyMaterialSupplyPlan())
                 .set(CustomerCredit::getCompanyMaterialSupplyPlan, StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan()) ? null : vo.getCompanyMaterialSupplyPlan())
                 .set(CustomerCredit::getCompanySuggestedCategory, vo.getCompanySuggestedCategory())
                 .set(CustomerCredit::getCompanySuggestedCategory, vo.getCompanySuggestedCategory())
-                .set(CustomerCredit::getBusinessFileName, StringUtil.isBlank(vo.getBusinessFileName()) ? null : vo.getBusinessFileName())
-                .set(CustomerCredit::getBusinessFileId, StringUtil.isBlank(vo.getBusinessFileId()) ? null : vo.getBusinessFileId())
-                .set(CustomerCredit::getShareholderFileName, StringUtil.isBlank(vo.getShareholderFileName()) ? null : vo.getShareholderFileName())
-                .set(CustomerCredit::getShareholderFileId, StringUtil.isBlank(vo.getShareholderFileId()) ? null : vo.getShareholderFileId())
+                .set(CustomerCredit::getBusinessFileList, CollectionUtils.isEmpty(vo.getBusinessFileList()) ? null : JsonUtil.toJsonString(vo.getBusinessFileList()))
+                .set(CustomerCredit::getShareholderFileList, CollectionUtils.isEmpty(vo.getShareholderFileList()) ? null : JsonUtil.toJsonString(vo.getShareholderFileList()))
                 .eq(CustomerCredit::getId, vo.getId());
                 .eq(CustomerCredit::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

 package com.lframework.xingyun.sc.vo.customer.credit;
 package com.lframework.xingyun.sc.vo.customer.credit;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.lframework.xingyun.sc.bo.FileInfo;
 import lombok.Data;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
@@ -426,6 +427,12 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
     private String businessFileId;
     private String businessFileId;
 
 
     /**
     /**
+     * 工商信息文件列表（JSON数组）
+     */
+    @ApiModelProperty(value = "工商信息文件列表（JSON数组）")
+    private List<FileInfo> businessFileList;
+
+    /**
      * 股东信息文件名
      * 股东信息文件名
      */
      */
     @ApiModelProperty(value = "股东信息文件名")
     @ApiModelProperty(value = "股东信息文件名")
@@ -438,6 +445,12 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
     private String shareholderFileId;
     private String shareholderFileId;
 
 
     /**
     /**
+     * 股东信息文件列表（JSON数组）
+     */
+    @ApiModelProperty(value = "股东信息文件列表（JSON数组）")
+    private List<FileInfo> shareholderFileList;
+
+    /**
      * 客户资信历史记录id
      * 客户资信历史记录id
      */
      */
     @ApiModelProperty(value = "客户资信历史记录id")
     @ApiModelProperty(value = "客户资信历史记录id")

@@ -61,8 +61,10 @@
         <result column="company_suggested_category" property="companySuggestedCategory"/>
         <result column="company_suggested_category" property="companySuggestedCategory"/>
         <result column="business_file_name" property="businessFileName"/>
         <result column="business_file_name" property="businessFileName"/>
         <result column="business_file_id" property="businessFileId"/>
         <result column="business_file_id" property="businessFileId"/>
+        <result column="business_file_list" property="businessFileList"/>
         <result column="shareholder_file_name" property="shareholderFileName"/>
         <result column="shareholder_file_name" property="shareholderFileName"/>
         <result column="shareholder_file_id" property="shareholderFileId"/>
         <result column="shareholder_file_id" property="shareholderFileId"/>
+        <result column="shareholder_file_list" property="shareholderFileList"/>
         <result column="marketing_department_management" property="marketingDepartmentManagement"/>
         <result column="marketing_department_management" property="marketingDepartmentManagement"/>
         <result column="marketing_department_supervisor" property="marketingDepartmentSupervisor"/>
         <result column="marketing_department_supervisor" property="marketingDepartmentSupervisor"/>
         <result column="marketing_center_supervisor" property="marketingCenterSupervisor"/>
         <result column="marketing_center_supervisor" property="marketingCenterSupervisor"/>
@@ -139,11 +141,13 @@
             tb.status,
             tb.status,
             tb.business_file_name,
             tb.business_file_name,
             tb.business_file_id,
             tb.business_file_id,
+            tb.business_file_list,
             tb.shareholder_file_name,
             tb.shareholder_file_name,
             tb.marketing_department_management,
             tb.marketing_department_management,
             tb.marketing_department_supervisor,
             tb.marketing_department_supervisor,
             tb.marketing_center_supervisor,
             tb.marketing_center_supervisor,
             tb.shareholder_file_id,
             tb.shareholder_file_id,
+            tb.shareholder_file_list,
             tb.enterprise_operation_type,
             tb.enterprise_operation_type,
             tb.frozen_status,
             tb.frozen_status,
             tb.is_change,
             tb.is_change,