1：采购内贸资信调查表；2：销售资信批量导出

@@ -230,9 +230,9 @@ public class BaseDataOnlinePriceImportListener
         }
         BigDecimal normalized = decimal.stripTrailingZeros();
         int scale = Math.max(normalized.scale(), 0);
-        if (scale > 4) {
+        if (scale > 2) {
             throw new DefaultClientException(
-                    "第" + rowIndex + "行“" + fieldName + "”最多允许4位小数");
+                    "第" + rowIndex + "行“" + fieldName + "”最多允许2位小数");
         }
         return decimal;
     }

@@ -501,6 +501,136 @@ public class CustomerCreditController extends DefaultBaseController {
     }
 
     /**
+     * 按筛选条件批量导出（按导入模板结构）
+     */
+    @ApiOperation("按筛选条件批量导出")
+    @HasPermission({"customer-credit-manage:customer-credit-plan:export"})
+    @GetMapping("/export/list")
+    public void exportByCondition(@Valid QueryCustomerCreditVo vo, HttpServletResponse response) throws IOException {
+        applyQueryPermission(vo);
+
+        List<CustomerCredit> datas = customerCreditService.query(vo);
+        String fileName = "客户资信批量导出.xlsx";
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        String encoded = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()).replace("+", "%20");
+        response.setHeader("Content-Disposition",
+                "attachment; filename=\"" + encoded + "\"; filename*=UTF-8''" + encoded);
+
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        List<CustomerCreditBatchExportModel> models = new ArrayList<>(datas.size());
+        int idx = 1;
+        for (CustomerCredit credit : datas) {
+            GetCustomerCreditBo bo = packCustomerCreditData(credit);
+            CustomerCreditBatchExportModel m = new CustomerCreditBatchExportModel();
+            m.setSort(String.valueOf(idx++));
+            m.setCode(bo.getSerialNumber());
+            m.setDeptName(bo.getDeptName());
+            m.setRegionName(bo.getRegionName());
+            m.setCustomerShortName(bo.getCustomerShortName());
+            m.setRegisterDateStr(bo.getRegisterDate() == null ? "" : bo.getRegisterDate().format(dateFormatter));
+            m.setName(bo.getCompanyName());
+            m.setEnterpriseType(convertEnterpriseType(bo.getEnterpriseType()));
+            m.setCompanyNature(bo.getCompanyNature());
+            m.setCompanyAddress(bo.getCompanyAddress());
+            m.setRegisteredCapital(bo.getRegisteredCapital());
+            m.setBankAccount(bo.getBankAccount());
+            m.setBankName(bo.getBankName());
+            m.setTaxNumber(bo.getTaxNumber());
+            m.setRegistrationTimeStr(bo.getRegistrationTime() == null ? "" : bo.getRegistrationTime().format(dateFormatter));
+            m.setBusinessYears(bo.getBusinessYears());
+
+            CorePersonnel legal = null;
+            if (CollectionUtils.isNotEmpty(bo.getCorePersonnelList())) {
+                legal = bo.getCorePersonnelList().stream()
+                        .filter(p -> "法定代表人".equals(p.getPosition()))
+                        .findFirst()
+                        .orElse(null);
+            }
+            if (legal != null) {
+                m.setUserName1(legal.getName());
+                m.setAge1(legal.getAge());
+                m.setSex1(legal.getSex());
+                m.setNativePlace1(legal.getNativePlace());
+                m.setAddress1(legal.getAddress());
+                m.setMobile1(legal.getMobile());
+                m.setPhone1(legal.getPhone());
+                m.setEmail1(legal.getEmail());
+            }
+
+            m.setBusinessProperty(bo.getBusinessProperty());
+            m.setBusinessScope(bo.getBusinessScope());
+            m.setLandArea(bo.getLandArea());
+            m.setStorageConditions(bo.getStorageConditions());
+            m.setEmployeeCount(bo.getEmployeeCount());
+            m.setEquipmentAttributes(bo.getEquipmentAttributes());
+            m.setAssetEvaluation(bo.getAssetEvaluation());
+            m.setLastYearSales(bo.getLastYearSales());
+            m.setMonthlyAvgSales(bo.getMonthlyAvgSales());
+            m.setInvoiceItemUnit(bo.getInvoiceItemUnit());
+            m.setCertificationCertificate(bo.getCertificationCertificate());
+            m.setProductMatch(bo.getProductMatch());
+            m.setMajorCustomers(bo.getMajorCustomers());
+            m.setMainProjects(bo.getMainProjects());
+            m.setIndustryInvolved(bo.getIndustryInvolved());
+            m.setIndustryExperience(bo.getIndustryExperience());
+            m.setHasDispute(bo.getHasDispute());
+            m.setCooperationStartDate(
+                    StringUtil.isBlank(bo.getCooperationStartDate())
+                            ? ""
+                            : bo.getCooperationStartDate());
+            m.setMonthlyAvgVolume(bo.getMonthlyAvgVolume());
+            m.setIsVerbalAgreement(
+                    StringUtil.isBlank(bo.getIsVerbalAgreement())
+                            ? ""
+                            : bo.getIsVerbalAgreement());
+            m.setOtherAgreements(bo.getOtherAgreements());
+            m.setHasLongTermContract(
+                    StringUtil.isBlank(bo.getHasLongTermContract())
+                            ? ""
+                            : bo.getHasLongTermContract());
+            m.setContractType(bo.getContractType());
+            m.setHasInterruption(bo.getHasInterruption());
+            m.setSettlementPeriod(bo.getSettlementPeriod());
+            m.setMaterialSupplyPlan(bo.getMaterialSupplyPlan());
+            m.setSuggestedCategory(
+                    StringUtil.isNotBlank(bo.getSuggestedCategory())
+                            ? bo.getSuggestedCategory()
+                            : bo.getCompanySuggestedCategory());
+            m.setCreditLimit(
+                    StringUtil.isNotBlank(bo.getCreditLimit())
+                            ? bo.getCreditLimit()
+                            : bo.getCompanyCreditLimit());
+            m.setInvestigatorName(bo.getInvestigatorName());
+
+            models.add(m);
+        }
+
+        try (OutputStream out = response.getOutputStream()) {
+            EasyExcel.write(out, CustomerCreditBatchExportModel.class)
+                    .registerWriteHandler(new AutoColumnWidthHandler())
+                    .sheet("客户资信")
+                    .doWrite(models);
+        }
+    }
+
+    private static String convertEnterpriseType(String type) {
+        if (StringUtil.isBlank(type)) return "";
+        switch (type) {
+            case "DEALER":
+            case "经销商":
+                return "经销商";
+            case "TERMINAL":
+            case "终端":
+                return "终端";
+            case "FOREIGN":
+            case "外贸":
+                return "外贸";
+            default:
+                return type;
+        }
+    }
+
+    /**
      * 定时任务:冻结
      */
     @Scheduled(cron = "0 0 0 31 3 ?")

