Commit f8983ad0 authored by 刘林's avatar 刘林

fix(jg):移装变更区内移装添加过滤

parent 1fe2cf59
...@@ -110,4 +110,7 @@ public class JgUseRegistrationManageDto extends BaseDto { ...@@ -110,4 +110,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty(value = "业务类型code,报废业务使用") @ApiModelProperty(value = "业务类型code,报废业务使用")
private String applyType; private String applyType;
@ApiModelProperty(value = "城市名称")
private String cityName;
} }
...@@ -127,6 +127,9 @@ ...@@ -127,6 +127,9 @@
<if test="dto.isScrap != null and dto.isScrap != ''"> <if test="dto.isScrap != null and dto.isScrap != ''">
and tjurm.is_scrap = #{dto.isScrap} and tjurm.is_scrap = #{dto.isScrap}
</if> </if>
<if test="dto.cityName != null and dto.cityName != ''">
and tjurm.equ_use_address LIKE CONCAT('%', #{dto.cityName}, '%')
</if>
ORDER BY ORDER BY
<if test="sort != null"> <if test="sort != null">
tjurm.${sort.field} ${sort.sortType}, tjurm.${sort.field} ${sort.sortType},
......
...@@ -148,7 +148,8 @@ public class JgChangeRegistrationReformController extends BaseController { ...@@ -148,7 +148,8 @@ public class JgChangeRegistrationReformController extends BaseController {
@RequestParam(value = "equList", required = false) String equList, @RequestParam(value = "equList", required = false) String equList,
@RequestParam(value = "receiveCompanyCode", required = false) String receiveCompanyCode, @RequestParam(value = "receiveCompanyCode", required = false) String receiveCompanyCode,
@RequestParam(value = "transferType", required = false) String transferType, @RequestParam(value = "transferType", required = false) String transferType,
@RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode) { @RequestParam(value = "useRegistrationCode", required = false) String useRegistrationCode,
@RequestParam(value = "transferCity", required = false) String transferCity) {
JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto(); JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>(); Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
page.setCurrent(current); page.setCurrent(current);
...@@ -184,6 +185,12 @@ public class JgChangeRegistrationReformController extends BaseController { ...@@ -184,6 +185,12 @@ public class JgChangeRegistrationReformController extends BaseController {
dto.setReceiveCompanyCode(codes[0]); dto.setReceiveCompanyCode(codes[0]);
} }
} }
if (!ObjectUtils.isEmpty(transferCity)) {
String[] cityList = transferCity.split("_");
if (cityList.length > 1 && "0".equals(transferType)) {
dto.setCityName(cityList[1]);
}
}
dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记"); dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");
return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto)); return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment