楚江ERP:客户资质-限制一个客户只能有一条资信数据

@@ -149,7 +149,14 @@ public class CustomerCreditController extends DefaultBaseController {
         vo1.setSerialNumber(vo.getSerialNumber());
         List<CustomerCredit> query = customerCreditService.query(vo1);
         if (CollectionUtil.isNotEmpty(query)) {
-            return InvokeResultBuilder.fail("资信编码已存在！");
+            throw new DefaultClientException("资信编码已存在！");
+        }
+        QueryCustomerCreditVo vo2 = new QueryCustomerCreditVo();
+        vo2.setCompanyId(vo.getCompanyId());
+        vo2.setStatusCancel("CANCEL");
+        List<CustomerCredit> query1 = customerCreditService.query(vo2);
+        if (CollectionUtil.isNotEmpty(query1)) {
+            throw new DefaultClientException("该单位名称资信已存在！");
         }
         customerCreditService.create(vo);
 

@@ -13,6 +13,7 @@ import com.lframework.xingyun.sc.vo.customer.credit.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -22,6 +23,10 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
 
 
   private List<String> checkList = new ArrayList<>();
+  private List<String> checkNameList = new ArrayList<>();
+
+  @Resource
+  private CustomerCreditService customerCreditService;
 
   @Override
   protected void doInvoke(CustomerCreditImportModel data, AnalysisContext context) {
@@ -36,6 +41,10 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
           "第" + context.readRowHolder().getRowIndex() + "行“编号”与第" + (checkList.indexOf(data.getCode()) + 1) + "行重复");
     }
     checkList.add(data.getCode());
+    if (checkNameList.contains(data.getName())) {
+      throw new DefaultClientException(
+              "第" + context.readRowHolder().getRowIndex() + "行“客户名称”与第" + (checkList.indexOf(data.getName()) + 1) + "行重复");
+    }
     if (StringUtil.isBlank(data.getName())) {
       throw new DefaultClientException(
               "第" + context.readRowHolder().getRowIndex() + "行“客户名称”不能为空");
@@ -45,9 +54,18 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
         throw new DefaultClientException(
                 "第" + context.readRowHolder().getRowIndex() + "行“客户名称”不存在");
       } else {
+        QueryCustomerCreditVo vo = new QueryCustomerCreditVo();
+        vo.setCompanyId(customer.getId());
+        vo.setStatusCancel("CANCEL");
+        List<CustomerCredit> query = customerCreditService.query(vo);
+        if (CollectionUtils.isNotEmpty(query) && query.size() > 0) {
+          throw new DefaultClientException(
+                  "第" + context.readRowHolder().getRowIndex() + "行的客户资信已存在");
+        }
         data.setCompanyId(customer.getId());
       }
     }
+    checkNameList.add(data.getName());
     if (StringUtil.isBlank(data.getCompanySuggestedCategory())) {
       throw new DefaultClientException(
               "第" + context.readRowHolder().getRowIndex() + "行“客户分类”不能为空");

@@ -1180,10 +1180,10 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                     return sysUserService.findById(sysDept.getUserId());
                 }
             } else {
-                throw new IllegalArgumentException("部门名称为空");
+                throw new DefaultClientException("部门名称为空");
             }
         } else {
-            throw new IllegalArgumentException("人员不存在");
+            throw new DefaultClientException("人员不存在");
         }
         return null;
     }
@@ -1210,10 +1210,10 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
 
                 return generateNextAvailableNumber(prefixPinyin, existingNumbers);
             } else {
-                throw new IllegalArgumentException("部门名称为空");
+                throw new DefaultClientException("部门名称为空");
             }
         } else {
-            throw new IllegalArgumentException("人员不存在");
+            throw new DefaultClientException("人员不存在");
         }
     }
 
@@ -1354,7 +1354,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         // 2. 从 classpath 加载模板
         try (InputStream templateIs = getClass().getClassLoader().getResourceAsStream(templatePathInClasspath)) {
             if (templateIs == null) {
-                throw new FileNotFoundException("模板文件未找到，请检查路径: " + templatePathInClasspath);
+                throw new DefaultClientException("模板文件未找到，请检查路径: " + templatePathInClasspath);
             }
 
             // 3. 创建输出文件流
@@ -1436,7 +1436,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
     public static String generateNextAvailableNumber(String prefix, Set<String> existingNumbers) {
         // 参数校验
         if (prefix == null || prefix.isEmpty()) {
-            throw new IllegalArgumentException("办事处前缀不能为空");
+            throw new DefaultClientException("办事处前缀不能为空");
         }
         if (existingNumbers == null) {
             existingNumbers = new HashSet<>();
@@ -1468,7 +1468,7 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .boxed()
                 .findFirst()
                 .map(n -> String.format("%s%03d", prefix.toUpperCase(), n))
-                .orElseThrow(() -> new RuntimeException("办事处 " + prefix + " 的编号已用尽 (001-999)"));
+                .orElseThrow(() -> new DefaultClientException("办事处 " + prefix + " 的编号已用尽 (001-999)"));
     }
 
     @CacheEvict(value = CustomerCredit.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")

@@ -58,6 +58,19 @@ public class QueryCustomerCreditVo extends PageVo implements BaseVo, Serializabl
     private String serialNumber;
 
     /**
+     * 单位id
+     */
+    @ApiModelProperty("单位id")
+    private String companyId;
+
+    /**
+     * 审核状态为取消
+     */
+    @ApiModelProperty("审核状态为取消")
+    private String statusCancel;
+
+
+    /**
      * 导出类型
      */
     @ApiModelProperty("导出类型")

@@ -168,6 +168,12 @@
             <if test="vo.serialNumber != null and vo.serialNumber != ''">
                 AND tb.serial_number = #{vo.serialNumber}
             </if>
+            <if test="vo.companyId != null and vo.companyId != ''">
+                AND tb.company_id = #{vo.companyId}
+            </if>
+            <if test="vo.statusCancel != null and vo.statusCancel != ''">
+                AND tb.status != #{vo.statusCancel}
+            </if>
         </where>
     </select>