+package com.lframework.xingyun.sc.excel.customerCredit;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import lombok.Data;
+
+@Data
+public class CustomerCreditBatchExportModel implements ExcelModel {
+
+    @ExcelProperty("序号")
+    private String sort;
+
+    @ExcelProperty("*编号")
+    private String code;
+
+    @ExcelProperty("*办事处")
+    private String deptName;
+
+    @ExcelProperty("*区域")
+    private String regionName;
+
+    @ExcelProperty("*简写名称")
+    private String customerShortName;
+
+    @ExcelProperty("*登记日期")
+    private String registerDateStr;
+
+    @ExcelProperty("*公司名称")
+    private String name;
+
+    @ExcelProperty("*企业类型")
+    private String enterpriseType;
+
+    @ExcelProperty("企业性质")
+    private String companyNature;
+
+    @ExcelProperty("注册地址")
+    private String companyAddress;
+
+    @ExcelProperty("注册资本")
+    private String registeredCapital;
+
+    @ExcelProperty("账号")
+    private String bankAccount;
+
+    @ExcelProperty("开户行")
+    private String bankName;
+
+    @ExcelProperty("税号")
+    private String taxNumber;
+
+    @ExcelProperty("注册时间")
+    private String registrationTimeStr;
+
+    @ExcelProperty("经营年限")
+    private String businessYears;
+
+    @ExcelProperty("姓名(法定代表人)")
+    private String userName1;
+
+    @ExcelProperty("年龄(法定代表人)")
+    private String age1;
+
+    @ExcelProperty("性别(法定代表人)")
+    private String sex1;
+
+    @ExcelProperty("籍贯(法定代表人)")
+    private String nativePlace1;
+
+    @ExcelProperty("现住址(法定代表人)")
+    private String address1;
+
+    @ExcelProperty("手机(法定代表人)")
+    private String mobile1;
+
+    @ExcelProperty("固定电话(法定代表人)")
+    private String phone1;
+
+    @ExcelProperty("邮箱地址(法定代表人)")
+    private String email1;
+
+    @ExcelProperty("经营场地属性")
+    private String businessProperty;
+
+    @ExcelProperty("经营范围")
+    private String businessScope;
+
+    @ExcelProperty("占地面积（平方米）")
+    private String landArea;
+
+    @ExcelProperty("仓储条件")
+    private String storageConditions;
+
+    @ExcelProperty("员工人数")
+    private String 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;
+
+    @ExcelProperty("建议客户分类")
+    private String suggestedCategory;
+
+    @ExcelProperty("*授信额度")
+    private String creditLimit;
+
+    @ExcelProperty("调查人")
+    private String investigatorName;
+}

