Commit ae2abc24 authored by tianyiming's avatar tianyiming

消防系统,表单中增加设计单位联系方式

parent a3b0a09d
...@@ -136,6 +136,9 @@ public class FireFightingSystemEntity { ...@@ -136,6 +136,9 @@ public class FireFightingSystemEntity {
@ApiModelProperty(value = "责任单位") @ApiModelProperty(value = "责任单位")
private String designOrg; private String designOrg;
@ApiModelProperty(value = "设计单位联系方式")
private String designOrgTelephone;
@ApiModelProperty(value = "主要设计人员") @ApiModelProperty(value = "主要设计人员")
private String leadDesigner; private String leadDesigner;
} }
...@@ -186,4 +186,6 @@ public class FireFightingSystemVo implements Serializable { ...@@ -186,4 +186,6 @@ public class FireFightingSystemVo implements Serializable {
*/ */
private String leadDesigner; private String leadDesigner;
private String designOrgTelephone;
} }
...@@ -2986,4 +2986,16 @@ ...@@ -2986,4 +2986,16 @@
ADD COLUMN `lead_designer` varchar(255) DEFAULT NULL COMMENT '主要设计人员'; ADD COLUMN `lead_designer` varchar(255) DEFAULT NULL COMMENT '主要设计人员';
</sql> </sql>
</changeSet> </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> </databaseChangeLog>
\ No newline at end of file
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
scene_id as sceneId, scene_id as sceneId,
design_org, design_org,
lead_designer, 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 (select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount
from from
f_fire_fighting_system as sys f_fire_fighting_system as sys
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
biz_org_code, biz_org_code,
biz_org_name, biz_org_name,
design_org, design_org,
design_org_telephone,
lead_designer lead_designer
) )
VALUES( VALUES(
...@@ -131,6 +132,7 @@ ...@@ -131,6 +132,7 @@
#{bizOrgCode}, #{bizOrgCode},
#{bizOrgName}, #{bizOrgName},
#{designOrg}, #{designOrg},
#{designOrgTelephone},
#{leadDesigner} #{leadDesigner}
) )
</insert> </insert>
...@@ -180,7 +182,8 @@ ...@@ -180,7 +182,8 @@
biz_org_code=#{bizOrgCode}, biz_org_code=#{bizOrgCode},
biz_org_name=#{bizOrgName}, biz_org_name=#{bizOrgName},
design_org = #{designOrg}, design_org = #{designOrg},
lead_designer = #{leadDesigner} lead_designer = #{leadDesigner},
design_org_telephone = #{designOrgTelephone}
where id = #{id} where id = #{id}
</update> </update>
<delete id="deleteFilre"> <delete id="deleteFilre">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment