Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.controller.customer;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.ExcelUtil;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.bo.system.user.QuerySysUserBo;
 import com.lframework.starter.web.inner.entity.SysUser;
 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;
@@ -15,6 +16,8 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportListener;
+import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportModel;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditVo;
@@ -30,8 +33,10 @@ import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -58,7 +63,7 @@ public class CustomerCreditController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"customerCredit:customercredit:query"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCustomerCreditBo>> query(@Valid QueryCustomerCreditVo vo) {
     public InvokeResult<PageResult<GetCustomerCreditBo>> query(@Valid QueryCustomerCreditVo vo) {
 
 
@@ -79,7 +84,7 @@ public class CustomerCreditController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"customerCredit:customercredit:query"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:query"})
     @GetMapping("/getById")
     @GetMapping("/getById")
     public InvokeResult<GetCustomerCreditBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetCustomerCreditBo> get(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -97,7 +102,7 @@ public class CustomerCreditController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"customerCredit:customercredit:add"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:add"})
     @PostMapping("/add")
     @PostMapping("/add")
     public InvokeResult<Void> create(@Valid @RequestBody CreateCustomerCreditVo vo) {
     public InvokeResult<Void> create(@Valid @RequestBody CreateCustomerCreditVo vo) {
         QueryCustomerCreditVo vo1 = new QueryCustomerCreditVo();
         QueryCustomerCreditVo vo1 = new QueryCustomerCreditVo();
@@ -115,7 +120,7 @@ public class CustomerCreditController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"customerCredit:customercredit:modify"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:modify"})
     @PutMapping("/update")
     @PutMapping("/update")
     public InvokeResult<Void> update(@Valid @RequestBody UpdateCustomerCreditVo vo) {
     public InvokeResult<Void> update(@Valid @RequestBody UpdateCustomerCreditVo vo) {
 
 
@@ -131,7 +136,7 @@ public class CustomerCreditController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID删除")
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"customerCredit:customercredit:delete"})
+    @HasPermission({"customer-credit-manage:customer-credit-plan:delete"})
     @DeleteMapping("/deleteById")
     @DeleteMapping("/deleteById")
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -183,6 +188,26 @@ public class CustomerCreditController extends DefaultBaseController {
         return InvokeResultBuilder.success(results);
         return InvokeResultBuilder.success(results);
     }
     }
 
 
+    @ApiOperation("下载导入模板")
+    @HasPermission({"customer-credit-manage:customer-credit-plan:import"})
+    @GetMapping("/import/template")
+    public void downloadImportTemplate() {
+        ExcelUtil.exportXls("客户资信导入模板", CustomerCreditImportModel.class);
+    }
+
+    @ApiOperation("导入")
+    @HasPermission({"customer-credit-manage:customer-credit-plan:import"})
+    @PostMapping("/import")
+    public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
+                                          @NotNull(message = "请上传文件") MultipartFile file) {
+
+        CustomerCreditImportListener listener = new CustomerCreditImportListener();
+        listener.setTaskId(id);
+        ExcelUtil.read(file, CustomerCreditImportModel.class, listener).sheet().doRead();
+
+        return InvokeResultBuilder.success();
+    }
+
 
 
     /**
     /**
      * 封装客户资信数据
      * 封装客户资信数据

+package com.lframework.xingyun.sc.excel.customerCredit;
+
+import com.alibaba.excel.context.AnalysisContext;
+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.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 lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+public class CustomerCreditImportListener extends ExcelImportListener<CustomerCreditImportModel> {
+
+
+  private List<String> checkList = new ArrayList<>();
+
+  @Override
+  protected void doInvoke(CustomerCreditImportModel data, AnalysisContext context) {
+    List<String> validValues = Arrays.asList("AAA", "AA", "A", "BBB", "BB", "B", "C", "D");
+    if (StringUtil.isBlank(data.getCode())) {
+      throw new DefaultClientException(
+          "第" + context.readRowHolder().getRowIndex() + "行“编号”不能为空");
+    }
+    if (checkList.contains(data.getCode())) {
+      throw new DefaultClientException(
+          "第" + context.readRowHolder().getRowIndex() + "行“编号”与第" + (checkList.indexOf(data.getCode()) + 1) + "行重复");
+    }
+    checkList.add(data.getCode());
+    QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
+    vo.setSerialNumber(data.getCode());
+    CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class);
+    List<CustomerCredit> query = customerCreditService.query(vo);
+    if (CollectionUtils.isEmpty(query)) {
+      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");
+    }
+  }
+
+  @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());
+
+        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());
+
+        this.setSuccessProcess(i);
+      }
+    }
+  }
+
+  @Override
+  protected void doComplete() {
+  }
+}

+package com.lframework.xingyun.sc.excel.customerCredit;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.lframework.starter.web.core.annotations.excel.ExcelRequired;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import lombok.Data;
+
+@Data
+public class CustomerCreditImportModel implements ExcelModel {
+
+  /**
+   * ID
+   */
+  @ExcelIgnore
+  private String id;
+
+  /**
+   * 编号
+   */
+  @ExcelRequired
+  @ExcelProperty("编号")
+  private String code;
+
+  /**
+   * 客户分类
+   */
+  @ExcelProperty("客户分类")
+  private String companySuggestedCategory;
+
+  /**
+   * 授信额度
+   */
+  @ExcelProperty("授信额度")
+  private String companyCreditLimit;
+
+  /**
+   * 加工操作方案
+   */
+  @ExcelProperty("加工操作方案")
+  private String companyMaterialSupplyPlan;
+
+  /**
+   * 结算期限
+   */
+  @ExcelProperty("结算期限")
+  private String companySettlementPeriod;
+
+}