Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
f8983ad0
Commit
f8983ad0
authored
Jul 31, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):移装变更区内移装添加过滤
parent
1fe2cf59
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
JgUseRegistrationManageDto.java
...os/boot/module/jg/api/dto/JgUseRegistrationManageDto.java
+3
-0
JgUseRegistrationManageMapper.xml
...c/main/resources/mapper/JgUseRegistrationManageMapper.xml
+3
-0
JgChangeRegistrationReformController.java
.../biz/controller/JgChangeRegistrationReformController.java
+8
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java
View file @
f8983ad0
...
...
@@ -110,4 +110,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty
(
value
=
"业务类型code,报废业务使用"
)
private
String
applyType
;
@ApiModelProperty
(
value
=
"城市名称"
)
private
String
cityName
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @
f8983ad0
...
...
@@ -127,6 +127,9 @@
<if
test=
"dto.isScrap != null and dto.isScrap != ''"
>
and tjurm.is_scrap = #{dto.isScrap}
</if>
<if
test=
"dto.cityName != null and dto.cityName != ''"
>
and tjurm.equ_use_address LIKE CONCAT('%', #{dto.cityName}, '%')
</if>
ORDER BY
<if
test=
"sort != null"
>
tjurm.${sort.field} ${sort.sortType},
...
...
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
View file @
f8983ad0
...
...
@@ -148,7 +148,8 @@ public class JgChangeRegistrationReformController extends BaseController {
@RequestParam
(
value
=
"equList"
,
required
=
false
)
String
equList
,
@RequestParam
(
value
=
"receiveCompanyCode"
,
required
=
false
)
String
receiveCompanyCode
,
@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
();
Page
<
JgUseRegistrationManageDto
>
page
=
new
Page
<
JgUseRegistrationManageDto
>();
page
.
setCurrent
(
current
);
...
...
@@ -184,6 +185,12 @@ public class JgChangeRegistrationReformController extends BaseController {
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
)
?
"已注销"
:
"已登记"
);
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
getUseRegistrationCodeData
(
page
,
dto
));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment