wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev

This commit is contained in:
wangliwen 2022-12-14 15:16:28 +08:00
parent fd680542a5 38bd349887
commit 99df97a174
7 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/db/V8.3__add_table.sql Normal file
View File

@ -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;

1
config/db/V8.3__tb_fuse_add_col.sql
View File

@ -1 +0,0 @@
ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景';

2
config/db/V8.4__tb_fuse_add_col.sql Normal file
View File

@ -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 '基层赋能场景所属地区';

1
config/db/V8.5__t_demand_data_add_col.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `t_demand_data` ADD COLUMN `enclosure_name` longtext NULL COMMENT '附件名称' AFTER `apply_number`;

1
config/db/V8.6__audio_team_add_col.sql Normal file
View File

@ -0,0 +1 @@
alter table `sys_audit_team` ADD COLUMN `description` longtext NULL comment '审核组备注信息';

5
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -339,7 +339,10 @@ public class ActTaskService extends BaseServiceImpl {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
List<String> resourcesName = resourceDao.selectResourcesTypeByIds(resourceIds); List<String> resourcesName = resourceDao.selectResourcesTypeByIds(resourceIds);
resourcesName.forEach(x -> stringBuilder.append(x).append(",")); 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); dto.setResourceType(string);
}, executor); }, executor);

33
renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
View File

@ -270,20 +270,25 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
fuseEntity.setVisits(0L); fuseEntity.setVisits(0L);
fuseEntity.setApplyCount(0L); fuseEntity.setApplyCount(0L);
int result = fuseDao.insert(fuseEntity); int result = fuseDao.insert(fuseEntity);
dto.getFuseResourceList().forEach(fuseResourceDTO -> {
fuseResourceDTO.setId(IdWorker.getId(fuseResourceDTO)); if (dto.getFuseResourceList() != null) {
fuseResourceDTO.setFuseId(fuseEntity.getId()); dto.getFuseResourceList().forEach(fuseResourceDTO -> {
TbFuseResourceEntity entity = new TbFuseResourceEntity(); fuseResourceDTO.setId(IdWorker.getId(fuseResourceDTO));
BeanUtils.copyProperties(fuseResourceDTO, entity); fuseResourceDTO.setFuseId(fuseEntity.getId());
fuseResourceDao.insert(entity); TbFuseResourceEntity entity = new TbFuseResourceEntity();
}); BeanUtils.copyProperties(fuseResourceDTO, entity);
dto.getFuseAttrList().forEach(fuseAttrDTO -> { fuseResourceDao.insert(entity);
fuseAttrDTO.setId(IdWorker.getId(fuseAttrDTO)); });
fuseAttrDTO.setFuseId(fuseEntity.getId()); }
TbFuseAttrEntity entity = new TbFuseAttrEntity(); if (dto.getFuseAttrList() != null) {
BeanUtils.copyProperties(fuseAttrDTO, entity); dto.getFuseAttrList().forEach(fuseAttrDTO -> {
fuseAttrDao.insert(entity); fuseAttrDTO.setId(IdWorker.getId(fuseAttrDTO));
}); fuseAttrDTO.setFuseId(fuseEntity.getId());
TbFuseAttrEntity entity = new TbFuseAttrEntity();
BeanUtils.copyProperties(fuseAttrDTO, entity);
fuseAttrDao.insert(entity);
});
}
return result; return result;
} }