Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java

@@ -39,4 +39,8 @@ public interface CustomerDao extends BaseMapper<CustomerEntity> {
     List<CustomerEntity> queryCompanyCodeAndName(int type);
 
     String getCodeByType(Integer type);
+
+    List<String> listCustomerName(Integer type);
+
+    String getNameByCustomerId(Long CustomerId);
 }

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

@@ -215,11 +215,20 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
     @Transactional
     @Override
     public boolean saveCustomerPersonal(CustomerPersonalTOI customerPersonalTOI) {
+        if (customerPersonalTOI.getName() != null && customerPersonalTOI.getName().length() != 0) {
+            // 客户姓名判重
+            List<String> names = customerDao.listCustomerName(0); // 个人类型客户名称
+            for (String name : names) {
+                if (customerPersonalTOI.getName().equals(name)) {
+                    ExceptionCast.cast(CrmsCode.CUSTOMER_NAME_REPETITION);
+                }
+            }
+        }
         CustomerEntity customerEntity = new CustomerEntity();
         PersonalCustomerEntity personalCustomerEntity = new PersonalCustomerEntity();
         BeanUtils.copyProperties(customerPersonalTOI, customerEntity);
         BeanUtils.copyProperties(customerPersonalTOI, personalCustomerEntity);
-        //TODO 设置客户编号
+        // 设置客户编号
         String code = customerDao.getCodeByType(CrmsConstant.CustomerType.PERSONAL_CUSTOMER.getType());
         if (code == null || code.length() == 0) {
             code = PromptSuccess.PERSONAL_START_CODE;
@@ -263,12 +272,25 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         return customer && company;
     }
 */
+
     /**
      * 更新个人类型客户信息
      */
     @Transactional
     @Override
     public boolean updateCustomerPersonal(CustomerPersonalTOU customerPersonalTOU) {
+        // 客户名称判重,注意判断是否与原来相同
+        if (customerPersonalTOU.getName() != null && customerPersonalTOU.getName().length() != 0) {
+            String customerName = customerDao.getNameByCustomerId(customerPersonalTOU.getId());
+            if (!customerPersonalTOU.getName().equals(customerName)) {
+                List<String> names = customerDao.listCustomerName(0);
+                for (String name : names) {
+                    if (customerPersonalTOU.getName().equals(name)) {
+                        ExceptionCast.cast(CrmsCode.CUSTOMER_NAME_REPETITION);
+                    }
+                }
+            }
+        }
         CustomerEntity customerEntity = new CustomerEntity();
         PersonalCustomerEntity personalCustomerEntity = new PersonalCustomerEntity();
         BeanUtils.copyProperties(customerPersonalTOU, customerEntity);
@@ -568,6 +590,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
      */
     @Transactional
     public boolean insertCompany(CompanyCustomerRequest companyCustomerReq) {
+        // 客户名称判重
+        if (companyCustomerReq.getName() != null && companyCustomerReq.getName().length() != 0) {
+            List<String> names = customerDao.listCustomerName(1); // 企业类型客户名称
+            for (String name : names) {
+                if (companyCustomerReq.getName().equals(name)) {
+                    ExceptionCast.cast(CrmsCode.CUSTOMER_NAME_REPETITION);
+                }
+            }
+        }
         CustomerEntity customerEntity = new CustomerEntity();
         CompanyCustomerEntity companyCustomerEntity = new CompanyCustomerEntity();
         BeanUtils.copyProperties(companyCustomerReq, customerEntity);
@@ -612,6 +643,18 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
      */
     @Transactional
     public boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
+        // 客户名称判重,注意判断是否与原来相同
+        if (companyCustomerReq.getName() != null && companyCustomerReq.getName().length() != 0) {
+            String customerName = customerDao.getNameByCustomerId(companyCustomerReq.getId());
+            if (!companyCustomerReq.getName().equals(customerName)) {
+                List<String> names = customerDao.listCustomerName(1);
+                for (String name : names) {
+                    if (companyCustomerReq.getName().equals(name)) {
+                        ExceptionCast.cast(CrmsCode.CUSTOMER_NAME_REPETITION);
+                    }
+                }
+            }
+        }
         CustomerEntity customerEntity = new CustomerEntity();
         CompanyCustomerEntity companyCustomerEntity = new CompanyCustomerEntity();
         BeanUtils.copyProperties(companyCustomerReq, customerEntity);

dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml

@@ -100,4 +100,14 @@
     <select id="getCodeByType" parameterType="integer" resultType="string">
         SELECT code FROM crms_customer WHERE type = #{type} AND del_or_not = 0 ORDER BY create_time DESC LIMIT 0,1
     </select>
+
+    <!-- 根据类型获取所有的客户名称 -->
+    <select id="listCustomerName" parameterType="integer" resultType="string">
+        SELECT name FROM crms_customer WHERE type = #{type} AND del_or_not = 0
+    </select>
+
+    <!-- 根据客户id查询客户名称  -->
+    <select id="getNameByCustomerId" parameterType="long" resultType="string">
+        SELECT name FROM crms_customer WHERE id = #{CustomerId}
+    </select>
 </mapper>

dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java

@@ -57,7 +57,7 @@ public class ResponseResult<T> {
     }
 
     public static ResponseResult FAIL(Object t) {
-        return new ResponseResult<>(false, 99999, t, "操作失败,请检查文件或者数据格式是否正确!");
+        return new ResponseResult<>(false, 99999, t, "操作失败,请检查客户名称是否已存在或者文件和数据格式是否正确!");
     }
 
     public ResponseResult SUCCESS_DATA(T t){

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java

@@ -19,7 +19,8 @@ public enum CrmsCode implements ResultCode {
     CUSTOMER_EXPORT_EXSIT(false,20002,"导出数据失败,请稍后再试!"),
     CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"导出excel模板失败,请稍后再试!"),
     NOT_NULL(false,20004,"上传的文件不能为空"),
-    CUSTOMER_IS_NULL(false,20005,"导入数据失败,当前员工不存在!");
+    CUSTOMER_IS_NULL(false,20005,"导入数据失败,当前员工不存在!"),
+    CUSTOMER_NAME_REPETITION(false, 20006, "当前客户名称已存在!");
 
 
     /**

dq-govern-gateway/src/main/resources/jwt.properties

@@ -27,7 +27,8 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-guarantee/dg-loan-notice/exportLoanNotice,\
   /api-hrms/hrms/user/uploadFile,\
   /apiHrmsAuth/hrms/auth/permission/getUserRoles,\
-  /api-hrms/hrms/permission/getPermission
+  /api-hrms/hrms/permission/getPermission,\
+  /api-guarantee/guarantee/efficiency/personalEfficiencyListExport