修改bug

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

@@ -46,10 +46,10 @@
             and ur.audit_status = #{dto.auditStatus}
         </if>
         <if test="dto.useUnitName != null and dto.useUnitName != ''">
-            and ur.use_unit_name = #{dto.useUnitName}
+            and ur.use_unit_name like concat('%',#{dto.useUnitName}, '%')
         </if>
         <if test="dto.newUseUnitName != null and dto.newUseUnitName != ''">
-            and ur.new_use_unit_name = #{dto.newUseUnitName}
+            and ur.new_use_unit_name like concat('%',#{dto.newUseUnitName}, '%')
         </if>
         <if test="dto.applyNo != null and dto.applyNo != ''">
             and ur.apply_no like concat('%',#{dto.applyNo},'%')

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
@@ -12,6 +13,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationName
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -139,7 +141,13 @@ public class JgChangeRegistrationNameController extends BaseController {
     public ResponseModel<Map<String, Object>> getTableData(JgUseRegistrationManageDto dto) {
         if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
             // 不传的话取当前登录单位的统一信用代码
-            dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+            CompanyBo company = getSelectedOrgInfo().getCompany();
+            if (!ObjectUtils.isEmpty(company) && "个人主体".equals(company.getCompanyType())){
+                String[] codes = company.getCompanyCode().split("_");
+                dto.setUseUnitCreditCode(codes[1]);
+            }else {
+                dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+            }
         }
         if (!ValidationUtil.isEmpty(dto.getReceiveCompanyCode())){
             String[] codes = dto.getReceiveCompanyCode().split("_");

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

@@ -849,12 +849,14 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         }
         // 修改证管理信息
         List<String> collect = list.stream().map(JgChangeRegistrationNameEq::getCertificateSeq).collect(Collectors.toList());
-        LambdaQueryWrapper<JgUseRegistrationManage> lambda = new QueryWrapper<JgUseRegistrationManage>().lambda();
-        lambda.in(JgUseRegistrationManage::getSequenceNbr, collect);
-        JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
-        jgUseRegistrationManage.setUseUnitName(jgChangeRegistrationName.getNewUseUnitName());
-        jgUseRegistrationManage.setAuditPassDate(new Date());
-        jgUseRegistrationManageService.update(jgUseRegistrationManage, lambda);
+        if (!ObjectUtils.isEmpty(collect)){
+            LambdaQueryWrapper<JgUseRegistrationManage> lambda = new QueryWrapper<JgUseRegistrationManage>().lambda();
+            lambda.in(JgUseRegistrationManage::getSequenceNbr, collect);
+            JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
+            jgUseRegistrationManage.setUseUnitName(jgChangeRegistrationName.getNewUseUnitName());
+            jgUseRegistrationManage.setAuditPassDate(new Date());
+            jgUseRegistrationManageService.update(jgUseRegistrationManage, lambda);
+        }
 
         // 业务流水生成
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr()).one();

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

@@ -659,7 +659,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
                 IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
                 if (!ValidationUtil.isEmpty(elevator)) {
-                    elevator.setSequenceNbr(String.valueOf(techInfo.get("ELEVATOR_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("ELEVATOR_SEQ"))){
+                        elevator.setSequenceNbr(String.valueOf(techInfo.get("ELEVATOR_SEQ")));
+                    }
                     iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
                 }
             }
@@ -667,7 +669,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
                 IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class);
                 if (!ValidationUtil.isEmpty(vehicle)) {
-                    vehicle.setSequenceNbr(String.valueOf(techInfo.get("VEHICLE_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("VEHICLE_SEQ"))){
+                        vehicle.setSequenceNbr(String.valueOf(techInfo.get("VEHICLE_SEQ")));
+                    }
                     iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
                 }
 
@@ -682,6 +686,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
                 IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class);
                 if (!ValidationUtil.isEmpty(ropeway)) {
+                    if (!ObjectUtils.isEmpty(techInfo.get("ROPEWAY_SEQ"))){
+                        ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
+                    }
                     ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
                     iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway);
                 }
@@ -696,7 +703,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLSS.getCode().equals(equList)) {
                 IdxBizJgTechParamsRides rides = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRides.class);
                 if (!ValidationUtil.isEmpty(rides)) {
-                    rides.setSequenceNbr(String.valueOf(techInfo.get("RIDES_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("RIDES_SEQ"))){
+                        rides.setSequenceNbr(String.valueOf(techInfo.get("RIDES_SEQ")));
+                    }
                     iIdxBizJgTechParamsRidesService.saveOrUpdateData(rides);
                 }
             }
@@ -704,7 +713,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
                 IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class);
                 if (!ValidationUtil.isEmpty(boiler)) {
-                    boiler.setSequenceNbr(String.valueOf(techInfo.get("BOILER_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("BOILER_SEQ"))){
+                        boiler.setSequenceNbr(String.valueOf(techInfo.get("BOILER_SEQ")));
+                    }
                     iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
                 }
 
@@ -717,7 +728,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
                 IdxBizJgTechParamsVessel vessel = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVessel.class);
                 if (!ValidationUtil.isEmpty(vessel)) {
-                    vessel.setSequenceNbr(String.valueOf(techInfo.get("VESSEL_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("VESSEL_SEQ"))){
+                        vessel.setSequenceNbr(String.valueOf(techInfo.get("VESSEL_SEQ")));
+                    }
                     iIdxBizJgTechParamsVesselService.saveOrUpdateData(vessel);
                 }
 
@@ -736,7 +749,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
                 IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class);
                 if (!ValidationUtil.isEmpty(pipeline)) {
-                    pipeline.setSequenceNbr(String.valueOf(techInfo.get("PIPELINE_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("PIPELINE_SEQ"))){
+                        pipeline.setSequenceNbr(String.valueOf(techInfo.get("PIPELINE_SEQ")));
+                    }
                     iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
                 }
 
@@ -750,7 +765,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
                 IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class);
                 if (!ValidationUtil.isEmpty(lifting)) {
-                    lifting.setSequenceNbr(String.valueOf(techInfo.get("LIFTING_SEQ")));
+                    if (!ObjectUtils.isEmpty(techInfo.get("LIFTING_SEQ"))){
+                        lifting.setSequenceNbr(String.valueOf(techInfo.get("LIFTING_SEQ")));
+                    }
                     iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
                 }