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
9d180217
Commit
9d180217
authored
Jan 16, 2024
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移装告知和安装告知代办问题 与列表按钮等问题修改
parent
e516d8d5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
JgInstallationNoticeMapper.xml
.../src/main/resources/mapper/JgInstallationNoticeMapper.xml
+2
-1
JgTransferNoticeMapper.xml
...-api/src/main/resources/mapper/JgTransferNoticeMapper.xml
+2
-1
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+2
-1
JgTransferNoticeServiceImpl.java
...dule/jg/biz/service/impl/JgTransferNoticeServiceImpl.java
+1
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @
9d180217
...
...
@@ -25,7 +25,8 @@
isn.equ_address AS equAddress,
isn.handle_date AS handleDate,
isn.equ_list AS equList,
isn.notice_report_url AS noticeReportUrl
isn.notice_report_url AS noticeReportUrl,
isn.create_user_id as createUserId
FROM
tzs_jg_installation_notice isn
<where>
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml
View file @
9d180217
...
...
@@ -24,7 +24,8 @@
tjtn.instance_status AS instanceStatus,
tjtn.notice_report_url AS noticeReportUrl,
ec."name" AS equipCateName,
tjtn.handle_date AS handleDate
tjtn.handle_date AS handleDate,
tjtn.create_user_id as createUserId
FROM
tzs_jg_transfer_notice tjtn
LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
...
...
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/JgInstallationNoticeServiceImpl.java
View file @
9d180217
...
...
@@ -899,9 +899,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
}
else
{
commMap
.
put
(
"approvalStatus"
,
op
);
}
commMap
.
put
(
"approvalStatus"
,
op
);
workDto
.
setVariable
(
commMap
);
workDto
.
setComment
(
jgTransferNotice
.
getProcessAdvice
());
workDto
.
setNextExecuteUserCompanyCode
(
jgTransferNotice
.
getReceiveOrgCreditCode
());
workDto
.
setNextExecuteUserCompanyCode
(
"1"
.
equals
(
op
)
?
jgTransferNotice
.
getInstallUnitCreditCode
()
:
jgTransferNotice
.
getReceiveOrgCreditCode
());
processTaskDTO
=
iCmWorkflowService
.
complete
(
jgTransferNotice
.
getNextTaskId
(),
workDto
);
// 提取节点等信息
workflowResultDto
=
commonService
.
buildWorkFlowInfo
(
Collections
.
singletonList
(
processTaskDTO
)).
get
(
0
);
...
...
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/JgTransferNoticeServiceImpl.java
View file @
9d180217
...
...
@@ -730,6 +730,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
commMap
.
put
(
"approvalStatus"
,
op
);
}
workDto
.
setNextExecuteUserCompanyCode
(
jgTransferNotice
.
getReceiveOrgCode
());
workDto
.
setNextExecuteUserCompanyCode
(
"1"
.
equals
(
op
)
?
jgTransferNotice
.
getInstallUnitCreditCode
()
:
jgTransferNotice
.
getReceiveOrgCode
());
workDto
.
setVariable
(
commMap
);
workDto
.
setComment
(
opinion
);
processTaskDTO
=
iCmWorkflowService
.
complete
(
jgTransferNotice
.
getNextTaskId
(),
workDto
);
...
...
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