提交单位信息后台代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireCompanyInfoDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author keyong
+ * @title: FireCompanyInfoDto
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FireCompanyInfoDto", description = "公司信息表")
+public class FireCompanyInfoDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "人员部门公司表主键")
+    private Long instanceId;
+
+    @ApiModelProperty(value = "占地面积")
+    private String floorSpace;
+
+    @ApiModelProperty(value = "负荷等级")
+    private String loadLevel;
+
+    @ApiModelProperty(value = "室内管网形式")
+    private String indoorPipeNetworkType;
+
+    @ApiModelProperty(value = "室外管网形式")
+    private String outdoorPipeNetworkType;
+
+    @ApiModelProperty(value = "安全出口总数")
+    private String exitNum;
+
+    @ApiModelProperty(value = "疏散楼梯数")
+    private String stairsNum;
+
+    @ApiModelProperty(value = "毗邻单位东")
+    private String positionInfoEast;
+
+    @ApiModelProperty(value = "毗邻单位西")
+    private String positionInfoWest;
+
+    @ApiModelProperty(value = "毗邻单位南")
+    private String positionInfoSouth;
+
+    @ApiModelProperty(value = "毗邻单位北")
+    private String positionInfoNorth;
+
+    @ApiModelProperty(value = "消防设施平面图")
+    private String fireEquipFile;
+
+    @ApiModelProperty(value = "消防设计审核文件")
+    private String fireDesignCheckFile;
+
+    @ApiModelProperty(value = "消防设计验收文件")
+    private String fireDesignAcceptanceFile;
+
+    @ApiModelProperty(value = "消防安全检查文件")
+    private String fireSafeCheckFile;
+
+    @ApiModelProperty(value = "其他文件")
+    private String othersFile;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java

