修改企业注册单位类型多选接口 添加默认角色

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

@@ -42,6 +42,9 @@ public class DataDictionary extends BaseEntity {
 
     @ApiModelProperty(value = "排序字段")
     private int sortNum;
+
+    @ApiModelProperty(value = "扩展字段")
+    private String extend;
     
     @ApiModelProperty(value = "对应消防专家的数量，仅适应与消防资源专家领域树结构的展示")
     @TableField(exist = false)

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -366,6 +366,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
                 Collections.addAll(appCodesSet, appCodes);
                 roleNameSet.add(unitType.getName());
                 userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
+                for(RoleModel roleModel : allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())){
+                    userRoleList.add(roleModel);
+                }
                 userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
                 roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
                 orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/db/changelog/tzs-1.0.0.1.xml

@@ -903,5 +903,15 @@
 			REPLACE 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 ('1201', '1201', '生产单位(设计、制造、安装、改造、维修单位)', 'zslx', NULL, NULL, NULL, NULL, NULL, b'0', '1');
 		</sql>
 	</changeSet>
+	<changeSet id="1660546840856-15" author="suhuiguang">
+	<comment>企业注册证书类型枚举调整</comment>
+		<sql>
+			ALTER TABLE `cb_data_dictionary` add column `extend` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '扩展列';
+			UPDATE `cb_data_dictionary` SET `code` = '1229', `name` = '设计制造单位', `type` = 'UNIT_TYPE_NEW_OLD', `type_desc` = 'studio_normalapp_3663181,studio_normalapp_3654033,studio_normalapp_3404492,studio_normalapp_3404491', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = NULL WHERE `sequence_nbr` = 1229;
+			UPDATE `cb_data_dictionary` SET `code` = '1230', `name` = '生产单位', `type` = 'UNIT_TYPE_NEW', `type_desc` = 'studio_normalapp_3684596,studio_normalapp_3654033', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = 'Safety_Supervision_Rectify_Report' WHERE `sequence_nbr` = 1230;
+			UPDATE `cb_data_dictionary` SET `code` = '1231', `name` = '充装单位', `type` = 'UNIT_TYPE_NEW', `type_desc` = 'studio_normalapp_3684596,studio_normalapp_3654033', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = 'Safety_Supervision_Rectify_Report' WHERE `sequence_nbr` = 1231;
+			UPDATE `cb_data_dictionary` SET `code` = '1232', `name` = '使用单位', `type` = 'UNIT_TYPE_NEW', `type_desc` = 'studio_normalapp_3684596,studio_normalapp_3654033', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = 'Safety_Supervision_Rectify_Report' WHERE `sequence_nbr` = 1232;
+		</sql>
+	</changeSet>
 </databaseChangeLog>