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
81d88c86
Commit
81d88c86
authored
Feb 08, 2025
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):车用气瓶属地监管单位筛选
parent
62fc3d09
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
JgVehicleInformationMapper.xml
.../src/main/resources/mapper/JgVehicleInformationMapper.xml
+0
-3
JgVehicleInformationController.java
...ule/jg/biz/controller/JgVehicleInformationController.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
View file @
81d88c86
...
...
@@ -27,9 +27,6 @@
<if
test=
"dto.auditPassDate != null and dto.auditPassDate != ''"
>
and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
</if>
<if
test=
"dto.orgBranchCode != null and dto.orgBranchCode != ''"
>
and tjvi.org_branch_code like concat(#{dto.orgBranchCode},'%')
</if>
<if
test=
"roleIds != null and dto.dataType == 'supervision'"
>
<foreach
collection=
'roleIds'
item=
'role'
open=
'and ('
close=
')'
separator=
'or'
>
instance_status like concat('%',#{role},'%')
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java
View file @
81d88c86
...
...
@@ -144,7 +144,7 @@ public class JgVehicleInformationController extends BaseController {
dto
.
setDataType
(
BaseController
.
COMPANY_TYPE_COMPANY
);
}
else
{
dto
.
setDataType
(
BaseController
.
COMPANY_TYPE_SUPERVISION
);
dto
.
setOrgBranchCode
(
info
.
getCompany
().
getOrgCode
());
dto
.
setOrgBranchCode
(
dto
.
getOrgBranchCode
()
!=
null
?
dto
.
getOrgBranchCode
()
:
info
.
getCompany
().
getOrgCode
());
}
Page
<
Map
<
String
,
Object
>>
list
=
jgVehicleInformationServiceImpl
.
getPageList
(
dto
,
sort
,
page
,
dto
.
getRoleIds
(),
client
);
list
.
getRecords
().
forEach
(
x
->
{
...
...
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