消防系统基本属性增加设计单位和主要设计人员

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/FireFightingSystemEntity.java

@@ -133,4 +133,9 @@ public class FireFightingSystemEntity {
     @ApiModelProperty(value = "分析报告统计用参数（为空不统计） ")
     private String analysisIndexKey;
 
+    @ApiModelProperty(value = "责任单位")
+    private String designOrg;
+
+    @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

@@ -176,4 +176,14 @@ public class FireFightingSystemVo implements Serializable {
      */
     private String bizOrgName;
 
+    /**
+     * 责任单位
+     */
+    private String designOrg;
+
+    /**
+     * 主要设计人员
+     */
+    private String leadDesigner;
+
 }

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2973,4 +2973,17 @@
             END
         </sql>
     </changeSet>
+
+    <changeSet author="zs" id="202209131015-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_fire_fighting_system" columnName="design_org"/>
+            </not>
+        </preConditions>
+        <comment>任务9322 系统基础属性加字段</comment>
+        <sql>
+            ALTER TABLE `f_fire_fighting_system` ADD COLUMN `design_org` varchar(255) DEFAULT NULL COMMENT '设计单位',
+            ADD COLUMN `lead_designer` varchar(255) DEFAULT NULL COMMENT '主要设计人员';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -21,6 +21,8 @@
             biz_org_code as bizOrgCode,
             biz_org_name as bizOrgName,
             scene_id as sceneId,
+            design_org,
+            lead_designer,
             (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

@@ -99,7 +99,9 @@
                 factory,
                 contro_box_address,
                 biz_org_code,
-                biz_org_name
+                biz_org_name,
+                design_org,
+                lead_designer
                 )
                 VALUES(
                 #{id},
@@ -127,7 +129,9 @@
                 #{factory},
                 #{controBoxAddress},
                 #{bizOrgCode},
-                #{bizOrgName}
+                #{bizOrgName},
+                #{designOrg},
+                #{leadDesigner}
                 )
     </insert>
     <insert id="insertFile">
@@ -174,7 +178,9 @@
               form_group_id =#{formGroupId},
               contro_box_address = #{controBoxAddress},
               biz_org_code=#{bizOrgCode},
-              biz_org_name=#{bizOrgName}
+              biz_org_name=#{bizOrgName},
+              design_org = #{designOrg},
+              lead_designer = #{leadDesigner}
               where id = #{id}
     </update>
     <delete id="deleteFilre">