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
fc8399aa
Commit
fc8399aa
authored
May 10, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):使用登记导出和查询列表写法修改
parent
fa0f84fe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
JgMaintenanceContractMapper.xml
...src/main/resources/mapper/JgMaintenanceContractMapper.xml
+2
-2
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+1
-3
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @
fc8399aa
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<if
test=
"contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null"
>
<if
test=
"contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null"
>
and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
and (tjmc.
status
<![CDATA[<>]]>
'使用单位待提交' and tjmc.status
<![CDATA[<>]]>
'待提交
')
and (tjmc.
instance_id
<![CDATA[<>]]>
'
')
</if>
</if>
<!-- </otherwise>-->
<!-- </otherwise>-->
<!-- </choose>-->
<!-- </choose>-->
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
<if
test=
"contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null"
>
<if
test=
"contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null"
>
and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter}
and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter}
or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
and (tjmc.
status
<![CDATA[<>]]>
'使用单位待提交' and tjmc.status
<![CDATA[<>]]>
'待提交
')
and (tjmc.
instance_id
<![CDATA[<>]]>
'
')
</if>
</if>
-- 数据过滤结束 ----------------------------------------------------
-- 数据过滤结束 ----------------------------------------------------
</where>
</where>
...
...
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/JgUseRegistrationServiceImpl.java
View file @
fc8399aa
...
@@ -1419,9 +1419,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -1419,9 +1419,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if
(
ValidationUtil
.
isEmpty
(
useRegistration
.
getUseUnitName
()))
{
if
(
ValidationUtil
.
isEmpty
(
useRegistration
.
getUseUnitName
()))
{
throw
new
BadRequest
(
"使用登记证导出失败,使用单位名称为空!"
);
throw
new
BadRequest
(
"使用登记证导出失败,使用单位名称为空!"
);
}
}
exportParamsMap
.
put
(
"useUnitName"
,
useRegistration
.
getUseUnitName
().
contains
(
"_"
)
?
exportParamsMap
.
put
(
"useUnitName"
,
useRegistration
.
getUseUnitName
());
useRegistration
.
getUseUnitName
().
split
(
"_"
)[
1
]
:
useRegistration
.
getUseUnitName
());
// 监管码
// 监管码
if
(
ValidationUtil
.
isEmpty
(
useRegistration
.
getSupervisoryCode
()))
{
if
(
ValidationUtil
.
isEmpty
(
useRegistration
.
getSupervisoryCode
()))
{
...
...
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