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
ae2abc24
Commit
ae2abc24
authored
Sep 22, 2022
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消防系统,表单中增加设计单位联系方式
parent
a3b0a09d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
1 deletion
+23
-1
FireFightingSystemEntity.java
...n/equipmanage/common/entity/FireFightingSystemEntity.java
+3
-0
FireFightingSystemVo.java
...m/yeejoin/equipmanage/common/vo/FireFightingSystemVo.java
+2
-0
wl-3.0.1.xml
...ot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
+13
-0
EquipmentManageMapper.xml
...equip/src/main/resources/mapper/EquipmentManageMapper.xml
+1
-0
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+4
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/FireFightingSystemEntity.java
View file @
ae2abc24
...
...
@@ -136,6 +136,9 @@ public class FireFightingSystemEntity {
@ApiModelProperty
(
value
=
"责任单位"
)
private
String
designOrg
;
@ApiModelProperty
(
value
=
"设计单位联系方式"
)
private
String
designOrgTelephone
;
@ApiModelProperty
(
value
=
"主要设计人员"
)
private
String
leadDesigner
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemVo.java
View file @
ae2abc24
...
...
@@ -186,4 +186,6 @@ public class FireFightingSystemVo implements Serializable {
*/
private
String
leadDesigner
;
private
String
designOrgTelephone
;
}
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @
ae2abc24
...
...
@@ -2986,4 +2986,16 @@
ADD COLUMN `lead_designer` varchar(255) DEFAULT NULL COMMENT '主要设计人员';
</sql>
</changeSet>
<changeSet
author=
"tianyiming"
id=
"20220922tianyiming"
>
<preConditions
onFail=
"MARK_RAN"
>
<not>
<columnExists
tableName=
"f_fire_fighting_system"
columnName=
"design_org_telephone"
/>
</not>
</preConditions>
<comment>
f_fire_fighting_system add design_org_telephone
</comment>
<sql>
ALTER TABLE `f_fire_fighting_system`
ADD COLUMN `design_org_telephone` varchar(32) NULL COMMENT '设计单位联系方式';
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml
View file @
ae2abc24
...
...
@@ -23,6 +23,7 @@
scene_id as sceneId,
design_org,
lead_designer,
design_org_telephone,
(select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount
from
f_fire_fighting_system as sys
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
ae2abc24
...
...
@@ -101,6 +101,7 @@
biz_org_code,
biz_org_name,
design_org,
design_org_telephone,
lead_designer
)
VALUES(
...
...
@@ -131,6 +132,7 @@
#{bizOrgCode},
#{bizOrgName},
#{designOrg},
#{designOrgTelephone},
#{leadDesigner}
)
</insert>
...
...
@@ -180,7 +182,8 @@
biz_org_code=#{bizOrgCode},
biz_org_name=#{bizOrgName},
design_org = #{designOrg},
lead_designer = #{leadDesigner}
lead_designer = #{leadDesigner},
design_org_telephone = #{designOrgTelephone}
where id = #{id}
</update>
<delete
id=
"deleteFilre"
>
...
...
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