楚江ERP:客户资信取消、导入、审核结束监听

@@ -232,6 +232,12 @@ public class CustomerServiceImpl extends BaseMpServiceImpl<CustomerMapper, Custo
     OpLogUtil.setExtra(vo);
   }
 
+  @Override
+  public Customer getByName(String name) {
+
+    return getBaseMapper().getByName(name);
+  }
+
   @CacheEvict(value = Customer.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
   @Override
   public void cleanCacheByKey(Serializable key) {

@@ -40,4 +40,12 @@ public interface CustomerMapper extends BaseMapper<Customer> {
    * @return
    */
   List<Customer> selector(@Param("vo") QueryCustomerSelectorVo vo);
+
+  /**
+   * 根据名称查询
+   *
+   * @param name
+   * @return Customer
+   */
+  Customer getByName(@Param("name") String name);
 }

@@ -69,4 +69,11 @@ public interface CustomerService extends BaseMpService<Customer> {
    * @param vo
    */
   void update(UpdateCustomerVo vo);
+
+  /**
+   * 根据名称查询
+   *
+   * @param name
+   */
+  Customer getByName(String name);
 }

@@ -74,6 +74,18 @@
         ORDER BY code
     </select>
 
+    <select id="getByName" resultMap="CustomerDto">
+        SELECT DISTINCT
+        c.id,
+        c.name
+        FROM base_data_customer AS c
+        <where>
+            <if test="name != null and name != ''">
+                AND name = #{name}
+            </if>
+        </where>
+    </select>
+
     <select id="selector" resultMap="CustomerDto">
         <include refid="CustomerDto_sql"/>
         <where>

 package com.lframework.xingyun.sc.bo.customer.credit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import java.math.BigDecimal;
@@ -24,7 +24,7 @@ import lombok.Data;
  *
  */
 @Data
-public class GetCustomerCreditBo extends BaseBo<CustomerCredit> {
+public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseDto {
 
     /**
      * ID

 package com.lframework.xingyun.sc.controller.customer;
 
 import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.ExcelUtil;
@@ -16,6 +17,8 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.enums.ExportType;
+import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditExportTaskWorker;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportListener;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportModel;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
@@ -132,6 +135,21 @@ public class CustomerCreditController extends DefaultBaseController {
     }
 
     /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"customer-credit-manage:customer-credit-plan:modify"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        customerCreditService.cancel(id);
+
+        customerCreditService.cleanCacheByKey(id);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID删除
      */
     @ApiOperation("根据ID删除")
@@ -208,6 +226,19 @@ public class CustomerCreditController extends DefaultBaseController {
         return InvokeResultBuilder.success();
     }
 
+    /**
+     * 导出
+     */
+    @ApiOperation("导出")
+    @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
+    @PostMapping("/export")
+    public InvokeResult<Void> export(@Valid QueryCustomerCreditVo vo) {
+        vo.setExportType(ExportType.CUSTOMER_CREDIT.getCode());
+        ExportTaskUtil.exportTask("客户资信信息", CustomerCreditExportTaskWorker.class, vo);
+        return InvokeResultBuilder.success();
+    }
+
+
 
     /**
      * 封装客户资信数据

+package com.lframework.xingyun.sc.excel.customerCredit;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
+import com.lframework.xingyun.sc.entity.CorePersonnel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Data
+public class CustomerCreditExportModel extends BaseBo<GetCustomerCreditBo> implements ExcelModel {
+
+    /**
+     * 编号
+     */
+    @ExcelProperty("编号")
+    private String serialNumber;
+
+    /**
+     * 区域
+     */
+    @ExcelProperty("区域")
+    private String region;
+
+    /**
+     * 登记日期
+     */
+    @ExcelProperty("登记日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate registerDate;
+
+    /**
+     * 客户简称
+     */
+    @ExcelProperty("客户简称")
+    private String customerShortName;
+
+    /**
+     * 企业类型：经销商（distributor）、终端（terminal）
+     */
+    @ExcelProperty("企业类型")
+    private String enterpriseType;
+
+    /**
+     * 单位名称(非持久化字段)
+     */
+    @ExcelProperty("单位名称")
+    private String companyName;
+
+    /**
+     * 企业性质
+     */
+    @ExcelProperty("企业性质")
+    private String companyNature;
+
+    /**
+     * 单位地址
+     */
+    @ExcelProperty("单位地址")
+    private String companyAddress;
+
+    /**
+     * 注册资本（单位：万元）
+     */
+    @ExcelProperty("注册资本")
+    private BigDecimal registeredCapital;
+
+    /**
+     * 账号
+     */
+    @ExcelProperty("账号")
+    private String bankAccount;
+
+    /**
+     * 开户行
+     */
+    @ExcelProperty("开户行")
+    private String bankName;
+
+    /**
+     * 税号
+     */
+    @ExcelProperty("税号")
+    private String taxNumber;
+
+    /**
+     * 注册时间
+     */
+    @ExcelProperty("注册时间")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate registrationTime;
+
+    /**
+     * 经营年限（年）
+     */
+    @ExcelProperty("经营年限")
+    private String businessYears;
+
+    /**
+     * 经营范围
+     */
+    @ExcelProperty("经营范围")
+    private String businessScope;
+
+    /**
+     * 经营场地属性
+     */
+    @ExcelProperty("经营场地属性")
+    private String businessProperty;
+
+    /**
+     * 占地面积（平方米）
+     */
+    @ExcelProperty("占地面积")
+    private String landArea;
+
+    /**
+     * 仓储条件
+     */
+    @ExcelProperty("仓储条件")
+    private String storageConditions;
+
+    /**
+     * 员工人数
+     */
+    @ExcelProperty("员工人数")
+    private Integer employeeCount;
+
+    /**
+     * 设备属性
+     */
+    @ExcelProperty("设备属性")
+    private String equipmentAttributes;
+
+    /**
+     * 资产评估
+     */
+    @ExcelProperty("资产评估")
+    private String assetEvaluation;
+
+    /**
+     * 上年度销售额（万元）
+     */
+    @ExcelProperty("上年度销售额")
+    private String lastYearSales;
+
+    /**
+     * 月均销量（万元）
+     */
+    @ExcelProperty("月均销量")
+    private String monthlyAvgSales;
+
+    /**
+     * 销项发票所开品名与计量单位
+     */
+    @ExcelProperty("销项发票所开品名与计量单位")
+    private String invoiceItemUnit;
+
+    /**
+     * 认证证书
+     */
+    @ExcelProperty("认证证书")
+    private String certificationCertificate;
+
+    /**
+     * 我司售于产品与经营范围是否匹配
+     */
+    @ExcelProperty("我司售于产品与经营范围是否匹配")
+    private String productMatch;
+
+    /**
+     * 主要客户
+     */
+    @ExcelProperty("主要客户")
+    private String majorCustomers;
+
+    /**
+     * 主营项目
+     */
+    @ExcelProperty("主营项目")
+    private String mainProjects;
+
+    /**
+     * 从事行业
+     */
+    @ExcelProperty("从事行业")
+    private String industryInvolved;
+
+    /**
+     * 在该行业中的经验
+     */
+    @ExcelProperty("在该行业中的经验")
+    private String industryExperience;
+
+    /**
+     * 是否与其他企业有经济纠纷 违规信息 拖欠员工薪资等
+     */
+    @ExcelProperty("是否与其他企业有经济纠纷 违规信息 拖欠员工薪资等")
+    private String hasDispute;
+
+    /**
+     * 与我司合作时间
+     */
+    @ExcelProperty("与我司合作时间")
+    private String cooperationStartDate;
+
+    /**
+     * 月均操作量
+     */
+    @ExcelProperty("月均操作量")
+    private String monthlyAvgVolume;
+
+    /**
+     * 是否口头协议操作
+     */
+    @ExcelProperty("是否口头协议操作")
+    private String isVerbalAgreement;
+
+    /**
+     * 是否签订其他协议（列举）
+     */
+    @ExcelProperty("是否签订其他协议（列举）")
+    private String otherAgreements;
+
+    /**
+     * 与我司操作是否签订长年合同
+     */
+    @ExcelProperty("与我司操作是否签订长年合同")
+    private String hasLongTermContract;
+
+    /**
+     * 合同类型
+     */
+    @ExcelProperty("合同类型")
+    private String contractType;
+
+    /**
+     * 是否有过中断及中断原因
+     */
+    @ExcelProperty("是否有过中断及中断原因")
+    private String hasInterruption;
+
+    /**
+     * 结算期限
+     */
+    @ExcelProperty("结算期限")
+    private String settlementPeriod;
+
+    /**
+     * 加工操作方案
+     */
+    @ExcelProperty("加工操作方案")
+    private String materialSupplyPlan;
+
+    /**
+     * 建议客户分类：AAA、AA、A、BBB、BB、B、C、D
+     */
+    @ExcelProperty("建议客户分类")
+    private String suggestedCategory;
+
+    /**
+     * 授信额度（万元）
+     */
+    @ExcelProperty("授信额度")
+    private String creditLimit;
+
+    /**
+     * 调查人名称(非持久化字段)
+     */
+    @ExcelProperty("调查人")
+    private String investigatorName;
+
+    /**
+     * 主管审核名称(非持久化字段)
+     */
+    @ExcelProperty("主管审核")
+    private String supervisorReviewName;
+
+    /**
+     * 年度总销量（万元）
+     */
+    @ExcelProperty("年度总销量")
+    private String annualTotalSales;
+
+    /**
+     * 主要行业
+     */
+    @ExcelProperty("主要行业")
+    private String mainIndustry;
+
+    /**
+     * 年度款料概况
+     */
+    @ExcelProperty("年度款料概况")
+    private String annualMaterialOverview;
+
+    /**
+     * 结算期限
+     */
+    @ExcelProperty("结算期限")
+    private String companySettlementPeriod;
+
+    /**
+     * 授信额度（万元）
+     */
+    @ExcelProperty("授信额度")
+    private String companyCreditLimit;
+
+    /**
+     * 加工操作方案
+     */
+    @ExcelProperty("加工操作方案")
+    private String companyMaterialSupplyPlan;
+
+    /**
+     * 客户分类：AAA、AA、A、BBB、BB、B、C、D
+     */
+    @ExcelProperty("客户分类")
+    private String companySuggestedCategory;
+
+    /**
+     * 审核状态
+     */
+    @ExcelProperty("审核状态")
+    private String status;
+
+    /**
+     * 工商信息文件名
+     */
+    @ExcelProperty(value = "工商信息文件名")
+    private String businessFileName;
+
+    /**
+     * 股东信息文件名
+     */
+    @ExcelProperty(value = "股东信息文件名")
+    private String shareholderFileName;
+
+    /**
+     * 核心人员
+     */
+    @ExcelProperty("核心人员")
+    private List<CorePersonnel> corePersonnelList;
+
+
+    public CustomerCreditExportModel() {
+
+    }
+
+    public CustomerCreditExportModel(GetCustomerCreditBo dto) {
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<GetCustomerCreditBo> convert(GetCustomerCreditBo dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(GetCustomerCreditBo dto) {
+        if (dto.getEnterpriseType() != null) {
+            switch (dto.getEnterpriseType()) {
+                case "DEALER":
+                    this.enterpriseType = "经销商";
+                    break;
+                case "TERMINAL":
+                    this.enterpriseType = "终端";
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+}

+package com.lframework.xingyun.sc.excel.customerCredit;
+
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.mq.core.components.export.ExportTaskWorker;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
+import com.lframework.xingyun.sc.entity.CustomerCredit;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
+import java.util.List;
+
+public class CustomerCreditExportTaskWorker implements
+        ExportTaskWorker<QueryCustomerCreditVo, GetCustomerCreditBo, CustomerCreditExportModel> {
+
+
+    @Override
+    public QueryCustomerCreditVo parseParams(String json) {
+        return JsonUtil.parseObject(json, QueryCustomerCreditVo.class);
+    }
+
+    @Override
+    public PageResult<GetCustomerCreditBo> getDataList(int pageIndex, int pageSize, QueryCustomerCreditVo params) {
+        CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class);
+        PageResult<CustomerCredit> pageResult = customerCreditService.query(pageIndex, pageSize, params);
+        List<CustomerCredit> dataList = pageResult.getDatas();
+        List<GetCustomerCreditBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = this.packCustomerCreditData(dataList);
+        }
+        return PageResultUtil.rebuild(pageResult, results);
+    }
+
+    @Override
+    public CustomerCreditExportModel exportData(GetCustomerCreditBo data) {
+        return new CustomerCreditExportModel(data);
+    }
+
+    @Override
+    public Class<CustomerCreditExportModel> getModelClass() {
+        return CustomerCreditExportModel.class;
+    }
+
+
+    /**
+     * 封装客户开发数据
+     *
+     * @param dataList 数据集
+     * @return List<GetCustomerCreditBo>
+     */
+    private List<GetCustomerCreditBo> packCustomerCreditData(List<CustomerCredit> dataList) {
+        // todo fys 处理关联数据
+        return null;
+    }
+}

@@ -5,16 +5,12 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.components.excel.ExcelImportListener;
 import com.lframework.starter.web.core.utils.ApplicationUtil;
-import com.lframework.xingyun.sc.entity.CorePersonnel;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
-import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
-import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelVo;
-import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
-import com.lframework.xingyun.sc.vo.customer.credit.UpdateCorePersonnelVo;
-import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
+import com.lframework.xingyun.sc.vo.customer.credit.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.util.ArrayList;
@@ -29,6 +25,7 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
 
   @Override
   protected void doInvoke(CustomerCreditImportModel data, AnalysisContext context) {
+    CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
     List<String> validValues = Arrays.asList("AAA", "AA", "A", "BBB", "BB", "B", "C", "D");
     if (StringUtil.isBlank(data.getCode())) {
       throw new DefaultClientException(
@@ -39,103 +36,77 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
           "第" + context.readRowHolder().getRowIndex() + "行“编号”与第" + (checkList.indexOf(data.getCode()) + 1) + "行重复");
     }
     checkList.add(data.getCode());
+    if (StringUtil.isBlank(data.getName())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“客户名称”不能为空");
+    } else {
+      Customer customer = customerService.getByName(data.getName());
+      if (customer == null) {
+        throw new DefaultClientException(
+                "第" + context.readRowHolder().getRowIndex() + "行“客户不存在”不能为空");
+      } else {
+        data.setCompanyId(customer.getId());
+      }
+    }
+    if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“客户分类”不能为空");
+    }
+    if (StringUtil.isNotEmpty(data.getCompanySuggestedCategory()) && !validValues.contains(data.getCompanySuggestedCategory())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“客户分类”只能为：AAA、AA、A、BBB、BB、B、C、D");
+    }
+    if (StringUtil.isBlank(data.getCompanyCreditLimit())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“授信额度”不能为空");
+    }
+    if (StringUtil.isBlank(data.getCompanyMaterialSupplyPlan())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“加工操作方案”不能为空");
+    }
+    if (StringUtil.isBlank(data.getCompanySettlementPeriod())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“结算期限”不能为空");
+    }
     QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
     vo.setSerialNumber(data.getCode());
     CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class);
     List<CustomerCredit> query = customerCreditService.query(vo);
-    if (CollectionUtils.isEmpty(query)) {
+    if (CollectionUtils.isNotEmpty(query)) {
       throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“编号”不存在");
+              "第" + context.readRowHolder().getRowIndex() + "行“编号”系统中已存在");
     }
 
-    if (StringUtil.isNotEmpty(data.getCompanySuggestedCategory()) && !validValues.contains(data.getCompanySuggestedCategory())) {
-      throw new DefaultClientException(
-              "第" + context.readRowHolder().getRowIndex() + "行“客户分类”只能为：AAA、AA、A、BBB、BB、B、C、D");
-    }
   }
 
   @Override
   protected void afterAllAnalysed(AnalysisContext context) {
-    CorePersonnelService corePersonnelService = ApplicationUtil.getBean(CorePersonnelService.class);
     CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class);
     List<CustomerCreditImportModel> datas = this.getDatas();
     for (int i = 0; i < datas.size(); i++) {
       CustomerCreditImportModel data = datas.get(i);
-      QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
-      vo.setSerialNumber(data.getCode());
-      List<CustomerCredit> query = customerCreditService.query(vo);
-      if (CollectionUtils.isNotEmpty(query)) {
-        CustomerCredit customerCredit = query.get(0);
 
-        UpdateCustomerCreditVo updateCustomerCreditVo = new UpdateCustomerCreditVo();
-//        updateCustomerCreditVo.setId(customerCredit.getId());
+      CreateCustomerCreditVo createCustomerCreditVo = new CreateCustomerCreditVo();
+      //审核状态
+      createCustomerCreditVo.setStatus("PASS");
+      //编号
+      createCustomerCreditVo.setSerialNumber(data.getCode());
+      //客户id
+      createCustomerCreditVo.setCompanyId(data.getCompanyId());
+      //客户分类
+      createCustomerCreditVo.setCompanySuggestedCategory(data.getCompanySuggestedCategory());
+      //授信额度
+      createCustomerCreditVo.setCompanyCreditLimit(data.getCompanyCreditLimit());
+      //加工操作方案
+      createCustomerCreditVo.setCompanyMaterialSupplyPlan(data.getCompanyMaterialSupplyPlan());
+      //结算期限
+      createCustomerCreditVo.setCompanySettlementPeriod(data.getCompanySettlementPeriod());
+      //导入标识
+      createCustomerCreditVo.setImportType("IMPORT");
 
-        BeanUtils.copyProperties(customerCredit, updateCustomerCreditVo);
-        //客户分类
-        if (StringUtil.isNotEmpty(data.getCompanySuggestedCategory())) {
-          updateCustomerCreditVo.setCompanySuggestedCategory(data.getCompanySuggestedCategory());
-        }
-        //授信额度
-        if (StringUtil.isNotEmpty(data.getCompanyCreditLimit())) {
-          updateCustomerCreditVo.setCompanyCreditLimit(data.getCompanyCreditLimit());
-        }
-        //加工操作方案
-        if (StringUtil.isNotEmpty(data.getCompanyMaterialSupplyPlan())) {
-          updateCustomerCreditVo.setCompanyMaterialSupplyPlan(data.getCompanyMaterialSupplyPlan());
-        }
-        //结算期限
-        if (StringUtil.isNotEmpty(data.getCompanySettlementPeriod())) {
-          updateCustomerCreditVo.setCompanySettlementPeriod(data.getCompanySettlementPeriod());
-        }
-        //核心人员(不填更新的时候会被删除)
-        QueryCorePersonnelVo queryCorePersonnelVo = new QueryCorePersonnelVo();
-        queryCorePersonnelVo.setCreditId(customerCredit.getId());
-        List<CorePersonnel> corePersonnelList = corePersonnelService.query(queryCorePersonnelVo);
-        if (CollectionUtils.isNotEmpty(corePersonnelList)) {
-          List<UpdateCorePersonnelVo> results = new ArrayList<>();
-          for (CorePersonnel corePersonnel : corePersonnelList) {
-            UpdateCorePersonnelVo personnelVo = new UpdateCorePersonnelVo();
-            personnelVo.setId(corePersonnel.getId());
-            personnelVo.setCreditId(corePersonnel.getCreditId());
-            if (!StringUtil.isBlank(corePersonnel.getPersonId())) {
-              personnelVo.setPersonId(corePersonnel.getPersonId());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getName())) {
-              personnelVo.setName(corePersonnel.getName());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getSex())) {
-              personnelVo.setSex(corePersonnel.getSex());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getNativePlace())) {
-              personnelVo.setNativePlace(corePersonnel.getNativePlace());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getAge())) {
-              personnelVo.setAge(corePersonnel.getAge());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getPosition())) {
-              personnelVo.setPosition(corePersonnel.getPosition());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getMobile())) {
-              personnelVo.setMobile(corePersonnel.getMobile());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getPhone())) {
-              personnelVo.setPhone(corePersonnel.getPhone());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getEmail())) {
-              personnelVo.setEmail(corePersonnel.getEmail());
-            }
-            if (!StringUtil.isBlank(corePersonnel.getAddress())) {
-              personnelVo.setAddress(corePersonnel.getAddress());
-            }
-            results.add(personnelVo);
-          }
-          updateCustomerCreditVo.setCorePersonnelList(results);
-        }
-        customerCreditService.update(updateCustomerCreditVo);
-        customerCreditService.cleanCacheByKey(customerCredit.getId());
+      customerCreditService.create(createCustomerCreditVo);
 
-        this.setSuccessProcess(i);
-      }
+      this.setSuccessProcess(i);
     }
   }
 

@@ -16,6 +16,12 @@ public class CustomerCreditImportModel implements ExcelModel {
   private String id;
 
   /**
+   * companyId
+   */
+  @ExcelIgnore
+  private String companyId;
+
+  /**
    * 编号
    */
   @ExcelRequired
@@ -23,26 +29,37 @@ public class CustomerCreditImportModel implements ExcelModel {
   private String code;
 
   /**
+   * 客户名称
+   */
+  @ExcelRequired
+  @ExcelProperty("客户名称")
+  private String name;
+
+  /**
    * 客户分类
    */
+  @ExcelRequired
   @ExcelProperty("客户分类")
   private String companySuggestedCategory;
 
   /**
    * 授信额度
    */
+  @ExcelRequired
   @ExcelProperty("授信额度")
   private String companyCreditLimit;
 
   /**
    * 加工操作方案
    */
+  @ExcelRequired
   @ExcelProperty("加工操作方案")
   private String companyMaterialSupplyPlan;
 
   /**
    * 结算期限
    */
+  @ExcelRequired
   @ExcelProperty("结算期限")
   private String companySettlementPeriod;
 

@@ -32,6 +32,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -111,8 +112,12 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         if (!StringUtil.isBlank(vo.getCustomerShortName())) {
             data.setCustomerShortName(vo.getCustomerShortName());
         }
-        data.setEnterpriseType(vo.getEnterpriseType());
-        data.setCompanyId(vo.getCompanyId());
+        if (!StringUtil.isBlank(vo.getEnterpriseType())) {
+            data.setEnterpriseType(vo.getEnterpriseType());
+        }
+        if (!StringUtil.isBlank(vo.getCompanyId())) {
+            data.setCompanyId(vo.getCompanyId());
+        }
         if (!StringUtil.isBlank(vo.getCompanyNature())) {
             data.setCompanyNature(vo.getCompanyNature());
         }
@@ -215,7 +220,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         if (!StringUtil.isBlank(vo.getMaterialSupplyPlan())) {
             data.setMaterialSupplyPlan(vo.getMaterialSupplyPlan());
         }
-        data.setSuggestedCategory(vo.getSuggestedCategory());
+        if (!StringUtil.isBlank(vo.getSuggestedCategory())) {
+            data.setSuggestedCategory(vo.getSuggestedCategory());
+        }
         if (!StringUtil.isBlank(vo.getCreditLimit())) {
             data.setCreditLimit(vo.getCreditLimit());
         }
@@ -243,7 +250,9 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         if (!StringUtil.isBlank(vo.getCompanyMaterialSupplyPlan())) {
             data.setCompanyMaterialSupplyPlan(vo.getCompanyMaterialSupplyPlan());
         }
-        data.setCompanySuggestedCategory(vo.getCompanySuggestedCategory());
+        if (!StringUtil.isBlank(vo.getCompanySuggestedCategory())) {
+            data.setCompanySuggestedCategory(vo.getCompanySuggestedCategory());
+        }
         data.setStatus(vo.getStatus());
 
         getBaseMapper().insert(data);
@@ -259,8 +268,11 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             }
         }
 
-        // 开启审核
-        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        //导入不走审核流
+        if (!"IMPORT".equals(vo.getImportType())) {
+            // 开启审核
+            flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        }
 
         return data.getId();
     }
@@ -628,6 +640,32 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "更新状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                .set(CustomerCredit::getStatus, status)
+                .eq(CustomerCredit::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "取消，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cancel(String id) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        LambdaUpdateWrapper<CustomerCredit> updateWrapper = Wrappers.lambdaUpdate(CustomerCredit.class)
+                .set(CustomerCredit::getStatus, "CANCEL")
+                .eq(CustomerCredit::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除客户资信表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.listeners.flow;
 
 import com.lframework.starter.bpm.enums.FlowInstanceStatus;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -20,6 +21,8 @@ public class NodeFinishListener implements Listener {
 
     @Resource
     private CustomerDevelopPlanService customerDevelopPlanService;
+    @Resource
+    private CustomerCreditService customerCreditService;
 
 
     /**
@@ -44,6 +47,9 @@ public class NodeFinishListener implements Listener {
             case "CUSTOMER_DEVELOP":
                 handleCustomerDevelopData(flowStatus, businessId);
                 break;
+            case "CUSTOMER_CREDIT":
+                handleCustomerCreditData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -54,7 +60,7 @@ public class NodeFinishListener implements Listener {
     /**
      * 客户开发业务数据处理
      *
-     * @param businessId        业务ID
+     * @param businessId 业务ID
      */
     private void handleCustomerDevelopData(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)) {
@@ -63,4 +69,17 @@ public class NodeFinishListener implements Listener {
             customerDevelopPlanService.updateStatus(businessId, CustomerDevelopStatus.REFUSE);
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * 客户资信业务数据处理
+     *
+     * @param businessId 业务ID
+     */
+    private void handleCustomerCreditData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)) {
+            customerCreditService.updateStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)) {
+            customerCreditService.updateStatus(businessId, "REFUSE");
+        }
+    }
+}

