Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_main

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -3474,7 +3474,7 @@
     </select>
 
     <insert id="addTcmUnitInfo">
-        insert into tzs_tcm_unit_info (sequence_nbr, unit_name, unit_code, unit_type, create_date) values (#{sequenceNbr} ,#{unitName}, #{unitCode}, #{unitType}, #{createDate});
+        insert into tzs_tcm_unit_info (sequence_nbr, unit_name, unit_code, unit_type, create_date, rec_user_id) values (#{sequenceNbr} ,#{unitName}, #{unitCode}, #{unitType}, #{createDate}, #{recUserId});
     </insert>
 
     <select id="queryTcmUnitInfoBySeq" resultType="java.util.Map">
@@ -3486,7 +3486,7 @@
         from
             tzs_tcm_unit_info a
         where
-            (a.original_id = #{unitSeq} or a.sequence_nbr = #{unitSeq})
+            (a.original_id = #{unitSeq} or a.sequence_nbr = #{unitSeq} or a.unit_name = #{unitSeq})
           and a.is_delete = 0
         <if test="unitType != null and unitType != ''">
             and unit_type in
@@ -3501,8 +3501,12 @@
     <select id="queryTcmUnitSeqByCreditCode" resultType="java.lang.String">
         select sequence_nbr seq from tzs_tcm_unit_info where unit_code = #{unitCreditCode}
         <if test="unitType != null and unitType != ''">
-            and unit_type = #{unitType}
+            and unit_type in
+            <foreach item="item" index="index" collection="unitType.split(',')" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
+        limit 1
     </select>
 
     <select id="queryInMaintenanceRecord" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -962,24 +962,6 @@ public class CommonController extends BaseController {
                     serviceClass = CommonServiceImpl.class,
                     queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
                     secondParamValue = "CQ"
-            ),
-            @FieldMapping.FieldMap(sourceField = "formData.estateUnitSeq",
-                    targetField = "formData.estateUnitName",
-                    serviceClass = CommonServiceImpl.class,
-                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
-                    secondParamValue = "CQ"
-            ),
-            @FieldMapping.FieldMap(sourceField = "formData.installUnitCode",
-                    targetField = "formData.installUnitCode",
-                    serviceClass = CommonServiceImpl.class,
-                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
-                    secondParamValue = "AGW"
-            ),
-            @FieldMapping.FieldMap(sourceField = "formData.inspectUnitCreditCode",
-                    targetField = "formData.inspectUnitCreditCode",
-                    serviceClass = CommonServiceImpl.class,
-                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
-                    secondParamValue = "JY,JC"
             )
     })
     public ResponseModel<Map<String, Object>> getRegistrationOrCertReplenishFormUrl(@RequestBody JSONObject jsonObject) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/VehicleRegistrationStrategyHandler.java

@@ -31,7 +31,7 @@ public class VehicleRegistrationStrategyHandler implements ToBeSubmitDetailStrat
                     targetField = "notice.inspectUnitCreditCode",
                     serviceClass = CommonServiceImpl.class,
                     queryMethod = "queryTcmUnitSeqByCreditCode",
-                    secondParamValue = "JY"),
+                    secondParamValue = "JY,JC"),
             @ResultFieldMapping.ResultFieldMap(sourceField = "notice.installUnitCode",
                     targetField = "notice.installUnitCode",
                     serviceClass = CommonServiceImpl.class,

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/CommonServiceImpl.java

@@ -2482,12 +2482,29 @@ public class CommonServiceImpl implements ICommonService {
             formData.put("safetyManagerName", formData.getString("safetyManager").split("_")[1]);
         }
         //施工单位及检测监管部门赋值 车用气瓶模版
-        if (formData.containsKey("installUnitCode") && formData.getString("installUnitCode").contains("_")) {
-            formData.put("installUnitName", formData.getString("installUnitCode").split("_")[1]);
+        if (formData.containsKey("installUnitName")) {
+            formData.put("installUnitName", formData.getString("installUnitName"));
+        } else {
+            if (formData.containsKey("installUnitCode")) {
+                if (formData.getString("installUnitCode").contains("_")) {
+                    formData.put("installUnitName", formData.getString("installUnitCode").split("_")[1]);
+                } else {
+                    formData.put("installUnitName", formData.getString("installUnitCode"));
+                }
+            }
         }
-        if (formData.containsKey("inspectUnitCreditCode") && formData.getString("inspectUnitCreditCode").contains("_")) {
-            formData.put("inspectUnitName", formData.getString("inspectUnitCreditCode").split("_")[1]);
+        if (formData.containsKey("inspectUnitName")) {
+            formData.put("inspectUnitName", formData.getString("inspectUnitName"));
+        } else {
+            if (formData.containsKey("inspectUnitCreditCode")) {
+                if (formData.getString("inspectUnitCreditCode").contains("_")) {
+                    formData.put("inspectUnitName", formData.getString("inspectUnitCreditCode").split("_")[1]);
+                } else {
+                    formData.put("inspectUnitName", formData.getString("inspectUnitCreditCode"));
+                }
+            }
         }
+
         //管理员赋值 车用气瓶模版
         if (formData.containsKey("safetyManagerId") && formData.getString("safetyManagerId").contains("_")) {
             formData.put("safetyManagerName", formData.getString("safetyManagerId").split("_")[1]);
@@ -2711,6 +2728,24 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    @FieldMapping({
+            @FieldMapping.FieldMap(
+                    sourceField = "installUnitCode",
+                    paramIndex = 1,
+                    targetField = "installUnitCode",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
+                    secondParamValue = "AGW"
+            ),
+            @FieldMapping.FieldMap(
+                    sourceField = "inspectUnitCreditCode",
+                    paramIndex = 1,
+                    targetField = "inspectUnitCreditCode",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryTcmUnitCreditCodeAndNameBySeq",
+                    secondParamValue = "JY,JC"
+            )
+    })
     public Map<String, Object> getRegistrationFormUrl(String manageType, JSONObject jsonObject) {
         JSONObject formData = buildFile(manageType, jsonObject);
         String wordPath;
@@ -3244,7 +3279,8 @@ public class CommonServiceImpl implements ICommonService {
      */
     public String queryTcmUnitCreditCodeAndNameBySeq(String unitSeq, String unitType) {
         Map<String, String> map = commonMapper.queryTcmUnitInfoBySeq(unitSeq, unitType);
-        return MapUtil.getStr(map, "unitCodeAndName");
+        String result = MapUtil.getStr(map, "unitCodeAndName");
+        return ValidationUtil.isEmpty(result) ? unitSeq : result;
     }
 
     /**
@@ -3398,17 +3434,18 @@ public class CommonServiceImpl implements ICommonService {
         return result;
     }
 
-    public Map<String, String> queryTcmUnitInfoBySeq(String estateUnitSeq, String unitType) {
-        Map<String, String> propertyUnitInfo = commonMapper.queryTcmUnitInfoBySeq(estateUnitSeq, unitType);
-        if (ValidationUtil.isEmpty(propertyUnitInfo) && !ValidationUtil.isEmpty(estateUnitSeq)) {
+    public Map<String, String> queryTcmUnitInfoBySeq(String unitSeqOrName, String unitType) {
+        Map<String, String> propertyUnitInfo = commonMapper.queryTcmUnitInfoBySeq(unitSeqOrName, unitType);
+        if (ValidationUtil.isEmpty(propertyUnitInfo) && !ValidationUtil.isEmpty(unitSeqOrName)) {
             // 未查询到产权信息则保存上送的产权信息
             propertyUnitInfo = Maps.newHashMap();
             Long seqNbr = IdWorker.getId();
             propertyUnitInfo.put("sequenceNbr", String.valueOf(seqNbr));
-            propertyUnitInfo.put("unitName", estateUnitSeq);
+            propertyUnitInfo.put("unitName", unitSeqOrName);
             propertyUnitInfo.put("unitCode", "TCM" + seqNbr);
             propertyUnitInfo.put("unitType", unitType);
             propertyUnitInfo.put("createDate", String.valueOf(new Date()));
+            propertyUnitInfo.put("recUserId", RequestContext.getExeUserId());
 
             commonMapper.addTcmUnitInfo(propertyUnitInfo);
         }

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -116,6 +116,7 @@ import java.util.stream.Stream;
 
 import static com.alibaba.fastjson.JSON.toJSONString;
 import static com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum.SPECIAL_CYLINDER;
+import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.DataHandlerServiceImpl.IDX_BIZ_EQUIPMENT_INFO;
@@ -1960,7 +1961,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         // 使用登记
 //        Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
-        JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery().select(JgUseRegistrationManage::getReceiveOrgName, JgUseRegistrationManage::getReceiveCompanyCode).eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode).one();
+        JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
+                .select(JgUseRegistrationManage::getReceiveOrgName, JgUseRegistrationManage::getReceiveCompanyCode)
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
+                .eq(JgUseRegistrationManage::getIsDelete, false)
+                .eq(JgUseRegistrationManage::getCertificateStatus, YIDENGJI.getName())
+                .one();
         if (!ObjectUtils.isEmpty(jgUseRegistrationManage)) {
             business = business + ",使用登记";
 //            objMap.putAll(useRegistrationDetail);

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/JgChangeRegistrationNameServiceImpl.java

@@ -288,7 +288,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass()));
             }
             dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            dto.setUseUnitName(reginParams.getCompany().getCompanyName());
             dto.setCreateUserId(RequestContext.getExeUserId());
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             this.save(dto);

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/JgVehicleInformationServiceImpl.java

@@ -631,7 +631,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
     @ResultFieldMapping(
             {
-                    @ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitName",
+                    @ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitCreditCode",
                             targetField = "estateUnitSeq",
                             serviceClass = CommonServiceImpl.class,
                             queryMethod = "queryTcmUnitSeqByCreditCode",
@@ -641,7 +641,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                             targetField = "inspectUnitCreditCode",
                             serviceClass = CommonServiceImpl.class,
                             queryMethod = "queryTcmUnitSeqByCreditCode",
-                            secondParamValue = "JY"),
+                            secondParamValue = "JY,JC"),
                     @ResultFieldMapping.ResultFieldMap(sourceField = "installUnitCode",
                             targetField = "installUnitCode",
                             serviceClass = CommonServiceImpl.class,