WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-04-25 18:04:53 +08:00
parent ff5da7b836 3c39750386
commit 1d77caa605
13 changed files with 296 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+67 -3
View File
@@ -1106,13 +1106,33 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
map.put("corresponding_standard", map.get("corresponding_standard_id"));
}
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
//过滤所有人员选择类型的字段
List<OnlCgformField> personnelOnlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
if(personnelOnlCgformFieldList.size() != 0){
List<String> collect = personnelOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
List<String> personnelList = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
if(collect.contains(key)){
personnelList.add(key);
}
}
if(personnelList.size() != 0){
for (String personnel : personnelList) {
map.put(personnel, map.get(personnel+"_id"));
map.remove(personnel+"_id");
}
}
}
//代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态
String cut = (String) map.get("cut");
map.remove("cut");
map.remove("replace_standard_id");
map.remove("corresponding_standard_id");
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
//获取搜索中心字段
List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
//文件类型字段
@@ -2597,16 +2617,59 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
.collect(Collectors.toList());
List<String> fileList = onlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
//过滤出人员选择字段
List<OnlCgformField> personnelPnlCgformFieldFileList = fieldList.stream()
.filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType()))
.collect(Collectors.toList());
List<String> personnelList = personnelPnlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
List<String> personnelValue = new ArrayList<>();
List<Map> records = infoPage.getRecords();
for (Map record : records) {
Map<String, Object> record1 = (Map) record;
for (Map.Entry<String, Object> entry : record1.entrySet()) {
//过滤出人员选择的数据
if(personnelList.size() != 0 && personnelList.contains(entry.getKey())){
String value = (String) entry.getValue();
if(ObjectUtils.isNotEmpty(value)){
personnelValue.addAll(Arrays.asList(value.split(",")));
}
}
}
}
List<SysUser> userList = new ArrayList<>();
if(personnelValue.size() != 0){
//查询用户信息(根据用户名)
LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysUser::getId,personnelValue);
userList = sysUserService.list(wrapper);
}
//数据字典
List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
//下拉选处理数据字典
List<Map> records = infoPage.getRecords();
List<String> idList = new ArrayList<>();
List<String> fileIdLidt = new ArrayList<>();
for (Map record : records) {
Map<String, Object> record1 = (Map) record;
idList.add((String) record1.get("id"));
for (Map.Entry<String, Object> entry : record1.entrySet()) {
String key = entry.getKey();
String value = (String) entry.getValue();
//处理人员选择
if(personnelList.contains(key) && StringUtils.isNotBlank(value)){
StringBuilder sb = new StringBuilder();
for (String userId : value.split(",")) {
List<SysUser> sysUserList = userList.stream().filter(e -> userId.equals(e.getId())).collect(Collectors.toList());
if(sysUserList.size() != 0){
sb.append(sysUserList.get(0).getUsername()+",");
}
}
if(StringUtils.isNotBlank(sb)){
String substring = sb.substring(0, sb.length() - 1);
entry.setValue(substring);
}
}
//下拉选处理数据字典
dictItem(sysDictItems, entry, cut, fieldList,null);
treeDictItem(categoryList, entry, treeFieldList, cut,null);
@@ -2615,6 +2678,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
}
if(fileIdLidt.size() != 0){
List<OSSFile> fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdLidt, ","));
if(fileInfos.size() != 0){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java
+2
View File
@@ -114,6 +114,8 @@ public class TaskController {
@ApiOperation(value="已办流程", notes="已办流程")
@PostMapping("/doneProcess")
public Page doneProcess(@RequestBody TaskCommonQuery taskCommonQuery){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
taskCommonQuery.setUserId(sysUser.getId());
return taskFeignClient.doneProcess(taskCommonQuery);
}