采购：内贸客户资信新增客户简称且要唯一

@@ -1472,6 +1472,7 @@ CREATE TABLE `procurement_domestic_customer_credit`
 (
 (
     `id`                           varchar(32)    NOT NULL COMMENT 'ID',
     `id`                           varchar(32)    NOT NULL COMMENT 'ID',
     `unit_name`                    varchar(200)   NOT NULL COMMENT '单位名称',
     `unit_name`                    varchar(200)   NOT NULL COMMENT '单位名称',
+    `customer_short_name`          varchar(200)   NOT NULL COMMENT '客户简称',
     `company_nature`               varchar(200)   NOT NULL COMMENT '公司性质',
     `company_nature`               varchar(200)   NOT NULL COMMENT '公司性质',
     `bank_name`                    varchar(200)   NOT NULL COMMENT '开户行',
     `bank_name`                    varchar(200)   NOT NULL COMMENT '开户行',
     `bank_account`                 varchar(200)   NOT NULL COMMENT '账号',
     `bank_account`                 varchar(200)   NOT NULL COMMENT '账号',
@@ -1526,6 +1527,7 @@ CREATE TABLE `procurement_domestic_customer_credit`
     `create_time`                  datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `create_time`                  datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time`                  datetime       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `update_time`                  datetime       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`id`),
     PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_pdcc_customer_short_name` (`customer_short_name`),
     KEY `idx_pdcc_unit_name` (`unit_name`),
     KEY `idx_pdcc_unit_name` (`unit_name`),
     KEY `idx_pdcc_purchase_department` (`purchase_department`),
     KEY `idx_pdcc_purchase_department` (`purchase_department`),
     KEY `idx_pdcc_review_valid_until` (`review_valid_until`),
     KEY `idx_pdcc_review_valid_until` (`review_valid_until`),

@@ -29,6 +29,11 @@ public class ProcurementDomesticCustomerCredit extends BaseEntity implements Bas
     private String unitName;
     private String unitName;
 
 
     /**
     /**
+     * 客户简称
+     */
+    private String customerShortName;
+
+    /**
      * 公司性质
      * 公司性质
      */
      */
     private String companyNature;
     private String companyNature;

 package com.lframework.xingyun.sc.procurement.impl.credit;
 package com.lframework.xingyun.sc.procurement.impl.credit;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -131,9 +132,17 @@ public class ProcurementDomesticCustomerCreditServiceImpl
             throw new DefaultClientException("当前用户不存在！");
             throw new DefaultClientException("当前用户不存在！");
         }
         }
 
 
+        SysUser investigator = sysUserService.findById(vo.getInvestigatorId());
+        if (investigator == null) {
+            throw new DefaultClientException("资信调查人不存在！");
+        }
+
+        checkCustomerShortNameUnique(vo.getCustomerShortName(), null);
+
         ProcurementDomesticCustomerCredit data = new ProcurementDomesticCustomerCredit();
         ProcurementDomesticCustomerCredit data = new ProcurementDomesticCustomerCredit();
         data.setId(IdUtil.getId());
         data.setId(IdUtil.getId());
         data.setUnitName(vo.getUnitName());
         data.setUnitName(vo.getUnitName());
+        data.setCustomerShortName(vo.getCustomerShortName());
         data.setCompanyNature(vo.getCompanyNature());
         data.setCompanyNature(vo.getCompanyNature());
         data.setBankName(vo.getBankName());
         data.setBankName(vo.getBankName());
         data.setBankAccount(vo.getBankAccount());
         data.setBankAccount(vo.getBankAccount());
@@ -176,7 +185,7 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         data.setAttachmentFileIds(vo.getAttachmentFileIds());
         data.setAttachmentFileIds(vo.getAttachmentFileIds());
         data.setAttachmentFileNames(vo.getAttachmentFileNames());
         data.setAttachmentFileNames(vo.getAttachmentFileNames());
         data.setInvestigatorId(vo.getInvestigatorId());
         data.setInvestigatorId(vo.getInvestigatorId());
-        data.setInvestigatorName(currentUser.getName());
+        data.setInvestigatorName(investigator.getName());
         data.setPurchaseDepartment(vo.getPurchaseDepartment());
         data.setPurchaseDepartment(vo.getPurchaseDepartment());
         data.setReviewValidUntil(vo.getReviewValidUntil());
         data.setReviewValidUntil(vo.getReviewValidUntil());
         data.setStatus("AUDIT");
         data.setStatus("AUDIT");
@@ -206,6 +215,8 @@ public class ProcurementDomesticCustomerCreditServiceImpl
             throw new DefaultClientException("采购内贸资信调查表不存在！");
             throw new DefaultClientException("采购内贸资信调查表不存在！");
         }
         }
 
 
+        checkCustomerShortNameUnique(vo.getCustomerShortName(), vo.getId());
+
         SysUser currentUser = sysUserService.findById(vo.getInvestigatorId());
         SysUser currentUser = sysUserService.findById(vo.getInvestigatorId());
         if (currentUser == null) {
         if (currentUser == null) {
             throw new DefaultClientException("资信调查人不存在！");
             throw new DefaultClientException("资信调查人不存在！");
@@ -213,6 +224,7 @@ public class ProcurementDomesticCustomerCreditServiceImpl
 
 
         data.setId(vo.getId());
         data.setId(vo.getId());
         data.setUnitName(vo.getUnitName());
         data.setUnitName(vo.getUnitName());
+        data.setCustomerShortName(vo.getCustomerShortName());
         data.setCompanyNature(vo.getCompanyNature());
         data.setCompanyNature(vo.getCompanyNature());
         data.setBankName(vo.getBankName());
         data.setBankName(vo.getBankName());
         data.setBankAccount(vo.getBankAccount());
         data.setBankAccount(vo.getBankAccount());
@@ -326,4 +338,24 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         DomesticReviewerDto reviewer = getBaseMapper().getReviewerById(id);
         DomesticReviewerDto reviewer = getBaseMapper().getReviewerById(id);
         return reviewer == null ? new DomesticReviewerDto() : reviewer;
         return reviewer == null ? new DomesticReviewerDto() : reviewer;
     }
     }
+
+    /**
+     * 校验客户简称唯一性
+     *
+     * @param customerShortName 客户简称
+     * @param excludeId         排除的资信ID
+     */
+    private void checkCustomerShortNameUnique(String customerShortName, String excludeId) {
+        LambdaQueryWrapper<ProcurementDomesticCustomerCredit> queryWrapper =
+                Wrappers.lambdaQuery(ProcurementDomesticCustomerCredit.class)
+                        .eq(ProcurementDomesticCustomerCredit::getCustomerShortName, customerShortName);
+        if (StringUtils.isNotBlank(excludeId)) {
+            queryWrapper.ne(ProcurementDomesticCustomerCredit::getId, excludeId);
+        }
+
+        Integer count = getBaseMapper().selectCount(queryWrapper);
+        if (count != null && count > 0) {
+            throw new DefaultClientException("客户简称已存在，请重新输入！");
+        }
+    }
 }
 }

@@ -21,6 +21,11 @@ public class CreateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
     @Length(max = 200, message = "单位名称最多允许200个字符！")
     @Length(max = 200, message = "单位名称最多允许200个字符！")
     private String unitName;
     private String unitName;
 
 
+    @ApiModelProperty(value = "客户简称", required = true)
+    @NotBlank(message = "客户简称不能为空！")
+    @Length(max = 200, message = "客户简称最多允许200个字符！")
+    private String customerShortName;
+
     @ApiModelProperty(value = "公司性质", required = true)
     @ApiModelProperty(value = "公司性质", required = true)
     @NotBlank(message = "公司性质不能为空！")
     @NotBlank(message = "公司性质不能为空！")
     @Length(max = 200, message = "公司性质最多允许200个字符！")
     @Length(max = 200, message = "公司性质最多允许200个字符！")
@@ -212,9 +217,6 @@ public class CreateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
     @Length(max = 65535, message = "附件文件名称集合内容过长！")
     @Length(max = 65535, message = "附件文件名称集合内容过长！")
     private String attachmentFileNames;
     private String attachmentFileNames;
 
 
-    /**
-     * 资信调查人ID
-     */
     @ApiModelProperty("资信调查人ID")
     @ApiModelProperty("资信调查人ID")
     @NotBlank(message = "资信调查人ID！")
     @NotBlank(message = "资信调查人ID！")
     @Length(max = 200, message = "资信调查人ID内容过长！")
     @Length(max = 200, message = "资信调查人ID内容过长！")

@@ -15,6 +15,9 @@ public class QueryProcurementDomesticCustomerCreditVo extends PageVo implements
     @ApiModelProperty("单位名称")
     @ApiModelProperty("单位名称")
     private String unitName;
     private String unitName;
 
 
+    @ApiModelProperty("客户简称")
+    private String customerShortName;
+
     @ApiModelProperty("公司性质")
     @ApiModelProperty("公司性质")
     private String companyNature;
     private String companyNature;
 
 

@@ -29,6 +29,11 @@ public class UpdateProcurementDomesticCustomerCreditVo implements BaseVo, Serial
     @Length(max = 200, message = "单位名称最多允许200个字符！")
     @Length(max = 200, message = "单位名称最多允许200个字符！")
     private String unitName;
     private String unitName;
 
 
+    @ApiModelProperty(value = "客户简称", required = true)
+    @NotBlank(message = "客户简称不能为空！")
+    @Length(max = 200, message = "客户简称最多允许200个字符！")
+    private String customerShortName;
+
     @ApiModelProperty(value = "公司性质", required = true)
     @ApiModelProperty(value = "公司性质", required = true)
     @NotBlank(message = "公司性质不能为空！")
     @NotBlank(message = "公司性质不能为空！")
     @Length(max = 200, message = "公司性质最多允许200个字符！")
     @Length(max = 200, message = "公司性质最多允许200个字符！")

@@ -6,6 +6,7 @@
                type="com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit">
                type="com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="unit_name" property="unitName"/>
         <result column="unit_name" property="unitName"/>
+        <result column="customer_short_name" property="customerShortName"/>
         <result column="company_nature" property="companyNature"/>
         <result column="company_nature" property="companyNature"/>
         <result column="bank_name" property="bankName"/>
         <result column="bank_name" property="bankName"/>
         <result column="bank_account" property="bankAccount"/>
         <result column="bank_account" property="bankAccount"/>
@@ -67,6 +68,7 @@
         SELECT
         SELECT
             tb.id,
             tb.id,
             tb.unit_name,
             tb.unit_name,
+            tb.customer_short_name,
             tb.company_nature,
             tb.company_nature,
             tb.bank_name,
             tb.bank_name,
             tb.bank_account,
             tb.bank_account,
@@ -132,6 +134,9 @@
             <if test="vo.unitName != null and vo.unitName != ''">
             <if test="vo.unitName != null and vo.unitName != ''">
                 AND tb.unit_name LIKE CONCAT('%', #{vo.unitName}, '%')
                 AND tb.unit_name LIKE CONCAT('%', #{vo.unitName}, '%')
             </if>
             </if>
+            <if test="vo.customerShortName != null and vo.customerShortName != ''">
+                AND tb.customer_short_name LIKE CONCAT('%', #{vo.customerShortName}, '%')
+            </if>
             <if test="vo.companyNature != null and vo.companyNature != ''">
             <if test="vo.companyNature != null and vo.companyNature != ''">
                 AND tb.company_nature LIKE CONCAT('%', #{vo.companyNature}, '%')
                 AND tb.company_nature LIKE CONCAT('%', #{vo.companyNature}, '%')
             </if>
             </if>