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
b17913ca
Commit
b17913ca
authored
Jun 11, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(大编辑):bug修复
1.流程中编辑管道增减管道,履历上无编辑日志 2.汇总表投用日期无值,应该是增加管道时未写入
parent
1bf97fbd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
ProjectContraptionChangeDataDto.java
...ot/module/jg/api/dto/ProjectContraptionChangeDataDto.java
+4
-2
JgResumeInfoMapper.xml
...e-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml
+3
-3
PieLineDataChangeServiceImpl.java
.../biz/edit/process/equip/PieLineDataChangeServiceImpl.java
+2
-0
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/ProjectContraptionChangeDataDto.java
View file @
b17913ca
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
dto
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine
;
import
com.yeejoin.amos.boot.biz.common.annotation.Group
;
import
io.swagger.annotations.ApiModel
;
...
...
@@ -67,7 +66,7 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
private
String
productQualificationCertificate
;
@FieldDisplayDefine
(
value
=
"使用地点代码_省"
,
typeHandler
=
"regionCodeTypeHandler"
)
@FieldDisplayDefine
(
value
=
"使用地点代码_省"
,
typeHandler
=
"regionCodeTypeHandler"
)
private
String
province
;
@FieldDisplayDefine
(
value
=
"使用地点代码_市"
,
typeHandler
=
"regionCodeTypeHandler"
)
...
...
@@ -123,4 +122,7 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
@FieldDisplayDefine
(
value
=
"施工单位名称"
,
isExist
=
false
)
private
String
uscUnitName
;
@FieldDisplayDefine
(
value
=
"投用日期"
,
isExist
=
false
)
private
String
useDate
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml
View file @
b17913ca
...
...
@@ -12,9 +12,9 @@
<select
id=
"queryPageListByChangeIds"
resultType=
"com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto"
>
SELECT *
FROM tzs_jg_resume_info
WHERE
equ_id IN
<foreach
collection=
"equIds"
item=
"id"
open=
"("
separator=
"
,
"
close=
")"
>
#{id}
WHERE
<foreach
collection=
"equIds"
item=
"id"
open=
"("
separator=
"
or
"
close=
")"
>
equ_id like concat('%',#{id}, '%')
</foreach>
order by rec_date desc
</select>
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java
View file @
b17913ca
...
...
@@ -166,6 +166,8 @@ public class PieLineDataChangeServiceImpl {
useInfo
.
setRecord
(
record
);
useInfo
.
setSequenceNbr
(
null
);
useInfo
.
setRecDate
(
new
Date
());
// 汇总表打印会使用
useInfo
.
setUseDate
(
projectContraptionChangeDataDto
.
getUseDate
());
useInfo
.
setDataSource
(
projectContraptionChangeDataDto
.
getDataSource
());
useInfo
.
setIsIntoManagement
(
Boolean
.
FALSE
);
SingleProjectEquipChangeProcess
.
setNewUseAddressInfo
(
projectContraptionChangeDataDto
,
useInfo
);
...
...
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