From 07b0e182b45cfec37edb60c6225e1b1275004cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 6 Apr 2023 17:41:53 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 ++++ jero-web/src/common/lang/zh-cn.js | 4 ++++ .../virtualList/components/virtualListDetails.vue | 2 +- .../components/certificationList/index.vue | 8 +++++--- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f5db35940..8361bda05 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1761,4 +1761,8 @@ module.exports = { reviewAndReturn:'Review and return', marketRegulationListDetails:'Market Regulation List Details', marketRegulationList:'Market Regulation List', + onlyDataWithTheCurrentCanBeManipulated:'Only data with the current user as the responsible person can be manipulated', + andTheAndTaskPendingConfirmation:'And the process status is Result Pending Submission, Review Returned, and Task Pending Confirmation', + andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation', + andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e16d3e20b..051347912 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1863,4 +1863,8 @@ module.exports = { electroniccontrollerparameter:'电子控制器参数', marketRegulationListDetails:'市场法规清单详情', marketRegulationList:'市场法规清单', + onlyDataWithTheCurrentCanBeManipulated:'仅能操作责任人为当前用户的数据', + andTheAndTaskPendingConfirmation:'并且流程状态为结果待提交、审查退回、任务待确认', + andProcessStatusIsTaskPendingConfirmation:'并且流程状态为任务待确认', + andPendingSubmissionReviewReturned:'并且流程状态为结果待提交、审查退回', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 4f0017e66..4e43c1213 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1594,7 +1594,7 @@ font-weight: 400; color: #6F7385; display: inline-block; - width: 100px; + width: 130px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 4d29599b1..5ab1f0ab9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1542,7 +1542,7 @@ } this.toDoData = '' if (this.toDoNotConditions && this.toDoNotConditions.length > 0) { - this.toDoData = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('data') + this.toDoData = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andTheAndTaskPendingConfirmation') } if (this.toDoIds && this.toDoIds.length > 0) { this.$refs.SelectedByRef.getPush() @@ -1714,7 +1714,8 @@ } let data = '' if (notConditions && notConditions.length > 0) { - data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andProcessStatusIsTaskPendingConfirmation') } if (ids && ids.length > 0) { this.submitTask(value, prompt, ids, notConditions, data) @@ -1769,7 +1770,8 @@ } let data = '' if (notConditions && notConditions.length > 0) { - data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andPendingSubmissionReviewReturned') } if (ids && ids.length > 0) { this.submitTask(value, prompt, ids, notConditions, data) From 5adc74d1de2f60f5d0999ad5c18de5c35a3255dc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 6 Apr 2023 17:43:32 +0800 Subject: [PATCH 02/15] =?UTF-8?q?67892bug=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DummyInventoryInfoEOServiceImpl.java | 10 +++++----- jero-web/src/views/processCenter/ProcessMapping.vue | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 929870332..bcbc5a8fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1181,13 +1181,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 0) { data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected') - detailedWarningList.push(
{data}
) + detailedWarningList.push( < div > { data } < /div>) } - if (notConditionsOne && notConditionsOne.length > 0){ - dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission') - detailedWarningList.push(
{dataOne}
) + if (notConditionsOne && notConditionsOne.length > 0) { + dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、') + '"' + this.$t('operationWithoutPermission') + detailedWarningList.push( < div > { dataOne } < /div>) } if (ids && ids.length > 0) { - this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList) + this.$refs.referenceDeliverablesListRef.transferModel(ids, detailedWarningList) } else { this.failedMessageOne(detailedWarningList) } @@ -1542,7 +1542,7 @@ } this.toDoData = '' if (this.toDoNotConditions && this.toDoNotConditions.length > 0) { - this.toDoData = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andTheAndTaskPendingConfirmation') + this.toDoData = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andTheAndTaskPendingConfirmation') } if (this.toDoIds && this.toDoIds.length > 0) { this.$refs.SelectedByRef.getPush() @@ -1715,7 +1715,7 @@ let data = '' if (notConditions && notConditions.length > 0) { // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') - data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andProcessStatusIsTaskPendingConfirmation') + data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andProcessStatusIsTaskPendingConfirmation') } if (ids && ids.length > 0) { this.submitTask(value, prompt, ids, notConditions, data) @@ -1729,6 +1729,15 @@ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let ids = [] let notConditions = [] + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].valueType == 'text' || this.selectedRowKeysList[i].valueType == 'select' || + this.selectedRowKeysList[i].valueType == 'file') { + if (!this.selectedRowKeysList[i].deliveryResult) { + this.$message.warning(this.$t('inspectionItems')+'"'+this.selectedRowKeysList[i].inspectionItem+'"'+this.$t('deliverablesFor')+this.$t('cannotEmpty')) + return + } + } + } if (this.roleSwitchingCode == 20) { this.submitClickJC(value, prompt) return @@ -1771,7 +1780,7 @@ let data = '' if (notConditions && notConditions.length > 0) { // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') - data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andPendingSubmissionReviewReturned') + data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andPendingSubmissionReviewReturned') } if (ids && ids.length > 0) { this.submitTask(value, prompt, ids, notConditions, data) @@ -1857,7 +1866,7 @@ } }) window.open(newUrl.href, '_blank') - }, + } } } @@ -2207,7 +2216,8 @@ color: #00B3BE; cursor: pointer; } - .operator-text-title:last-child{ + + .operator-text-title:last-child { margin-bottom: 0; } From b08d03b39c11963d815de236a5c4bcc9d08a1dab Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 6 Apr 2023 18:32:39 +0800 Subject: [PATCH 06/15] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95-5?= =?UTF-8?q?3=E6=9D=A1=EF=BC=8C=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=A4=B4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AuthDummyInventoryInfoEO.java | 7 ++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 34 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index d4e9f4589..fce9cc117 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -142,4 +142,11 @@ public class AuthDummyInventoryInfoEO implements Serializable { @TableField(exist = false) @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; + + @TableField(exist = false) + private String orderByField; + + // 1顺序 2倒序 + @TableField(exist = false) + private String orderBy; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 6a36942a6..6ccf3ec38 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -587,11 +587,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + + String orderByField = authDummyInventoryInfoEO.getOrderByField(); + String orderBy = authDummyInventoryInfoEO.getOrderBy(); + // 如果排序字段不为空 + if(org.apache.commons.lang.StringUtils.isNotEmpty(orderByField)){ +// if (StringUtils.equals(orderBy,"2")) { +// orderBy = " DESC"; +// }else { +// orderBy = " ASC"; +// } + // 转换字段 + orderByField = convertOrderByField(orderByField); + queryWrapper.orderBy(true, "1".equals(orderBy)?true:false, orderByField); + }else { + queryWrapper.orderByDesc("create_time"); + } + List authDummyInventoryInfoEOList = this.list(queryWrapper); return authDummyInventoryInfoEOList; } + private String convertOrderByField(String orderByField) { + if(StringUtils.isEmpty(orderByField)){ + return null; + } + switch (orderByField) { + case "category" : return "category"; + case "inspectionItem" : return"inspection_item"; + case "configItem" : return"config_item"; + case "wvtaId" : return"wvta_id"; + case "serialNumber" : return "serial_number"; + case "dutyTerritory" : return "duty_territory"; + case "deliverableType" : return "deliverable_type"; + default: return null; + } + } + @Override public Result copyInfoByIds(String ids, String cut) { String resultMsg = ""; From 91a62607946bd5fc90b753e19bf74def60f19aec Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 6 Apr 2023 19:24:08 +0800 Subject: [PATCH 07/15] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C57=E6=9D=A1=EF=BC=8C=E7=9B=B8=E5=85=B3=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95=E6=9F=A5=E8=AF=A2=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=E5=A4=9A=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ProjectRelatedPersonnelMapper.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index 961232976..1bb3befd2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -45,7 +45,19 @@ prp.project_id=#{projectId} - AND prp.duty_territory=#{dutyTerritory} + AND ( + prp.duty_territory=#{dutyTerritory} + or prp.duty_territory in + + #{item} + + + ) AND prp.law_engineer like concat(concat('%',#{lawEngineer}),'%') From 421bc6091e1622efbef336c9547c770f98f97c6b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 6 Apr 2023 19:36:30 +0800 Subject: [PATCH 08/15] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95-8?= =?UTF-8?q?3=E6=9D=A1=EF=BC=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E8=B0=83=E5=8F=96=E3=80=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BA=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E4=B8=BA=EF=BC=9A=E5=BE=85=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index a8caddcae..3e385aa0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -497,6 +497,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 6 Apr 2023 19:50:51 +0800 Subject: [PATCH 09/15] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C82=E6=9D=A1=EF=BC=8C=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9=E4=B8=BA=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=9C=8B=E5=88=B0=E6=89=80=E6=9C=89=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E4=B8=BA=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 3e385aa0b..bea654570 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1355,7 +1355,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl flowStatusList = new ArrayList<>(); + /*List flowStatusList = new ArrayList<>(); flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); @@ -1368,7 +1368,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 6 Apr 2023 20:12:59 +0800 Subject: [PATCH 10/15] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C73=E6=9D=A1=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 7 +++++-- .../todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java | 6 +++--- .../todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java | 6 +++--- .../java/com/jero/modules/wkflow/enums/FlowTypeEnum.java | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index bea654570..cdf2cc024 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -348,13 +348,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { + return StringUtils.isNotBlank(all); + }).distinct().collect(Collectors.toList()); + /** for(String all : allList){ if(all.equals("")){ allList.remove(all); } } - + */ //遍历所有人alllist中是否包含责任人,如果包含，不用操作。 //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java index 8c21a7240..daf973c67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java @@ -10,9 +10,9 @@ public enum DesignComplianceFlowNodeKeyEnum { FQLC("发起流程","Initiate the process","fqlc"), ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 - ZRRTJJFW("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物" - DEZRRTJJFW("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 - FGGCSSH("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核 + ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核 ; String cnName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java index 7c301023b..45149aa74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java @@ -10,9 +10,9 @@ public enum VerifyComplianceFlowNodeKeyEnum { FQLC("发起流程","Initiate the process","fqlc"), ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 - ZRRTJJFW("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物" - DEZRRTJJFW("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 - FGGCSSH("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核 + ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核 ; String cnName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 3e03084eb..369aa2614 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -10,9 +10,9 @@ import org.apache.commons.lang3.StringUtils; public enum FlowTypeEnum { RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc","清单任务确认","List task Confirmation"), - SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性确认","Design conformance verification"), + SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性流程","Design Compliance Process"), PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc","Pre-Homo确认","The Pre - Homo confirmation"), - YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"), + YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性流程","Verify Compliance Process"), FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"), FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"), QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"), From d430680843935985b0d9335e57b81d315473f1e8 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 6 Apr 2023 20:30:49 +0800 Subject: [PATCH 11/15] update --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 dbb15ca4c..2930eae6a 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 @@ -1765,6 +1765,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Thu, 6 Apr 2023 21:55:42 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=A0=B9=E6=8D=AEprojectId=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelController.java | 13 +++++++++++ .../IProjectRelatedPersonnelService.java | 7 ++++++ .../ProjectRelatedPersonnelServiceImpl.java | 22 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index a8af91796..f89d94d31 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -247,4 +247,17 @@ public class ProjectRelatedPersonnelController extends JeroController queryLawEngineerByProjectId(@RequestParam Map params){ + List> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params); + return Result.OK(regulatoryEngineerMapList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 29f18ec42..bb91c7abd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -94,4 +94,11 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(String projectId); void setBatch(ProjectRelatedPersonnel projectRelatedPersonnel); + + /** + * 根据项目库id，查询相关人员名单中的法规工程师 + * @param params + * @return + */ + List> queryLawEngineerByProjectId(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index bcf2f4e85..0bae6ed58 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1803,4 +1803,26 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> queryLawEngineerByProjectId(Map params) { + List> resultList = new ArrayList<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId)); + if(CollectionUtils.isNotEmpty(prpEoList)){ + String lawEngineerIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getLawEngineer())) + .map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.joining(",")); + List lawEngineerList = this.sysUserService.querySysUserListByIdList(Arrays.asList(lawEngineerIds.split(","))); + if(CollectionUtils.isNotEmpty(lawEngineerList)){ + for (SysUser lawEngineer : lawEngineerList) { + Map certificationEngineerMap = new HashMap<>(); + certificationEngineerMap.put("id",lawEngineer.getId()); + certificationEngineerMap.put("userName",lawEngineer.getUsername()); + resultList.add(certificationEngineerMap); + } + } + } + return resultList; + } + } From d79fa722688977d46be73b1c0e62803aa770b1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 7 Apr 2023 09:22:37 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AD=9B=E9=80=89=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E6=97=B6=EF=BC=8C=E6=8C=89=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=86=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 80 ++++++++++++------- 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3f8dd365c..64086cda2 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -347,22 +347,22 @@ :title="text">{{text}} - - - - - - - - - - - - - -
- {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} -
+ + + + + + + + + + + + + +
+ {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} +
@@ -1127,12 +1127,6 @@ text: this.$t('areaOfResponsibility'), dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, - { - type: 'Personnel', - value: 'regulationOwnerId', - valueName: 'regulationOwnerIdName', - text: this.$t('regulatoryEngineer') - }, { type: 'Personnel', value: 'engineeringInterfacePerson', @@ -1318,6 +1312,7 @@ mounted() { this.JLoading = true this.getHeader() + this.queryLawEngineerByProjectId() this.getRoleByUserId(() => { this.getAndUserId() }) @@ -1366,7 +1361,32 @@ handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, + queryLawEngineerByProjectId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectRelatedPersonnel/queryLawEngineerByProjectId', query).then((res) => { + if (res.success) { + let regulatoryEngineer = { + value: 'regulationOwnerId', + text: this.$t('regulatoryEngineer'), + options:[], + } + if (res.result && res.result.length > 0){ + res.result.forEach(val=>{ + regulatoryEngineer.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(regulatoryEngineer) + } else { + } + }) + }, //流程状态点击事件 designFlowStatusClick(row, name) { let query = {} @@ -2081,7 +2101,7 @@ projectLibraryId: this.$route.query.id, orderBy: this.orderBy, orderByField: this.orderByField, - roleCode: roleCode, + roleCode: roleCode // pageNo: this.pageNo, // pageSize: this.pageSize } @@ -3029,15 +3049,17 @@ } ::v-deep .page .ant-select-selection__rendered { - height: 32px!important; - line-height: 32px!important; + height: 32px !important; + line-height: 32px !important; } - ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){ + + ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) { text-align: left; - padding-left: 16px!important; + padding-left: 16px !important; } - .operator-text-title:last-child{ - margin-bottom: 0; + + .operator-text-title:last-child { + margin-bottom: 0; }