选择使用登记证页面根据使用登记证编号搜索无效bug修改

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

@@ -90,11 +90,11 @@
             </if>
             -- 使用登记证编号
             <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
-                and tjurm.use_registration_code like #{dto.useRegistrationCode}
+                and tjurm.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
             </if>
             -- 申请单号
             <if test="dto.applyNo != null and dto.applyNo != ''">
-                and tjurm.apply_no like #{dto.applyNo}
+                and tjurm.apply_no like concat('%',#{dto.applyNo},'%')
             </if>
             -- 登记证书唯一码
             <if test="dto.certificateNo != null and dto.certificateNo != ''">

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -11,7 +10,6 @@ import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -23,7 +21,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -150,7 +147,8 @@ public class JgChangeRegistrationReformController extends BaseController {
 																		 @RequestParam(value = "EQU_CATEGORY_CODE", required = false) String EQU_CATEGORY_CODE,
 																		 @RequestParam(value = "equList", required = false) String equList,
 																		 @RequestParam(value = "receiveCompanyCode") String receiveCompanyCode,
-																		 @RequestParam(value = "transferType", required = false) String transferType) {
+																		 @RequestParam(value = "transferType", required = false) String transferType,
+																		 @RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) {
 		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
 		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
 		page.setCurrent(current);
@@ -172,6 +170,10 @@ public class JgChangeRegistrationReformController extends BaseController {
 		if (!ObjectUtils.isEmpty(equList)){
 			dto.setEquListCode(equList);
 		}
+		// 流程页面使用登记证号筛选，适配组件，适配原有表单
+		if (!ObjectUtils.isEmpty(useRegistrationCode)){
+			dto.setUseRegistrationCode(useRegistrationCode);
+		}
 		// 流程页面使用equList，适配组件，适配原有表单
 		if (!ObjectUtils.isEmpty(EQU_CATEGORY_CODE)){
 			dto.setEquCategoryCode(EQU_CATEGORY_CODE);

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.JgChangeVehicleRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
-import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeVehicleRegistrationUnitServiceImpl;
+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;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -128,8 +125,8 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 			@RequestParam(value = "size") int size,
 			@RequestParam(value = "useUnitCreditCode") String useUnitCreditCode,
 			@RequestParam(value = "whetherVehicleCylinder") String whetherVehicleCylinder,
-			@RequestParam(value = "certificateStatus") String certificateStatus
-	) {
+			@RequestParam(value = "certificateStatus") String certificateStatus,
+			@RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) {
 		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
 		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
 		page.setCurrent(current);
@@ -144,6 +141,9 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 		if (!ValidationUtil.isEmpty(certificateStatus)){
 			dto.setCertificateStatus(certificateStatus);
 		}
+		if (!ObjectUtils.isEmpty(useRegistrationCode)){
+			dto.setUseRegistrationCode(useRegistrationCode);
+		}
 		if (!ValidationUtil.isEmpty(whetherVehicleCylinder)){
 			dto.setWhetherVehicleCylinder(whetherVehicleCylinder);
 		}