【居民端小程序】企业注册接口，添加统一社会信用代码是否已存在校验-王公峰-2020-07-15

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/dao/EnterpriseInfoDao.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoUpdateResultDTO;
+import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
 import com.elink.esua.epdc.modules.enterprise.entity.EnterpriseInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,8 +77,8 @@ public interface EnterpriseInfoDao extends BaseDao<EnterpriseInfoEntity> {
 
     /**
      * 根据统一社会信用代码查询是否已存在该代码
-     * @param uniformSocialCreditCode
+     * @param fromDto
      * @return
      */
-    int getCountByCode(String uniformSocialCreditCode);
+    int getCountByCode(CompleteRequisiteInfoDTO fromDto);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java

@@ -140,12 +140,9 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
     @Transactional(rollbackFor = Exception.class)
     public Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto) {
         // 校验统一社会信用代码是否已存在数据库
-        String uniformSocialCreditCode = fromDto.getUniformSocialCreditCode();
-        if(StringUtils.isNotBlank(uniformSocialCreditCode)){
-            int count = baseDao.getCountByCode(uniformSocialCreditCode);
-            if(count > 0){
-                throw new RenException("您输入的统一社会信用代码已存在！");
-            }
+        int count = baseDao.getCountByCode(fromDto);
+        if(count > 0){
+            throw new RenException("您输入的统一社会信用代码已存在！");
         }
         //保存到企业数据库
         EnterpriseInfoEntity enterpriseInfo = ConvertUtils.sourceToTarget(fromDto, EnterpriseInfoEntity.class);

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/enterprise/EnterpriseInfoDao.xml

@@ -86,7 +86,14 @@
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
     </select>
-    <select id="getCountByCode">
-        select count(*) count from epdc_enterprise_info where UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode} and DEL_FLAG = '0'
+    <select id="getCountByCode" parameterType="com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO">
+        select
+        count(*) count
+        from epdc_enterprise_info
+        where UNIFORM_SOCIAL_CREDIT_CODE = #{uniformSocialCreditCode}
+        <if test="id != null and id != ''">
+            AND ID != #{id}
+        </if>
+        and DEL_FLAG = '0'
     </select>
 </mapper>