@@ -48,6 +48,21 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
      */
     void update(UpdateCustomerCreditVo vo);
 
+
+    /**
+     * 更新状态
+     * @param id
+     * @param status
+     */
+    void updateStatus(String id, String status);
+
+    /**
+     * 取消
+     *
+     * @param id
+     */
+    void cancel(String id);
+
     /**
      * 根据ID删除
      * @param id

@@ -391,4 +391,10 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
     @ApiModelProperty("核心人员")
     private List<CreateCorePersonnelVo> corePersonnelList;
 
+    /**
+     * 是否为导入(IMPORT)
+     */
+    @ApiModelProperty("是否为导入")
+    private String importType;
+
 }

@@ -7,6 +7,7 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializable {
@@ -14,6 +15,13 @@ public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializabl
     private static final long serialVersionUID = 1L;
 
     /**
+     * ID集合
+     */
+    @ApiModelProperty("ID集合")
+    private List<String> ids;
+
+
+    /**
      * 登记开始日期
      */
     @ApiModelProperty("登记开始日期")
@@ -49,4 +57,10 @@ public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializabl
     @ApiModelProperty("资信编号")
     private String serialNumber;
 
+    /**
+     * 导出类型
+     */
+    @ApiModelProperty("导出类型")
+    private String exportType;
+
 }