diff --git a/config/db/V8.3__add_table.sql b/config/db/V8.3__add_table.sql new file mode 100644 index 00000000..46928079 --- /dev/null +++ b/config/db/V8.3__add_table.sql @@ -0,0 +1,13 @@ +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; +drop table IF EXISTS `sys_audit_team`; +create TABLE `sys_audit_team` ( + `id` bigint NOT NULL comment '主键ID', + `creator` bigint NOT NULL comment '创建人', + `create_date` datetime NOT NULL comment '创建时间', + `name` longtext NOT NULL comment '审核组名称', + `member` json NOT NULL comment '审核组成员id数组', + `index` varchar(255) NULL comment '审核组索引', + PRIMARY KEY (`id`) +) comment = '流程审核组组员'; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/config/db/V8.3__tb_fuse_add_col.sql b/config/db/V8.3__tb_fuse_add_col.sql deleted file mode 100644 index c752b342..00000000 --- a/config/db/V8.3__tb_fuse_add_col.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景'; \ No newline at end of file diff --git a/config/db/V8.4__tb_fuse_add_col.sql b/config/db/V8.4__tb_fuse_add_col.sql new file mode 100644 index 00000000..cd5562b6 --- /dev/null +++ b/config/db/V8.4__tb_fuse_add_col.sql @@ -0,0 +1,2 @@ +ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景', + ADD COLUMN `area` varchar(128) NULL COMMENT '基层赋能场景所属地区'; \ No newline at end of file diff --git a/config/db/V8.5__t_demand_data_add_col.sql b/config/db/V8.5__t_demand_data_add_col.sql new file mode 100644 index 00000000..f63eaf31 --- /dev/null +++ b/config/db/V8.5__t_demand_data_add_col.sql @@ -0,0 +1 @@ +ALTER TABLE `t_demand_data` ADD COLUMN `enclosure_name` longtext NULL COMMENT '附件名称' AFTER `apply_number`; \ No newline at end of file diff --git a/config/db/V8.6__audio_team_add_col.sql b/config/db/V8.6__audio_team_add_col.sql new file mode 100644 index 00000000..4d31362a --- /dev/null +++ b/config/db/V8.6__audio_team_add_col.sql @@ -0,0 +1 @@ +alter table `sys_audit_team` ADD COLUMN `description` longtext NULL comment '审核组备注信息'; \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java index 3ca1593d..091aae1d 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java @@ -219,6 +219,7 @@ public class HistoryController { detailDTO.setExecutionId(task.getExecutionId()); detailDTO.setProcessDefinitionId(task.getProcessDefinitionId()); detailDTO.setComment("待审核"); + detailDTO.setTaskId(task.getId()); final List taskHandleDetailInfo_ = new ArrayList<>(); taskHandleDetailInfo_.add(detailDTO); taskHandleDetailInfo_.addAll(list); diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java index e6b022c1..e8d9717c 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java @@ -339,7 +339,10 @@ public class ActTaskService extends BaseServiceImpl { StringBuilder stringBuilder = new StringBuilder(); List resourcesName = resourceDao.selectResourcesTypeByIds(resourceIds); resourcesName.forEach(x -> stringBuilder.append(x).append(",")); - String string = stringBuilder.substring(0, stringBuilder.length() - 1); + String string = ""; + if (stringBuilder.length() > 0) { + string = stringBuilder.substring(0, stringBuilder.length() - 1); + } dto.setResourceType(string); }, executor); diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java index 6b55238e..039e32b1 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java @@ -270,20 +270,25 @@ public class TbFuseServiceImpl extends CrudServiceImpl { - fuseResourceDTO.setId(IdWorker.getId(fuseResourceDTO)); - fuseResourceDTO.setFuseId(fuseEntity.getId()); - TbFuseResourceEntity entity = new TbFuseResourceEntity(); - BeanUtils.copyProperties(fuseResourceDTO, entity); - fuseResourceDao.insert(entity); - }); - dto.getFuseAttrList().forEach(fuseAttrDTO -> { - fuseAttrDTO.setId(IdWorker.getId(fuseAttrDTO)); - fuseAttrDTO.setFuseId(fuseEntity.getId()); - TbFuseAttrEntity entity = new TbFuseAttrEntity(); - BeanUtils.copyProperties(fuseAttrDTO, entity); - fuseAttrDao.insert(entity); - }); + + if (dto.getFuseResourceList() != null) { + dto.getFuseResourceList().forEach(fuseResourceDTO -> { + fuseResourceDTO.setId(IdWorker.getId(fuseResourceDTO)); + fuseResourceDTO.setFuseId(fuseEntity.getId()); + TbFuseResourceEntity entity = new TbFuseResourceEntity(); + BeanUtils.copyProperties(fuseResourceDTO, entity); + fuseResourceDao.insert(entity); + }); + } + if (dto.getFuseAttrList() != null) { + dto.getFuseAttrList().forEach(fuseAttrDTO -> { + fuseAttrDTO.setId(IdWorker.getId(fuseAttrDTO)); + fuseAttrDTO.setFuseId(fuseEntity.getId()); + TbFuseAttrEntity entity = new TbFuseAttrEntity(); + BeanUtils.copyProperties(fuseAttrDTO, entity); + fuseAttrDao.insert(entity); + }); + } return result; }