From 1e3a5b585a112fe19c28d053032599f6f6ffd872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 1 Nov 2022 10:55:17 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6?= =?UTF-8?q?70=E5=8F=98=E4=B8=BA100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/controller/CommonController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index d95b68abb..87b28ce42 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -158,11 +158,11 @@ public class CommonController { // bizPath = ""; // } } - if(file.getOriginalFilename().length()>70){ + if(file.getOriginalFilename().length()>100){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - throw new JeroBootException("文件名长度不能超过70位，请检查！"); + throw new JeroBootException("文件名长度不能超过100位，请检查！"); }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - throw new JeroBootException("File name length cannot exceed 70 characters, please check!"); + throw new JeroBootException("File name length cannot exceed 100 characters, please check!"); } } // OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut); From 4a3fcdecc1ec4a5ffe6a910667ec5d08d02491a2 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 1 Nov 2022 11:21:32 +0800 Subject: [PATCH 02/16] =?UTF-8?q?62031-=E4=BB=BB=E5=8A=A1=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/wkflow/entity/BusMes.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java index c60926925..4e9585919 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusMes.java @@ -35,6 +35,7 @@ public class BusMes { private String handlingTime; // 待办流程-批量办理专用 private String projectLawsInventoryIds; // 待办流程-批量办理专用 private String taskDefinitionKey; // 待办流程-批量办理专用 + private String cut;//中英文切换标识 public String getUserId() { @@ -193,4 +194,12 @@ public class BusMes { public void setTaskDefinitionKey(String taskDefinitionKey) { this.taskDefinitionKey = taskDefinitionKey; } + + public String getCut() { + return cut; + } + + public void setCut(String cut) { + this.cut = cut; + } } From fc16d2328a7413bca7e7ccd1a34bca20d92c4ec3 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 12:07:21 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/processCenter/processForm/evaluationProcess/index.vue | 2 +- .../views/processCenter/processForm/handshakeProcess/index.vue | 2 +- .../views/processCenter/processForm/regulatoryProcess/index.vue | 2 +- .../views/processCenter/processForm/taskListProcess/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 7f592203a..cc0b76f8f 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -335,7 +335,7 @@ }) } else { this.loading = false - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } }) } diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index c19d1eb3c..39f9a28f5 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -263,7 +263,7 @@ } } else { this.loading = false - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } }) }, diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 1695db0be..3b2fc6174 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -199,7 +199,7 @@ }) } else { this.loading = false - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } }) } diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 92f24d749..3c4c0a20c 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -362,7 +362,7 @@ this.edit() } else { this.loading = false - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } }) }, From 2214853d6ab9f98edbdc35d7faab3689fe32dab6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 14:26:45 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/OcrTable/index.vue | 15 +++++++++++--- jero-web/src/components/SplitTable/index.vue | 15 +++++++++++--- .../views/documentTools/virtualList/index.vue | 20 +++++++++++++------ .../projectLibrary/index.vue | 13 ++++++++++-- 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index ab2772555..cbab09ff6 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -21,11 +21,11 @@ - {{record.resultContent=='转换成功'?ol.text:''}} - + {{ol.text}} @@ -105,7 +105,8 @@ searchParmes: {}, loading: false, orderBy: '1', - orderByField: '' + orderByField: '', + administrators:false } }, mounted() { @@ -131,6 +132,14 @@ this.getData() this.getTableList() this.userData = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, beforeDestroy(){ eventBUs.$off('searchQuery') diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index baf0b1142..434f7052a 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -18,7 +18,7 @@ - {{ol.text}} @@ -27,7 +27,7 @@ v-has="'split:sarFileSplitItems:page'"> {{ol.text}} - {{ol.text}} @@ -109,7 +109,8 @@ loading: false, orderBy: '1', userData: {}, - orderByField: '' + orderByField: '', + administrators:false, } }, mounted() { @@ -141,6 +142,14 @@ this.getData() this.getTableList() this.userData = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, beforeDestroy() { eventBUs.$off('searchQuery') diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 3c4cbfda3..d329acfc3 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -65,16 +65,16 @@ {{$t('edit')}} {{record.state == 2 ? $t('release') : $t('withdraw')}} {{$t('maintenanceList')}} {{$t('deleteLib')}} @@ -244,13 +244,21 @@ scopedSlots: { customRender: 'operation' } } ], - queryParam: {} - + queryParam: {}, + administrators:false, } }, mounted() { this.getList() this.userData = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 89c1b78a8..76b8eb34e 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -131,7 +131,7 @@ {{$t('deleteLib')}} @@ -246,12 +246,21 @@ } ], userInfoQuery: {}, - queryParam: {} + queryParam: {}, + administrators: false } }, mounted() { this.getList() this.userInfoQuery = this.userInfo() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), From 691af95e438716e53cc7e3bf27a8ea6db25227af Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 14:45:05 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/modules/UserModal.vue | 161 ++++++++++-------- 1 file changed, 92 insertions(+), 69 deletions(-) diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index 0864d5ce1..ddb2e7430 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -21,29 +21,32 @@ - + - - + - + - + - + @@ -53,9 +56,9 @@ - + + > {{ role.roleName }} @@ -72,9 +75,9 @@ - + + > --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -141,20 +144,21 @@ - - - - - - - - - + + + + + + + + + - + - - + + @@ -173,11 +177,11 @@
- - - {{$t('cancel')}} - - + + + {{$t('cancel')}} + + {{$t('submit')}}
@@ -189,7 +193,7 @@ // 引入搜索部门弹出框的组件 import departWindow from './DepartWindow' import { ACCESS_TOKEN } from '@/store/mutation-types' - import { getAction } from '@/api/manage' + import { getAction, postAction } from '@/api/manage' import { addUser, editUser, queryUserRole, queryall } from '@/api/api' import { disabledAuthFilter } from '@/utils/authFilter' import { duplicateCheck } from '@/api/api' @@ -347,6 +351,25 @@ } }) }, + handleSubmitOk() { + this.confirmLoading = true + let selectedRole = JSON.parse(JSON.stringify(this.selectedRole)) + let param = { + ids: this.userId, + selectedroles: selectedRole.join(',') + } + postAction('/sys/user/setRole', param).then((res) => { + if (res.success) { + this.$emit('ok') + this.confirmLoading = false + this.visible = false + this.$message.success(res.message) + } else { + this.confirmLoading = false + this.$message.warning(res.message) + } + }) + }, refresh() { this.selectedDepartKeys = [] this.checkedDepartKeys = [] @@ -383,7 +406,7 @@ that.visible = true that.model = Object.assign({}, record) that.$nextTick(() => { - that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle','email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post')) + that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle', 'email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post')) }) //身份为上级显示负责部门，否则不显示 if (this.model.userIdentity == '2') { @@ -728,7 +751,7 @@ .drawer-bootom-button { position: absolute; bottom: -8px; - z-index:100; + z-index: 100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; @@ -740,6 +763,6 @@ \ No newline at end of file From d589c572bde9778a98a957b5f60c0c79b278ecee Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 1 Nov 2022 14:55:05 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E5=AF=B9=E7=AE=A1=E7=90=86=E5=91=98=E5=BC=80=E6=94=BE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 6af72e8d9..f8096ac4e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -250,10 +250,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl getPageInfo(Page page, QueryWrapper queryWrapper) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.and(query->{ - query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue()) - .or().in("state",InventoryStateEnum.ISSUE.getValue()); - }); + //系统管理 + boolean administrator = sysUserService.isAdministrator(); + if(!administrator){ + queryWrapper.and(query->{ + query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue()) + .or().in("state",InventoryStateEnum.ISSUE.getValue()); + }); + } // queryWrapper.or(query->{ // query.in("state",InventoryStateEnum.ISSUE.getValue()); // }); From bdfb7d8528ad4f32d8b339d2a0f2cb931fe366f8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 1 Nov 2022 15:00:30 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E5=92=8C=E6=92=A4=E5=9B=9E=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index f8096ac4e..20b31fb67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -323,19 +323,19 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl createByNameList =new ArrayList<>(); - if (StringUtils.isNotBlank(baseEO.getCreateBy())) { - createByNameList = Arrays.asList(baseEO.getCreateBy().split(",")); - - if (CollectionUtils.isNotEmpty(createByNameList)){ - if (!createByNameList.contains(loginUserName)) { - if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { - throw new JeroBootException("当前用户非创建者,无法发布"); - } else { - throw new JeroBootException("The current user is not the creator and cannot be issued."); - } - } - } - } +// if (StringUtils.isNotBlank(baseEO.getCreateBy())) { +// createByNameList = Arrays.asList(baseEO.getCreateBy().split(",")); +// +// if (CollectionUtils.isNotEmpty(createByNameList)){ +// if (!createByNameList.contains(loginUserName)) { +// if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { +// throw new JeroBootException("当前用户非创建者,无法发布"); +// } else { +// throw new JeroBootException("The current user is not the creator and cannot be issued."); +// } +// } +// } +// } Date now = new Date(); UpdateWrapper baseWrapper=new UpdateWrapper<>(); baseWrapper.set("state",dummyInventoryBaseEO.getState()); From 923e099599570a8fa5a55bbbdee1f14f35095b0f Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 15:36:11 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/listOfRegulations.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index c09c6e5c9..0e0329c86 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -173,7 +173,8 @@
-
{{ $t('export') }} From 2e798e417a54cdedad7611863846b5cf4adcb2af Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 15:59:37 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/processCenter/components/circulationHistory.vue | 2 +- .../src/views/processCenter/components/evaluatorFeedback.vue | 2 +- .../views/processCenter/components/evaluatorFeedbackList.vue | 2 +- .../src/views/processCenter/components/examineInformation.vue | 2 +- .../src/views/processCenter/components/feedbackInformation.vue | 2 +- .../src/views/processCenter/components/projectInformation.vue | 2 +- .../processCenter/components/regulatoryCirculationHistory.vue | 2 +- .../processCenter/components/reviewedByThePersonInCharge.vue | 2 +- jero-web/src/views/processCenter/components/standardContent.vue | 2 +- .../views/processCenter/components/taskCirculationHistory.vue | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 9066f1762..c05bcabbd 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -107,7 +107,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index ef8d4b8d1..df1fc8781 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -356,7 +356,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 3b8473872..ecdb62caa 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -389,7 +389,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 385c860df..f95b8c6a1 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -223,7 +223,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index c86a652cb..ff7b18e69 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -231,7 +231,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 8c0e6669a..c32129ffe 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -111,7 +111,7 @@ line-height: 80px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue index 48adc3d86..4fa35d3fa 100644 --- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue @@ -127,7 +127,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index fc760921f..f9614c226 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -312,7 +312,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 846990863..be337f0b4 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -116,7 +116,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 8c64c8228..8495f0393 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -110,7 +110,7 @@ line-height: 40px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } From 81c9c76fb0d519585ad4f6ac7d3511ad3403369c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 16:12:53 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ProjectDetails.vue | 14 ++++++++++++-- .../components/listOfRelevantPersonnel.vue | 18 ++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 18212626b..3dc752b3b 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -5,7 +5,7 @@ {{$t('basicInformationOfParameters')}}
- {{$t('edit')}} @@ -93,7 +93,8 @@ {{$t('regulatoryCertificationTaskPlan')}}
- {{$t('setting')}} @@ -161,6 +162,7 @@ data() { return { queryForm: {}, + administrators:false, activeKey: this.$t('CurrentStatusOfTheProject'), url: { queryById: 'project/projectLibraryBase/queryById', @@ -177,6 +179,14 @@ mounted() { this.getForm() this.getSetting() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 8de753c3c..a885f10b4 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -83,14 +83,14 @@
+ v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators">
+ v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators"> {{$t('batSetting')}}
@@ -388,13 +388,15 @@ queryCertificationEngineer: '/project/projectRelatedPersonnel/queryCertificationEngineer' }, selectedRowKeys: [], - dictOptionsValue: [] + dictOptionsValue: [], + administrators: false } }, computed: { columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - if (this.$route.query.studioEngineer != this.userInfo().id) { + if (this.$route.query.studioEngineer == this.userInfo().id || this.administrators) { + } else { for (var i = 0; i < columnResult.length; i++) { if (columnResult[i].title === this.$t('operation')) { columnResult.splice(i, 1) @@ -441,6 +443,14 @@ getData() { this.visible = true this.queryParam = {} + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } this.getList() this.queryCertificationEngineer() }, From f68a375893289b8a525c1904791470d2f24fe68f Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 16:41:21 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 32a5c2c11..3e26365cf 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -125,14 +125,16 @@ - - {{$t('addStandardInformation')}} -
+ + + {{$t('addStandardInformation')}} + + @@ -799,8 +801,9 @@ width: 120px; overflow: hidden; padding: 0 0; - float: right; + /*float: right;*/ text-align: center; + margin-top: 2px; } ::v-deep .box-button-index span { @@ -843,8 +846,9 @@ } .box-input-index { - width: calc(100% - 130px); + /*width: calc(100% - 130px);*/ display: inline-block; + width: 100%; height: 48px; margin-right: 10px; } From 0b2ae6fb921055f383f2d349874e9817e557c273 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 1 Nov 2022 16:46:01 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=8F=8D=E9=A6=88=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=A4=84=E7=90=86=E7=94=A8=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProjectTaskInventoryFeedbackEOServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index a7e556d3e..2eb931b93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -286,6 +286,9 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl projectTaskInventoryFeedbackEOS = this.baseMapper.selectList(queryWrapper); if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOS)){ List idList = projectTaskInventoryFeedbackEOS.stream().distinct().map(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId).collect(Collectors.toList()); + List userNameList = projectTaskInventoryFeedbackEOS.stream().distinct().map(ProjectTaskInventoryFeedbackEO::getCreateBy).collect(Collectors.toList()); + List userList = this.sysUserService.queryUserIdListByNameList(userNameList); + QueryWrapper inventoryDetailEOQueryWrapper = new QueryWrapper<>(); inventoryDetailEOQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getId,idList); List projectTaskInventoryDetailEOList = projectTaskInventoryDetailEOMapper.selectList(inventoryDetailEOQueryWrapper); @@ -302,6 +305,18 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl userListTemp = userList.stream().filter(user -> { + boolean flag = false; + if(StringUtils.equals(projectTaskInventoryFeedbackEO.getCreateBy(),user.getUsername())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userListTemp)){ + projectTaskInventoryFeedbackEO.setUserId(userListTemp.get(0).getId()); + } + } } } return projectTaskInventoryFeedbackEOS; From a4f9bec0d97c5711428ab657062d2e8071f7de93 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 1 Nov 2022 16:48:11 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E6=9F=A5=E8=AF=A2=E5=8F=8D=E9=A6=88=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=A4=84=E7=90=86userId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/entity/ProjectTaskInventoryFeedbackEO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java index 9b90ffa39..abbedd475 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -108,4 +108,6 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable { @ApiModelProperty(value = "序号") private String serialNumber; + @TableField(exist = false) + private String userId; } From a551db8911b47b0b4e50092e52d6563e6231abf9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 1 Nov 2022 16:49:22 +0800 Subject: [PATCH 14/16] =?UTF-8?q?61712=EF=BC=9A=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E7=9C=8B=E6=9D=BF-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=EF=BC=9A=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=EF=BC=8C?= =?UTF-8?q?=E6=98=AF=E5=B7=A5=E7=A8=8B=E5=B8=88=E3=80=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA=E8=A7=92=E8=89=B2=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=9F=A5=E7=9C=8B=E5=88=B0=E8=B7=9F=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82=E5=85=B6?= =?UTF-8?q?=E4=BD=99=E8=A7=92=E8=89=B2=E4=BF=9D=E7=95=99=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/enums/RoleEnum.java | 2 + .../system/service/ISysUserService.java | 13 ++ .../service/impl/SysUserServiceImpl.java | 42 ++++ .../mapper/xml/LawsComplianceBoardMapper.xml | 128 ++++++++-- .../impl/LawsComplianceBoardServiceImpl.java | 220 ++++++++++++++---- 5 files changed, 348 insertions(+), 57 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java index 5e344c977..0b743f160 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/RoleEnum.java @@ -4,6 +4,8 @@ public enum RoleEnum { ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2), MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3), COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4), + ENGINEERING_INTERFACE_PERSON("工程接口人","engineeringInterfacePerson","engineeringInterfacePerson","1534020084667674626",5), + ENGINEER("工程师","engineer","engineer","1534020318437208065",6), ; String name; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index b091fc0c4..4e3c3a59f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.SysUserCacheInfo; import com.jero.modules.system.entity.PPEmployee; import com.jero.modules.system.entity.SysRole; @@ -276,4 +277,16 @@ public interface ISysUserService extends IService { * @return */ boolean isAdministrator(); + + /** + * 验证当前登录用户是否是工程接口人角色 + * @return + */ + boolean isEngineeringInterfacePerson(LoginUser currentUser); + + /** + * 验证当前登录用户是否是工程师角色 + * @return + */ + boolean isEngineer(LoginUser currentUser); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 71dac6e67..bd91b606d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -614,4 +614,46 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + @Override + public boolean isEngineeringInterfacePerson(LoginUser currentUser) { + boolean result = false; + RoleEnum engineeringInterfacePerson = RoleEnum.ENGINEERING_INTERFACE_PERSON; + List userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); + if(CollectionUtils.isNotEmpty(userRoleList)){ + List userRoles = userRoleList.stream().filter(userRole -> { + boolean flag = false; + if(StringUtils.equals(userRole.getRoleId(),engineeringInterfacePerson.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(userRoles)){ + result = true; + } + } + return result; + } + + @Override + public boolean isEngineer(LoginUser currentUser) { + boolean result = false; + RoleEnum engineer = RoleEnum.ENGINEER; + List userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); + if(CollectionUtils.isNotEmpty(userRoleList)){ + List userRoles = userRoleList.stream().filter(userRole -> { + boolean flag = false; + if(StringUtils.equals(userRole.getRoleId(),engineer.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(userRoles)){ + result = true; + } + } + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index 6fdb1df82..002a6acae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -15,13 +15,54 @@ LEFT JOIN project_laws_inventory pli ON ( pli.stand_id = bdl.id ) LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id ) WHERE - ( - bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather where gather_result = #{params.gatherResult}) - OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation where flow_status = #{params.flowStatus}) - or pti.design_p_id IS NOT NULL - OR pti.prehomo_p_id IS NOT NULL - OR pti.verify_p_id IS NOT NULL - ) + + ( + bdl.id IN ( + SELECT + DISTINCT stand_id + FROM laws_opinion_gather + where gather_result = #{params.gatherResult} + ) + OR bdl.id IN ( + SELECT + DISTINCT stand_id + FROM laws_technology_evaluation + where flow_status = #{params.flowStatus} + ) + OR pti.design_p_id IS NOT NULL + OR pti.prehomo_p_id IS NOT NULL + OR pti.verify_p_id IS NOT NULL + ) + + + + ( + bdl.id IN ( + SELECT + DISTINCT stand_id + FROM + laws_opinion_gather + where gather_result = #{params.gatherResult} and evaluator_ids like CONCAT(CONCAT('%',#{params.currentUserId}),'%') + ) + OR bdl.id IN ( + SELECT + DISTINCT stand_id + FROM + laws_technology_evaluation + where flow_status = #{params.flowStatus} + and id in ( + select + laws_technology_evaluation_id + from + laws_technology_evaluation_flow_detail + where evaluator_id = #{params.currentUserId} + ) + ) + OR (pti.design_p_id IS NOT NULL and (pli.design_initiator_id = #{params.currentUserId} or pli.design_duty_id = #{params.currentUserId})) + OR (pti.prehomo_p_id IS NOT NULL and (pli.prehomo_initiator_id = #{params.currentUserId} or pli.prehomo_duty_id = #{params.currentUserId})) + OR (pti.verify_p_id IS NOT NULL and (pli.verify_initiator_id = #{params.currentUserId} or pli.verify_duty_id = #{params.currentUserId})) + ) + ${params.condition} GROUP BY bdl.id order by bdl.create_time desc @@ -34,6 +75,12 @@ pli.serial_number as "serialNumber", pli.title as "title", pli.project_library_id as "projectLibraryId", + pli.design_initiator_id as "designInitiatorId", + pli.design_duty_id as "designDutyId", + pli.prehomo_initiator_id as "prehomoInitiatorId", + pli.prehomo_duty_id as "prehomoDutyId", + pli.verify_initiator_id as "verifyInitiatorId", + pli.verify_duty_id as "verifyDutyId", pni.project_name as "projectName", pni.id as "projectNameId", pyni.year_name as "yearName", @@ -80,6 +127,16 @@ #{item} + + and( + pli.design_initiator_id = #{params.currentUserId} + or pli.design_duty_id = #{params.currentUserId} + or pli.prehomo_initiator_id = #{params.currentUserId} + or pli.prehomo_duty_id = #{params.currentUserId} + or pli.verify_initiator_id = #{params.currentUserId} + or pli.verify_duty_id = #{params.currentUserId} + ) + order by pli.create_time desc @@ -96,16 +153,57 @@ LEFT JOIN project_laws_inventory pli ON ( pli.stand_id = bdl.id ) LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id ) WHERE + ( - bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather) - OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation) - or pti.design_p_id IS NOT NULL - OR pti.prehomo_p_id IS NOT NULL - OR pti.verify_p_id IS NOT NULL + bdl.id IN ( + SELECT + DISTINCT stand_id + FROM laws_opinion_gather + where gather_result = #{params.gatherResult} ) - - ${params.condition} - + OR bdl.id IN ( + SELECT + DISTINCT stand_id + FROM laws_technology_evaluation + where flow_status = #{params.flowStatus} + ) + OR pti.design_p_id IS NOT NULL + OR pti.prehomo_p_id IS NOT NULL + OR pti.verify_p_id IS NOT NULL + ) + + + + ( + bdl.id IN ( + SELECT + DISTINCT stand_id + FROM + laws_opinion_gather + where gather_result = #{params.gatherResult} and evaluator_ids like CONCAT(CONCAT('%',#{params.currentUserId}),'%') + ) + OR bdl.id IN ( + SELECT + DISTINCT stand_id + FROM + laws_technology_evaluation + where flow_status = #{params.flowStatus} + and id in ( + select + laws_technology_evaluation_id + from + laws_technology_evaluation_flow_detail + where evaluator_id = #{params.currentUserId} + ) + ) + OR (pti.design_p_id IS NOT NULL and (pli.design_initiator_id = #{params.currentUserId} or pli.design_duty_id = #{params.currentUserId})) + OR (pti.prehomo_p_id IS NOT NULL and (pli.prehomo_initiator_id = #{params.currentUserId} or pli.prehomo_duty_id = #{params.currentUserId})) + OR (pti.verify_p_id IS NOT NULL and (pli.verify_initiator_id = #{params.currentUserId} or pli.verify_duty_id = #{params.currentUserId})) + ) + + + ${params.condition} + GROUP BY bdl.id order by bdl.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index e1742535b..be69a99c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -25,6 +25,7 @@ import com.jero.modules.project.service.ILawsComplianceBoardService; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; @@ -68,6 +69,8 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi private ISysDictItemService sysDictItemService; @Autowired private ProjectTaskInventoryDetailEOMapper projectTaskInventoryDetailEOMapper; + @Autowired + private ISysUserService sysUserService; @Override public IPage queryPageList(Map params) { @@ -81,6 +84,18 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi //只查询 法规技术评估流程状态、法规意见收集 收集结果 为已完成的数据 params.put("flowStatus", GatherResultEnum.COMPLETED.getValue()); params.put("gatherResult", GatherResultEnum.COMPLETED.getValue()); + + /** + * 2022-11-01 增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。 + */ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + boolean isEngineer = this.sysUserService.isEngineer(currentUser); + boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser); + if(isEngineer || isEngineeringInterfacePerson){ + params.put("currentUserId",currentUser.getId()); + params.put("isEngineerOrEngineeringInterfacePerson",true); + } + IPage page = new Page(pageNo, pageSize); IPage infoPage = this.lawsComplianceBoardMapper.queryPageList(page, params); List records = infoPage.getRecords(); @@ -142,18 +157,28 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi @Override public JSONObject queryComplianceResultList(Map params) { + /** + * 2022-11-01 增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。 + */ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + boolean isEngineer = this.sysUserService.isEngineer(currentUser); + boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser); + if(isEngineer || isEngineeringInterfacePerson){ + params.put("currentUserId",currentUser.getId()); + params.put("isEngineerOrEngineeringInterfacePerson",true); + } + JSONObject result = new JSONObject(); String id = (String) params.get("id"); String cut = (String) params.get("cut"); List> complianceResultList = this.lawsComplianceBoardMapper.queryComplianceResultList(params); if(CollectionUtils.isNotEmpty(complianceResultList)){ - LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List projectLawsInventoryIdList = complianceResultList.stream().map(map-> (String) map.get("id")).collect(Collectors.toList()); QueryWrapper taskDetailQueryWrapper = new QueryWrapper<>(); taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList); List projectTaskInventoryDetailEOList = this.projectTaskInventoryDetailEOMapper.selectList(taskDetailQueryWrapper); - this.createTaskInventoryEOList(complianceResultList,projectTaskInventoryDetailEOList,currentUser); - this.disposeComplianceResult(complianceResultList,cut); + this.createTaskInventoryEOList(complianceResultList,projectTaskInventoryDetailEOList,currentUser,isEngineer,isEngineeringInterfacePerson); + this.disposeComplianceResult(complianceResultList,cut,isEngineer,isEngineeringInterfacePerson); } result.put("complianceResultList",complianceResultList); @@ -161,6 +186,10 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi QueryWrapper opinionGatherEOQueryWrapper = new QueryWrapper<>(); opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id); opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult,GatherResultEnum.COMPLETED.getValue()); + //如果当前登录用户是工程师或工程接口人，只查询自己为评估人的法规意见收集数据。 + if(isEngineer || isEngineeringInterfacePerson){ + opinionGatherEOQueryWrapper.lambda().like(LawsOpinionGatherEO::getEvaluatorIds,currentUser.getId()); + } int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper); result.put("opinionGather",opinionGatherCount); @@ -168,6 +197,10 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi QueryWrapper evaluationEOQueryWrapper = new QueryWrapper<>(); evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id); evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus,GatherResultEnum.COMPLETED.getValue()); + //如果当前登录用户是工程师或工程接口人，只查询自己为评估人的法规技术评估数据。 + if(isEngineer || isEngineeringInterfacePerson){ + this.lawsTechnologyEvaluationEOService.createQueryPermission(evaluationEOQueryWrapper,null,false); + } int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper); result.put("technologyEvaluation",evaluationCount); return result; @@ -178,8 +211,14 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi * @param complianceResultList * @param projectTaskInventoryDetailEOList * @param currentUser + * @param isEngineer 是否是工程师角色 + * @param isEngineeringInterfacePerson 是否是工程接口人角色 */ - private void createTaskInventoryEOList(List> complianceResultList, List projectTaskInventoryDetailEOList, LoginUser currentUser) { + private void createTaskInventoryEOList(List> complianceResultList, + List projectTaskInventoryDetailEOList, + LoginUser currentUser, + boolean isEngineer, + boolean isEngineeringInterfacePerson) { if(CollectionUtils.isNotEmpty(complianceResultList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){ for (Map complianceResult : complianceResultList) { String designPid = ""; @@ -199,44 +238,97 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String verifyTaskStatus = ""; String verifyTaskDefinitionKey = ""; String verifyTaskDetailId = ""; - - for (ProjectTaskInventoryDetailEO projectTaskInventoryDetail : projectTaskInventoryDetailEOList) { - if(StringUtils.equals(complianceResult.get("id").toString(),projectTaskInventoryDetail.getProjectTaskInventoryId())){ - /** - * 查询数据权限，所有用户都是，自己的待办，可以跳转到处理任务详情页进行处理。 - * 不是自己的待办，只能跳转到处理任务的详情页。 - */ - if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue())){ - designPid = projectTaskInventoryDetail.getActiProcInstId(); - designTaskId = projectTaskInventoryDetail.getTaskId(); - designTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); - designTaskDetailId = projectTaskInventoryDetail.getId(); - if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ - designTaskStatus = projectTaskInventoryDetail.getStatus(); - }else { - designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + //2022-11-01 增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。 + if((isEngineer || isEngineeringInterfacePerson)){ + for (ProjectTaskInventoryDetailEO projectTaskInventoryDetail : projectTaskInventoryDetailEOList) { + if(StringUtils.equals(complianceResult.get("id").toString(),projectTaskInventoryDetail.getProjectTaskInventoryId())){ + /** + * 查询数据权限，所有用户都是，自己的待办，可以跳转到处理任务详情页进行处理。 + * 不是自己的待办，只能跳转到处理任务的详情页。 + */ + if(StringUtils.equals(complianceResult.get("designInitiatorId").toString(),currentUser.getId()) + || StringUtils.equals(complianceResult.get("designDutyId").toString(),currentUser.getId())){ + if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue())){ + designPid = projectTaskInventoryDetail.getActiProcInstId(); + designTaskId = projectTaskInventoryDetail.getTaskId(); + designTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); + designTaskDetailId = projectTaskInventoryDetail.getId(); + if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ + designTaskStatus = projectTaskInventoryDetail.getStatus(); + }else { + designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } + } + } + if(StringUtils.equals(complianceResult.get("prehomoInitiatorId").toString(),currentUser.getId()) + || StringUtils.equals(complianceResult.get("prehomoDutyId").toString(),currentUser.getId())){ + if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){ + prehomoPid = projectTaskInventoryDetail.getActiProcInstId(); + prehomoTaskId = projectTaskInventoryDetail.getTaskId(); + prehomoTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); + prehomoTaskDetailId = projectTaskInventoryDetail.getId(); + if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ + prehomoTaskStatus = projectTaskInventoryDetail.getStatus(); + }else { + prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } + } + } + if(StringUtils.equals(complianceResult.get("verifyInitiatorId").toString(),currentUser.getId()) + || StringUtils.equals(complianceResult.get("verifyDutyId").toString(),currentUser.getId())){ + if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){ + verifyPid = projectTaskInventoryDetail.getActiProcInstId(); + verifyTaskId = projectTaskInventoryDetail.getTaskId(); + verifyTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); + verifyTaskDetailId = projectTaskInventoryDetail.getId(); + if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ + verifyTaskStatus = projectTaskInventoryDetail.getStatus(); + }else { + verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } + } } } - if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){ - prehomoPid = projectTaskInventoryDetail.getActiProcInstId(); - prehomoTaskId = projectTaskInventoryDetail.getTaskId(); - prehomoTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); - prehomoTaskDetailId = projectTaskInventoryDetail.getId(); - if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ - prehomoTaskStatus = projectTaskInventoryDetail.getStatus(); - }else { - prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } + }else { + for (ProjectTaskInventoryDetailEO projectTaskInventoryDetail : projectTaskInventoryDetailEOList) { + if(StringUtils.equals(complianceResult.get("id").toString(),projectTaskInventoryDetail.getProjectTaskInventoryId())){ + /** + * 查询数据权限，所有用户都是，自己的待办，可以跳转到处理任务详情页进行处理。 + * 不是自己的待办，只能跳转到处理任务的详情页。 + */ + if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue())){ + designPid = projectTaskInventoryDetail.getActiProcInstId(); + designTaskId = projectTaskInventoryDetail.getTaskId(); + designTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); + designTaskDetailId = projectTaskInventoryDetail.getId(); + if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ + designTaskStatus = projectTaskInventoryDetail.getStatus(); + }else { + designTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } } - } - if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){ - verifyPid = projectTaskInventoryDetail.getActiProcInstId(); - verifyTaskId = projectTaskInventoryDetail.getTaskId(); - verifyTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); - verifyTaskDetailId = projectTaskInventoryDetail.getId(); - if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ - verifyTaskStatus = projectTaskInventoryDetail.getStatus(); - }else { - verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){ + prehomoPid = projectTaskInventoryDetail.getActiProcInstId(); + prehomoTaskId = projectTaskInventoryDetail.getTaskId(); + prehomoTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); + prehomoTaskDetailId = projectTaskInventoryDetail.getId(); + if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ + prehomoTaskStatus = projectTaskInventoryDetail.getStatus(); + }else { + prehomoTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } + } + if(StringUtils.equals(projectTaskInventoryDetail.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){ + verifyPid = projectTaskInventoryDetail.getActiProcInstId(); + verifyTaskId = projectTaskInventoryDetail.getTaskId(); + verifyTaskDefinitionKey = projectTaskInventoryDetail.getTaskDefinitionKey(); + verifyTaskDetailId = projectTaskInventoryDetail.getId(); + if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetail.getUserId())){ + verifyTaskStatus = projectTaskInventoryDetail.getStatus(); + }else { + verifyTaskStatus = TaskStatusEnum.SHOW_FLAG.getValue(); + } } } } @@ -267,10 +359,35 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi } } - public void disposeComplianceResult(List> complianceResultList,String cut){ + public void disposeComplianceResult(List> complianceResultList,String cut,boolean isEngineer,boolean isEngineeringInterfacePerson){ if(CollectionUtils.isNotEmpty(complianceResultList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List dutyTerritoryDictItemList = sysDictItemService.selectItemsByDictCode("duty_territory"); for (Map complianceResult : complianceResultList) { + if(isEngineer || isEngineeringInterfacePerson){ + if(!StringUtils.equals(complianceResult.get("designInitiatorId").toString(),currentUser.getId()) + || !StringUtils.equals(complianceResult.get("designDutyId").toString(),currentUser.getId())){ + complianceResult.put("designStatus",""); + complianceResult.put("designFlowTaskStatus",""); + complianceResult.put("designPId",""); + complianceResult.put("designPersonChargeFeedback",""); + } + if(!StringUtils.equals(complianceResult.get("prehomoInitiatorId").toString(),currentUser.getId()) + && !StringUtils.equals(complianceResult.get("prehomoDutyId").toString(),currentUser.getId())){ + complianceResult.put("prehomoStatus",""); + complianceResult.put("prehomoFlowTaskStatus",""); + complianceResult.put("prehomoPId",""); + complianceResult.put("prehomoPersonChargeFeedback",""); + } + if(!StringUtils.equals(complianceResult.get("verifyInitiatorId").toString(),currentUser.getId()) + && !StringUtils.equals(complianceResult.get("verifyDutyId").toString(),currentUser.getId())){ + complianceResult.put("verifyStatus",""); + complianceResult.put("verifyFlowTaskStatus",""); + complianceResult.put("verifyPId",""); + complianceResult.put("verifyPersonChargeFeedback",""); + } + } + if (complianceResult.get("designStatus") != null) { String textByValue = DesignComplianceStatusEnum.getTextByValue(complianceResult.get("designStatus").toString(), cut); complianceResult.put("designStatus_dicText",textByValue); @@ -342,6 +459,15 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String condition = this.getConditionStr(params); params.put("condition",StringUtils.isNotEmpty(condition) ? condition : ""); List> exportData = new ArrayList<>(); + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + boolean isEngineer = this.sysUserService.isEngineer(currentUser); + boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser); + if(isEngineer || isEngineeringInterfacePerson){ + params.put("currentUserId",currentUser.getId()); + params.put("isEngineerOrEngineeringInterfacePerson",true); + } + if(StringUtils.equals(exportAll,"no")){ IPage page = this.queryPageList(params); exportData = page.getRecords(); @@ -358,7 +484,7 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi List> complianceResultList = new ArrayList<>(); if(CollectionUtils.isNotEmpty(idList)){ complianceResultList = this.lawsComplianceBoardMapper.queryComplianceResultList(params); - this.disposeComplianceResult(complianceResultList,cut); + this.disposeComplianceResult(complianceResultList,cut,isEngineer,isEngineeringInterfacePerson); } String title = ""; @@ -468,8 +594,18 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi @Override public void exportComplianceResultDetail(HttpServletResponse response, HttpServletRequest request, Map params) { String cut = (String) params.get("cut"); + /** + * 2022-11-01 增加数据权限：如果当前登录用户，是工程师、工程接口人角色，只能查看到跟自己相关的数据。其余角色保留之前的查询结果。 + */ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + boolean isEngineer = this.sysUserService.isEngineer(currentUser); + boolean isEngineeringInterfacePerson = this.sysUserService.isEngineeringInterfacePerson(currentUser); + if(isEngineer || isEngineeringInterfacePerson){ + params.put("currentUserId",currentUser.getId()); + params.put("isEngineerOrEngineeringInterfacePerson",true); + } List> exportData = this.lawsComplianceBoardMapper.queryComplianceResultList(params); - this.disposeComplianceResult(exportData,cut); + this.disposeComplianceResult(exportData,cut,isEngineer,isEngineeringInterfacePerson); String title = ""; String fileName = ""; if(StringUtils.equals(cut, CutEnum.CN.getValue())){ From bc8ca6e924d5d36d277c8cb100c805a78309cff0 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 1 Nov 2022 16:54:22 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/engineeringConfirmation.vue | 102 ++++++++++-------- 1 file changed, 56 insertions(+), 46 deletions(-) diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 3028d1b80..34ffd4e5d 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -8,24 +8,24 @@
-
- - {{ $t('distributionEngineer') }} -
-
- - {{ $t('reminderHandling') }} -
-
- - {{ $t('addFeedback') }} -
+ + {{$t('distributionEngineer')}} + + + {{$t('addFeedback')}} + + + + + + +
{{$t('deleteLib')}} + + {{ $t('reminderHandling') }} + {{$t('dataLoading')}} - - - - - {{$t('reminder')}} - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -436,7 +441,7 @@ { title: this.$t('operation'), align: 'left', - width: 160, + width: 190, scopedSlots: { customRender: 'operation' } } ], @@ -722,7 +727,7 @@ _this.formInline.userId.splice(num, 1) _this.formInline.userId = _this.formInline.userId.join(',') _this.formInline = { ..._this.formInline } - if (id){ + if (id) { deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -829,7 +834,7 @@ line-height: 80px; .header-text { - font-size: 16px; + font-size: 18px; font-weight: 400; color: #000F16; } @@ -960,4 +965,9 @@ line-height: 200px; text-align: center; } + + .header-btn { + height: 38px; + margin-left: 16px; + } \ No newline at end of file From 47abdbe613f00ef13f309e0ab08e7a2c17325855 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 1 Nov 2022 17:42:31 +0800 Subject: [PATCH 16/16] =?UTF-8?q?61541=20-=20=E9=A1=B9=E7=9B=AE=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E8=B7=9F=E8=B8=AA=EF=BC=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E5=91=98=E6=8B=A5=E6=9C=89=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E6=9D=83=E9=99=90=EF=BC=8C=E5=85=B6=E5=AE=83=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=9A=84=E7=94=A8=E6=88=B7=E5=8F=AA=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=B7=9F=E8=87=AA=E5=B7=B1=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/mapper/xml/NcrTrackMapper.xml | 15 +++++++++------ .../project/service/impl/NcrTrackServiceImpl.java | 5 +++++ .../com/jero/modules/project/vo/NcrTrackVO.java | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml index cd15845a4..df5398987 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml @@ -80,12 +80,15 @@ or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track} or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track} ) - - and (pli.regulation_owner_id =#{ncrTrackVO.userId} - or pli.homologation_engineer_id =#{ncrTrackVO.userId} - or pli.engineering_interface_person =#{ncrTrackVO.userId} - or ptid.user_id =#{ncrTrackVO.userId} - ) + + + + and (pli.regulation_owner_id =#{ncrTrackVO.userId} + or pli.homologation_engineer_id =#{ncrTrackVO.userId} + or pli.engineering_interface_person =#{ncrTrackVO.userId} + or ptid.user_id =#{ncrTrackVO.userId} + ) + order by pli.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index aea3c5c7e..8abfc2f32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -80,6 +80,11 @@ public class NcrTrackServiceImpl extends ServiceImpl ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue()); ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue()); + + //如果当前登录用户是系统管理员角色，可以查看所有的数据 + boolean administrator = this.sysUserService.isAdministrator(); + ncrTrackVO.setAdministrator(administrator ? "true":"false"); + List infoList = ncrTrackMapper.getInfoList(ncrTrackVO); infoList = infoList.stream().distinct().collect(Collectors.toList()); List trackVOList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index 231f16f4c..5a6b0fd5c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -137,8 +137,8 @@ public class NcrTrackVO implements Serializable { private String projectTaskInventoryDetailId; //任务节点定义key private String taskDefinitionKey; - - + //是否是系统管理员角色 + private String administrator;