@@ -89,4 +89,7 @@ public class OrgUsrDto extends BaseDto {
 
     @ApiModelProperty(value = "合同编号")
     private Long contractId;
+
+    @ApiModelProperty(value = "消防信息")
+    private FireCompanyInfoDto fireCompanyInfoDto;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/CompanyInfo.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author keyong
+ * @title: CompanyInfo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_company_info")
+@ApiModel(value="CompanyInfo对象", description="公司信息")
+public class CompanyInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "人员部门公司表主键")
+    @TableField("instance_id")
+    private Long instanceId;
+
+    @ApiModelProperty(value = "占地面积")
+    @TableField("floor_space")
+    private String floorSpace;
+
+    @ApiModelProperty(value = "负荷等级")
+    @TableField("load_level")
+    private String loadLevel;
+
+    @ApiModelProperty(value = "室内管网形式")
+    @TableField("indoor_pipe_network_type")
+    private String indoorPipeNetworkType;
+
+    @ApiModelProperty(value = "室外管网形式")
+    @TableField("outdoor_pipe_network_type")
+    private String outdoorPipeNetworkType;
+
+    @ApiModelProperty(value = "安全出口总数")
+    @TableField("exit_num")
+    private String exitNum;
+
+    @ApiModelProperty(value = "疏散楼梯数")
+    @TableField("stairs_num")
+    private String stairsNum;
+
+    @ApiModelProperty(value = "毗邻单位东")
+    @TableField("position_info_direction_east")
+    private String positionInfoEast;
+
+    @ApiModelProperty(value = "毗邻单位西")
+    @TableField("position_info_direction_west")
+    private String positionInfoWest;
+
+    @ApiModelProperty(value = "毗邻单位南")
+    @TableField("position_info_direction_south")
+    private String positionInfoSouth;
+
+    @ApiModelProperty(value = "毗邻单位北")
+    @TableField("position_info_direction_north")
+    private String positionInfoNorth;
+
+    @ApiModelProperty(value = "消防设施平面图")
+    @TableField("fire_equip_file")
+    private String fireEquipFile;
+
+    @ApiModelProperty(value = "消防设计审核文件")
+    @TableField("fire_design_check_file")
+    private String fireDesignCheckFile;
+
+    @ApiModelProperty(value = "消防设计验收文件")
+    @TableField("fire_design_acceptance_file")
+    private String fireDesignAcceptanceFile;
+
+    @ApiModelProperty(value = "消防安全检查文件")
+    @TableField("fire_safe_check_file")
+    private String fireSafeCheckFile;
+
+    @ApiModelProperty(value = "其他文件")
+    @TableField("others_file")
+    private String othersFile;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("rec_date")
+    private Date createDate;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireCompanyInfoMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.CompanyInfo;
+
+/**
+ * @author keyong
+ * @title: FireCompanyInfoMapper
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:22
+ */
+public interface FireCompanyInfoMapper extends BaseMapper<CompanyInfo> {
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireCompanyInfoService.java

+package com.yeejoin.amos.boot.module.common.api.service;
+
+/**
+ * @author keyong
+ * @title: IFireCompanyInfoService
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:13
+ */
+public interface IFireCompanyInfoService {
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -10,7 +10,9 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,15 +44,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
@@ -114,11 +107,10 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-	public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo)
+	public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto orgUsrDto)
 			throws Exception {
-		OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-
-		return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
+		orgUsrDto.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+		return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(orgUsrDto));
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireCompanyInfoServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.dto.FireCompanyInfoDto;
+import com.yeejoin.amos.boot.module.common.api.entity.CompanyInfo;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireCompanyInfoMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireCompanyInfoService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * @author keyong
+ * @title: FireCompanyInfoServiceImpl
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:15
+ */
+@Service
+public class FireCompanyInfoServiceImpl extends BaseService<FireCompanyInfoDto, CompanyInfo, FireCompanyInfoMapper> implements IFireCompanyInfoService {
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -16,8 +16,13 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireCompanyInfoMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireCompanyInfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -46,29 +51,6 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserRolesEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
@@ -119,6 +101,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	IMaintenanceCompanyService maintenanceCompanyService;
 	@Autowired
 	FireStationServiceImpl fireStationServiceImpl;
+	@Autowired
+	FireCompanyInfoMapper fireCompanyInfoMapper;
 	@Value("${jcs.company.topic.add:jcs/company/topic/add}")
 	private String airportAddTopic;
 
@@ -713,6 +697,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
 		orgUsr.setSequenceNbr(orgUsrDto.getSequenceNbr());
+		// 储存公司消防信息
+		saveFireCompanyInfo(orgUsr.getSequenceNbr(), orgUsrDto.getFireCompanyInfoDto());
 		/**
 		 * 同步保存ES
 		 */
@@ -722,6 +708,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrDto;
 	}
 
+	public void saveFireCompanyInfo(Long id, FireCompanyInfoDto fireCompanyInfoDto) {
+		if(ValidationUtil.isEmpty(fireCompanyInfoDto)) {
+			return;
+		}
+		CompanyInfo companyInfo = new CompanyInfo();
+		BeanUtils.copyProperties(fireCompanyInfoDto, companyInfo);
+		companyInfo.setInstanceId(id);
+		fireCompanyInfoMapper.insert(companyInfo);
+	}
+
 	@Override
 	public OrgUsrDto saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
@@ -789,8 +785,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsrMapper.updatelistByParentId(orgUsr.getBizOrgCode(), oriOrgUsr.getBizOrgCode());
 		}
 		updateById(orgUsr);
-
-		// saveOrgUsr(orgUsr, oriOrgUsr);
+		// 更新公司消防信息
+		updateFireCompanyInfo(orgUsr.getSequenceNbr(), orgUsrVo.getFireCompanyInfoDto());
 
 		// 保存动态表单数据
 		updateDynamicFormInstance(orgUsr.getSequenceNbr(), orgUsrVo.getDynamicFormValue());
@@ -804,6 +800,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrVo;
 	}
 