@@ -103,6 +103,19 @@ public class ProcurementDomesticCustomerCreditController extends DefaultBaseCont
     }
 
     /**
+     * 提交审核
+     */
+    @ApiOperation("提交审核")
+    @HasPermission({"procure-manage:domestic-trade:submit"})
+    @GetMapping("/submit")
+    public InvokeResult<Void> submit(@NotBlank(message = "id不能为空！") String id) {
+
+        procurementDomesticCustomerCreditService.submit(id);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 取消
      */
     @ApiOperation("取消")

@@ -165,39 +165,38 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         data.setPurchaseDepartment(vo.getPurchaseDepartment());
         data.setRegion(vo.getRegion());
         data.setReviewValidUntil(vo.getReviewValidUntil());
-        data.setStatus("AUDIT");
         data.setFreeze(Boolean.FALSE);
 
         getBaseMapper().insert(data);
 
-        //开启审核
-        ProcurementDomesticCustomerCredit customerCredit = getBaseMapper().findById(data.getId());
-        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
-        String roleCode = null;
-        if (CollectionUtil.isNotEmpty(sysRoleList)) {
-            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
-            Set<String> roleCodeSet = sysRoleList.stream()
-                    .map(SysRole::getCode)
-                    .collect(Collectors.toSet());
-
-            // 2. 判断是否包含采购主管相关的角色
-            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
-                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
-                roleCode = "cgczg";
-            } else if (roleCodeSet.contains("qyjl")) {
-                // 3. 如果没有，继续判断是否包含区域经理
-                roleCode = "qyjl";
-            } else if (roleCodeSet.contains("nmcgkywy")) {
-                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
-                roleCode = "nmcgkywy";
-            } else {
-                throw new DefaultClientException("当前角色无法发起审核！");
-            }
-        } else {
-            throw new DefaultClientException("当前角色无法发起审核！");
-        }
-        customerCredit.setRoleCode(roleCode);
-        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, customerCredit);
+//        //开启审核
+//        ProcurementDomesticCustomerCredit customerCredit = getBaseMapper().findById(data.getId());
+//        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
+//        String roleCode = null;
+//        if (CollectionUtil.isNotEmpty(sysRoleList)) {
+//            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
+//            Set<String> roleCodeSet = sysRoleList.stream()
+//                    .map(SysRole::getCode)
+//                    .collect(Collectors.toSet());
+//
+//            // 2. 判断是否包含采购主管相关的角色
+//            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
+//                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
+//                roleCode = "cgczg";
+//            } else if (roleCodeSet.contains("qyjl")) {
+//                // 3. 如果没有，继续判断是否包含区域经理
+//                roleCode = "qyjl";
+//            } else if (roleCodeSet.contains("nmcgkywy")) {
+//                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
+//                roleCode = "nmcgkywy";
+//            } else {
+//                throw new DefaultClientException("当前角色无法发起审核！");
+//            }
+//        } else {
+//            throw new DefaultClientException("当前角色无法发起审核！");
+//        }
+//        customerCredit.setRoleCode(roleCode);
+//        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, customerCredit);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
@@ -273,44 +272,44 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         data.setPurchaseDepartment(vo.getPurchaseDepartment());
         data.setRegion(vo.getRegion());
         data.setReviewValidUntil(vo.getReviewValidUntil());
-        data.setStatus("AUDIT");
 
         //变更-审核通过再更新入库
         if ("CHANGE".equals(vo.getType())) {
+            data.setStatus("AUDIT");
             String jsonString = JsonUtil.toJsonString(data);
             //存入缓存
             redisHandler.set(data.getId(), jsonString);
-        } else {
-            //编辑-直接更新入库
-            getBaseMapper().updateById(data);
-        }
-        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
-        String roleCode = null;
-        if (CollectionUtil.isNotEmpty(sysRoleList)) {
-            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
-            Set<String> roleCodeSet = sysRoleList.stream()
-                    .map(SysRole::getCode)
-                    .collect(Collectors.toSet());
-
-            // 2. 判断是否包含采购主管相关的角色
-            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
-                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
-                roleCode = "cgczg";
-            } else if (roleCodeSet.contains("qyjl")) {
-                // 3. 如果没有，继续判断是否包含区域经理
-                roleCode = "qyjl";
-            } else if (roleCodeSet.contains("nmcgkywy")) {
-                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
-                roleCode = "nmcgkywy";
+            List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
+            String roleCode = null;
+            if (CollectionUtil.isNotEmpty(sysRoleList)) {
+                // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
+                Set<String> roleCodeSet = sysRoleList.stream()
+                        .map(SysRole::getCode)
+                        .collect(Collectors.toSet());
+
+                // 2. 判断是否包含采购主管相关的角色
+                if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
+                        || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
+                    roleCode = "cgczg";
+                } else if (roleCodeSet.contains("qyjl")) {
+                    // 3. 如果没有，继续判断是否包含区域经理
+                    roleCode = "qyjl";
+                } else if (roleCodeSet.contains("nmcgkywy")) {
+                    // 4. 如果还没有，继续判断是否包含内贸采购科业务员
+                    roleCode = "nmcgkywy";
+                } else {
+                    throw new DefaultClientException("当前角色无法发起审核！");
+                }
             } else {
                 throw new DefaultClientException("当前角色无法发起审核！");
             }
+            data.setRoleCode(roleCode);
+            //开启审核
+            flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         } else {
-            throw new DefaultClientException("当前角色无法发起审核！");
+            //编辑-直接更新入库
+            getBaseMapper().updateById(data);
         }
-        data.setRoleCode(roleCode);
-        //开启审核
-        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         OpLogUtil.setExtra(vo);
     }
@@ -342,6 +341,43 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         OpLogUtil.setExtra(vo);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "内贸资信提交审核，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void submit(String id) {
+        updateStatus(id, "AUDIT");
+        //开启审核
+        ProcurementDomesticCustomerCredit customerCredit = getBaseMapper().findById(id);
+        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
+        String roleCode = null;
+        if (CollectionUtil.isNotEmpty(sysRoleList)) {
+            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
+            Set<String> roleCodeSet = sysRoleList.stream()
+                    .map(SysRole::getCode)
+                    .collect(Collectors.toSet());
+
+            // 2. 判断是否包含采购主管相关的角色
+            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
+                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
+                roleCode = "cgczg";
+            } else if (roleCodeSet.contains("qyjl")) {
+                // 3. 如果没有，继续判断是否包含区域经理
+                roleCode = "qyjl";
+            } else if (roleCodeSet.contains("nmcgkywy")) {
+                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
+                roleCode = "nmcgkywy";
+            } else {
+                throw new DefaultClientException("当前角色无法发起审核！");
+            }
+        } else {
+            throw new DefaultClientException("当前角色无法发起审核！");
+        }
+        customerCredit.setRoleCode(roleCode);
+        flowInstanceWrapperService.startInstance(BPM_FLAG, id, BPM_FLAG, customerCredit);
+
+        OpLogUtil.setExtra(customerCredit);
+    }
+
     @Override
     public void updateStatus(String id, String status) {
         if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {

@@ -61,6 +61,11 @@ public interface ProcurementDomesticCustomerCreditService extends BaseMpService<
     void changeReview(UpdateProcurementDomesticCustomerCreditVo vo);
 
     /**
+     * 提交审核
+     */
+    void submit(String id);
+
+    /**
      * 更新审核状态
      */
     void updateStatus(String id, String status);