Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.context.AnalysisContext;
@@ -355,9 +356,12 @@ public class DataDockServiceImpl {
             useInfo.setCountyName(districtName);
             useInfo.setStreetName(streetName);
             useInfo.setFactoryUseSiteStreet(streetCode);
-            if ("使用单位".equals(company.getCompanyType())){
+            if (company != null && "使用单位".equals(company.getCompanyType())) {
                 useInfo.setUseUnitCreditCode(company.getCompanyCode());
                 useInfo.setUseUnitName(company.getCompanyName());
+            } else {
+                useInfo.setUseUnitCreditCode(MapUtil.getStr(equ,"useUnitCode"));
+                useInfo.setUseUnitName(MapUtil.getStr(equ, "useUnit"));
             }
             equ.put("province",useInfo.getProvince());
             equ.put("city",useInfo.getCity());
@@ -1978,25 +1982,6 @@ public class DataDockServiceImpl {
     }
 
     /**
-     * 检查本单位下工程装置名称和工程装置编号是不是一一对应的
-     * 不对应抛出异常
-     *
-     * @param paramsDto
-     */
-    private void checkTheUnitProConMatching(EquipRequestParamsDto paramsDto) {
-        Integer existsConflictNum = idxBizJgProjectContraptionService.lambdaQuery().eq(IdxBizJgProjectContraption::getUseUnitCreditCode, paramsDto.getCompanyCode()).eq(IdxBizJgProjectContraption::getUseUnitName, paramsDto.getCompanyName())
-                .eq(IdxBizJgProjectContraption::getIsIntoManagement, Boolean.TRUE)
-                .eq(IdxBizJgProjectContraption::getIsDelete, Boolean.FALSE)
-                .and(wrapper -> wrapper.ne(IdxBizJgProjectContraption::getProjectContraptionNo, paramsDto.getProjectContraptionNo()).eq(IdxBizJgProjectContraption::getProjectContraption, paramsDto.getProjectContraption())
-                        .or().eq(IdxBizJgProjectContraption::getProjectContraptionNo, paramsDto.getProjectContraptionNo()).ne(IdxBizJgProjectContraption::getProjectContraption, paramsDto.getProjectContraption())
-                )
-                .count();
-        if (existsConflictNum > 0) {
-            throw new BadRequest("工程装置名称或编号与本单位下的已存在的数据冲突！");
-        }
-    }
-
-    /**
      * 保存管道对应的idx表数据
      *
      * @param equLists