+	public void updateFireCompanyInfo(Long id, FireCompanyInfoDto fireCompanyInfoDto) {
+		if (ValidationUtil.isEmpty(fireCompanyInfoDto)) {
+			return;
+		}
+		CompanyInfo companyInfo = new CompanyInfo();
+		BeanUtils.copyProperties(fireCompanyInfoDto, companyInfo);
+		companyInfo.setInstanceId(id);
+		fireCompanyInfoMapper.updateById(companyInfo);
+	}
+
 	@Override
 	public OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
 		try {

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2888,6 +2888,72 @@
             (select `a`.`name` AS `name`,`b`.`ids` AS `id`,`b`.`companyMaleEmployees` AS `companyMaleEmployees`,`b`.`companyFemaleEmployees` AS `companyFemaleEmployees`,`b`.`longitude` AS `longitude`,`b`.`latitude` AS `latitude`,`b`.`managementType` AS `managementType`,`b`.`keySiteCompany` AS `keySiteCompany` from (((select  `cb_org_usr`.`sequence_nbr` AS `id`, `cb_org_usr`.`biz_org_name` AS `name` from  `cb_org_usr` where (( `cb_org_usr`.`biz_org_type` in ('COMPANY','DEPARTMENT')) and ( `cb_org_usr`.`is_delete` = 0)))) `a` left join (select `v`.`instance_id` AS `ids`,max((case `v`.`field_code` when 'companyMaleEmployees' then `v`.`field_value` end)) AS `companyMaleEmployees`,max((case `v`.`field_code` when 'companyFemaleEmployees' then `v`.`field_value` end)) AS `companyFemaleEmployees`,max((case `v`.`field_code` when 'longitude' then `v`.`field_value` end)) AS `longitude`,max((case `v`.`field_code` when 'latitude' then `v`.`field_value` end)) AS `latitude`,max((case `v`.`field_code` when 'companyNature' then `v`.`field_value_label` end)) AS `managementType`,max((case `v`.`field_code` when 'businessCategory' then `v`.`field_value` end)) AS `keySiteCompany` from  `cb_dynamic_form_instance` `v` group by `v`.`instance_id`) `b` on((`b`.`ids` = `a`.`id`))))</createView>
     </changeSet>
 
+    <changeSet author="ky" id="1651110136-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_data_dictionary" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>Add data to cb_data_dictionary</comment>
+        <sql>
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1360, '1360', '一级负荷', 'XFGDFHDJ', '消防供电负荷等级', NULL, NULL, NULL, NULL, 0, 1);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1361, '1361', '二级负荷', 'XFGDFHDJ', '消防供电负荷等级', NULL, NULL, NULL, NULL, 0, 2);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1362, '1362', '三级负荷', 'XFGDFHDJ', '消防供电负荷等级', NULL, NULL, NULL, NULL, 0, 3);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1363, '1363', '环状管网', 'GWXS', '管网形式', NULL, NULL, NULL, NULL, 0, 1);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1364, '1364', '枝状管网', 'GWXS', '管网形式', NULL, NULL, NULL, NULL, 0, 2);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1365, '1', '电厂升压变电站', 'BDZHHLZYTLX', '变电站或换流站用途类型', NULL, NULL, NULL, NULL, 0, 1);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1366, '2', '公用普通变电站', 'BDZHHLZYTLX', '变电站或换流站用途类型', NULL, NULL, NULL, NULL, 0, 2);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1367, '3', '公用换流变电站', 'BDZHHLZYTLX', '变电站或换流站用途类型', NULL, NULL, NULL, NULL, 0, 3);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1368, '4', '企业自备变电站', 'BDZHHLZYTLX', '变电站或换流站用途类型', NULL, NULL, NULL, NULL, 0, 4);
+            INSERT INTO cb_data_dictionary (sequence_nbr, code, name, `type`, type_desc, parent, rec_user_name, rec_user_id, rec_date, is_delete, sort_num) VALUES(1369, '9', '其他', 'BDZHHLZYTLX', '变电站或换流站用途类型', NULL, NULL, NULL, NULL, 0, 5);
+
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (38, 'operationDate', '投入运行日期', 'datetime', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-04-29 03:06:13', b'0', NULL, 1, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (39, 'typeOfUse', '用途类型', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"BDZHHLZYTLX\", \"type\": \"dict\"}', NULL, NULL, '2022-04-29 03:06:13', b'0', NULL, 3, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (7, 'businessCategory', '是否重点单位', 'radio', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"SFZD\", \"type\": \"dict\"}', NULL, NULL, '2022-04-13 19:21:05', b'0', NULL, 7, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (9, 'companyLocation', '单位地址', 'inputPoi', 7, 'like', b'0', b'0', '244', '{\"url\": \"http://{hostname}:3004\", \"type\": \"url\"}', NULL, NULL, '2022-02-14 11:48:34', b'0', NULL, 4, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (10, 'companyPhone', '单位电话', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-07 02:59:34', b'0', NULL, 5, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (11, 'companyMaleEmployees', '男员工人数', 'inputNumber', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-12 03:06:11', b'0', NULL, 9, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (12, 'companyFemaleEmployees', '女员工人数', 'inputNumber', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-12 03:06:13', b'0', NULL, 10, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (13, 'companyPhoto', '单位照片', 'upload', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-07 02:59:31', b'0', NULL, 1, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (15, 'managementType', '管理类别', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"GLLB\", \"type\": \"dict\"}', NULL, NULL, '2021-07-07 10:58:59', b'0', NULL, 2, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (16, 'companyNature', '单位性质', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"DWXZ\", \"type\": \"dict\"}', NULL, NULL, '2021-07-07 10:58:44', b'0', NULL, 6, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812065, 'longitude', '经度', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-08-19 09:13:17', b'0', NULL, 11, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812066, 'latitude', '纬度', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-08-19 09:13:19', b'0', NULL, 12, NULL);
+            REPLACE INTO `cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812099, 'companyPlanePhonto', '单位总平面图', 'upload', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-02-23 09:30:57', b'0', NULL, 22, NULL);
+
+        </sql>
+    </changeSet>
+    <changeSet author="ky" id="1651110136-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="cb_fire_company_info"/>
+            </not>
+        </preConditions>
+        <comment>create table cb_fire_company_info</comment>
+        <sql>
+            CREATE TABLE `cb_fire_company_info` (
+            `sequence_nbr` bigint(22) NOT NULL,
+            `instance_id` bigint(22) NOT NULL COMMENT '人员部门公司表主键',
+            `floor_space` varchar(15) CHARACTER SET utf8 DEFAULT NULL COMMENT '占地面积',
+            `load_level` varchar(15) CHARACTER SET utf8 DEFAULT NULL COMMENT '负荷等级',
+            `indoor_pipe_network_type` varchar(15) CHARACTER SET utf8 DEFAULT NULL COMMENT '室内管网形式',
+            `outdoor_pipe_network_type` varchar(15) CHARACTER SET utf8 DEFAULT NULL COMMENT '室外管网形式',
+            `exit_num` varchar(15) CHARACTER SET utf8 DEFAULT NULL COMMENT '安全出口总数',
+            `stairs_num` varchar(15) CHARACTER SET utf8 DEFAULT NULL COMMENT '疏散楼梯数',
+            `position_info_direction_east` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '毗邻单位东',
+            `position_info_direction_west` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '毗邻单位西',
+            `position_info_direction_south` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '毗邻单位南',
+            `position_info_direction_north` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '毗邻单位北',
+            `rec_date` datetime DEFAULT NULL COMMENT '创建时间',
+            `fire_equip_file` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '消防设施平面图',
+            `fire_design_check_file` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '消防设计审核文件',
+            `fire_design_acceptance_file` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '消防设计验收文件',
+            `fire_safe_check_file` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '消防安全检查文件',
+            `others_file` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '其他文件',
+            `is_delete` bit(1) DEFAULT b'0' COMMENT '是否删除',
+            PRIMARY KEY (`sequence_nbr`)
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='公司信息表';
+        </sql>
+    </changeSet>
 
 </databaseChangeLog>