diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 6d6bf24a7..a609186a2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -1471,7 +1471,7 @@ public class SysUserController { name = "/%"; } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.like(SysUser::getRealname,name); + lambdaQueryWrapper.like(SysUser::getUsername,name); List sysUserList = sysUserService.list(lambdaQueryWrapper); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1491,7 +1491,7 @@ public class SysUserController { for (SysUser sysUser : sysUserList) { SysUserDepartVO sysUserDepartVO = new SysUserDepartVO(); sysUserDepartVO.setKey(sysUser.getId()); - sysUserDepartVO.setTitle(sysUser.getRealname()); + sysUserDepartVO.setTitle(sysUser.getUsername()); list.add(sysUserDepartVO); } } @@ -1526,7 +1526,8 @@ public class SysUserController { SysDepartUserTreeModel target = new SysDepartUserTreeModel(); BeanUtils.copyProperties(sysUser, target); target.setKey(sysUser.getId()); - target.setTitle(sysUser.getRealname()+"("+sysUser.getUsername()+")"); + target.setTitle(sysUser.getUsername()); +// target.setTitle(sysUser.getRealname()+"("+sysUser.getUsername()+")"); target.setChildren(null); target.setIsLeaf(true); treeList.add(target); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 2081859b5..4a992b72d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -215,8 +215,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - String content = sysUser.getUsername() + "删除了" + StringUtils.join(serialNumberList, ",") + "请知晓"; - String contentInfo = sysUser.getUsername() + "删除了" + sbStr + "请知晓"; + String content = sysUser.getUsername() + " delete " + StringUtils.join(serialNumberList, ",") + ",Please pay attention to check."; + String contentInfo = sysUser.getUsername() + " delete " + sbStr + ",Please pay attention to check."; //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); sysAnnouncementService.saveAnnouncement(sysAnnouncement); @@ -879,7 +879,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { //下拉选处理数据字典 - treeDictItem(categoryList, entry, treeFieldList, cut); + treeDictItem(categoryList, entry, treeFieldList, cut,null); }); //下拉单选和下拉多选数据字典处理 @@ -887,7 +887,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { if (fieldPullList.contains(entry.getKey())) { //下拉选处理数据字典 - dictItem(sysDictItems, entry, cut, finalFieldList); + dictItem(sysDictItems, entry, cut, finalFieldList,null); } }); @@ -1551,8 +1551,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldFileList, List fieldPullList, String cut) { - StringBuilder sb = getUpdateInfo(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, cut); + StringBuilder sb = getUpdateInfo(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, cut,null); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (StringUtils.isNotBlank(sb)) { String content = sb.substring(0, sb.length() - 1); @@ -2001,7 +2001,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, List> dataList, List fieldList, List fieldDateList, List fieldFileList, List fieldPullList, String cut) { + private StringBuilder getUpdateInfo(Map map, List> dataList, + List fieldList, List fieldDateList, + List fieldFileList, List fieldPullList, + String cut,String flag) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //调整dataList中map中字段顺序与表单中的一致 Map mapNew = new LinkedHashMap<>(); for (OnlCgformField onlCgformField : fieldList) { @@ -2033,13 +2037,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : dataList.get(0).entrySet()) { //下拉选处理数据字典 - dictItem(sysDictItems, entry, cut, fieldList); - treeDictItem(categoryList, entry, treeFieldList, cut); + dictItem(sysDictItems, entry, cut, fieldList,flag); + treeDictItem(categoryList, entry, treeFieldList, cut,flag); } for (Map.Entry entry : mapTemp.entrySet()) { //下拉选处理数据字典 - dictItem(sysDictItems, entry, cut, fieldList); - treeDictItem(categoryList, entry, treeFieldList, cut); + dictItem(sysDictItems, entry, cut, fieldList,flag); + treeDictItem(categoryList, entry, treeFieldList, cut,flag); } StringBuilder sb = new StringBuilder(); @@ -2051,6 +2055,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"; if (value == null) { value = ""; @@ -2077,13 +2086,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl record1 = (Map) record; for (Map.Entry entry : record1.entrySet()) { - treeDictItem(categoryList, entry, treeFieldList, (String) parameter.get("cut")); + treeDictItem(categoryList, entry, treeFieldList, (String) parameter.get("cut"),null); if ("state".equals(entry.getKey())) { List onlCgformFieldList = fieldList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); //状态数据字典 @@ -2551,8 +2606,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : record1.entrySet()) { //下拉选处理数据字典 - dictItem(sysDictItems, entry, cut, fieldList); - treeDictItem(categoryList, entry, treeFieldList, cut); + dictItem(sysDictItems, entry, cut, fieldList,null); + treeDictItem(categoryList, entry, treeFieldList, cut,null); if(fileList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())){ fileIdLidt.add((String)entry.getValue()); } @@ -2702,7 +2757,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysDictItems, Map.Entry entry, String cut, List fieldList) { + public void dictItem(List sysDictItems, Map.Entry entry, String cut, List fieldList,String flag) { //通过dictField判断字段是否为下拉选(不为空则为下拉选) List onlCgformFieldList = fieldList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); //数据字典中文 @@ -2726,7 +2781,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl itemText = new ArrayList<>(); if (CutEnum.CN.getValue().equals(cut)) { itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); - } else { + } else if(CutEnum.EN.getValue().equals(cut)) { + itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); + }else if("1".equals(flag)){ itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); } dictItemsCh.addAll(itemText); @@ -2744,7 +2801,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : data.entrySet()) { //下拉选处理数据字典 - dictItem(sysDictItems, entry, cut, fieldList); + dictItem(sysDictItems, entry, cut, fieldList,null); //处理树形数据字典 - treeDictItem(categoryList, entry, treeFieldList, cut); + treeDictItem(categoryList, entry, treeFieldList, cut,null); } @@ -3679,7 +3738,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList, Map.Entry entry, List treeFieldList, String cut) { + public void treeDictItem(List categoryList, Map.Entry entry, List treeFieldList, String cut,String flag) { List treeFields = treeFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); String key = entry.getKey(); if (treeFields.contains(entry.getKey())) { @@ -3691,7 +3750,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl nameEnList = sysCategoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); if (CutEnum.CN.getValue().equals(cut)) { entry.setValue(StringUtils.join(nameList, ",")); - } else { + } else if(CutEnum.EN.getValue().equals(cut)){ + entry.setValue(StringUtils.join(nameEnList, ",")); + }else if("1".equals(flag)){ entry.setValue(StringUtils.join(nameEnList, ",")); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index e72bd21d7..d78ce1948 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -229,11 +229,11 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { List fileList = new ArrayList<>(); mapTemp.entrySet().forEach(entry -> { //下拉选处理数据字典 - bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, (String) map.get("cut")); + bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, (String) map.get("cut"),null); //下拉单选和下拉多选数据字典处理 if (fieldPullList.contains(entry.getKey())) { - bussDocumentLibraryEOService.dictItem(sysDictItems, entry, (String) map.get("cut"), fieldList); + bussDocumentLibraryEOService.dictItem(sysDictItems, entry, (String) map.get("cut"), fieldList,null); } //处理文件 if (FieldFileList.contains(entry.getKey())) { diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue index d126543fb..9bb38b919 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue @@ -11,7 +11,13 @@ :loading="loading" :columns="columns" > - + + {{prcTypeName[text]}} + + + {{text && text == 0 ? '未完成':'已完成'}} + + {{$t('See')}} @@ -42,12 +48,16 @@ pageNo: 1, pageSize: 10, selectedRowKeys: [], + prcTypeName: { + 1: '任务确认流程' + }, columns: [ { title: this.$t('ProcessType'), dataIndex: 'prcType', align: 'center', - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'prcType' } }, { title: this.$t('Sponsor'), @@ -83,7 +93,8 @@ title: this.$t('ProcessStatus'), dataIndex: 'isEnd', align: 'center', - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'isEnd' } }, { title: this.$t('cutoffTime'), @@ -191,4 +202,9 @@ position: relative; top: 1px; } + + .page { + text-align: right; + margin-top: 20px; + } diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index e1b9aefb7..87cd21000 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -33,6 +33,7 @@ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import { mapGetters } from 'vuex' import moment from 'moment' + export default { name: 'ProcessCenter', data() { @@ -41,7 +42,7 @@ total: 0, pageNo: 1, pageSize: 10, - selectedRowKeys:[], + selectedRowKeys: [], columns: [ { title: this.$t('RelatedItems'), @@ -100,13 +101,13 @@ } ], loading: false, - dataSource:[], + dataSource: [] } }, computed: {}, methods: { ...mapGetters(['userInfo']), - onSelectChange(){ + onSelectChange() { }, queryProcess() { @@ -115,7 +116,7 @@ parmes.current = this.pageNo parmes.size = this.pageSize parmes.userId = this.userInfo().userId - postAction('task/todoTaskList',parmes).then((res)=>{ + postAction('task/todoTaskList', parmes).then((res) => { this.dataSource = res.list || [] this.total = res.count this.loading = false @@ -124,40 +125,9 @@ dealWith(row) { let index = row.taskIds.lastIndexOf(',') row.taskIds = row.taskIds.slice(0, index) - if (row.prcType == '2') { + if (row.prcType == '1') { this.$router.push({ - path: '/regulationUpdate', - query: row - }) - } else if (row.prcType == '3') { - this.$router.push({ - path: '/businessReviseTopicProjectEstablishment', - query: row - }) - } else if (row.prcType == '4') { - this.$router.push({ - path: '/businessReviseTopicProjectEstablishment', - query: row - }) - } else if (row.prcType == '1') { - console.log('跳转更改') - this.$router.push({ - path: '/projectLcaListListing', - query: row - }) - } else if (row.prcType == '7') { - this.$router.push({ - path: '/fileAssessFlowDetails', - query: row - }) - } else if (row.prcType == '5') { - this.$router.push({ - path: '/businessRevisedStandardListingDetails', - query: row - }) - } else if (row.prcType == '6') { - this.$router.push({ - path: '/subBusinessRevisedStandardListingDetails', + path: '/handshakeProcess', query: row }) } @@ -170,7 +140,7 @@ this.pageNo = 1 this.pageSize = pageSize this.queryProcess() - }, + } }, mounted() { this.queryProcess() diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6a0d12b3a..011fe2e68 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -831,7 +831,7 @@ startProcess(value) { let query = { type: 1, - msg: JSON.stringify(value) + msg: value } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { @@ -847,7 +847,12 @@ } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { - + this.visible = false + this.selectedRowKeys = [] + this.$message.success(this.$t('OperationSuccessful')) + this.$route + } else { + this.$message.warning(this.$t('operationFailed')) } }) },