From b0ac1bb287707a4091f947030d26d04b3a555ee5 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 22 Aug 2022 09:21:21 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=94=BE=E5=BC=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProblemKnowledgeBaseEOServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index f1c728345..acb14a326 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -90,7 +90,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl Date: Mon, 22 Aug 2022 15:28:31 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 + jero-web/src/common/lang/zh-cn.js | 5 + .../components/batSetting.vue | 14 +- .../components/batchSettingPersonnel.vue | 418 ++++++++++++++++++ .../components/listOfRegulations.vue | 91 +++- 5 files changed, 509 insertions(+), 24 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1ef1adf3f..defc1db5c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -569,6 +569,8 @@ module.exports = { mergeTerms: 'Determine Merger Terms', documentSplitTemplate: 'Document Split Template', batSetting: 'Batch Setting', + batchSettingInformation:'Batch Setting Information', + batchSettingPersonnel:'Batch Setting Personnel', selectDirectoryTerms: 'Please Select the directory location to add terms', StandardBreakdown: 'Standard Breakdown', OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file', @@ -1269,4 +1271,7 @@ module.exports = { source:'Source', sourceEn:'Source (English)', onlyone:'Only one merge delimiter can be entered', + theInconsistentSameResponsibility:'The selected data responsibility fields are inconsistent; Please select the same responsibility', + taskConfirmedPersonnelCannotBeSetBatch:'When the task confirmation status is to be confirmed, personnel cannot be set in batch', + theSelectedDataResponsibilityFieldCannotEmpty:'The selected data responsibility field cannot be empty', } \ 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 c8118e520..1b20b6c2f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -576,6 +576,8 @@ module.exports = { mergeTerms: '确定合并条款', documentSplitTemplate: '文档拆分模板', batSetting: '批量设置', + batchSettingInformation:'批量设置信息', + batchSettingPersonnel:'批量设置人员', selectDirectoryTerms: '请选择添加条款的目录位置', selectDirectorylocation: '请选择添加文件夹的目录位置', OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件', @@ -1371,4 +1373,7 @@ module.exports = { source: '来源', sourceEn: '来源(英文)', onlyone:'只能输入一个合并分隔符', + theInconsistentSameResponsibility:'所选的数据责任领域不一致；请选择相同的责任领域', + taskConfirmedPersonnelCannotBeSetBatch:'任务确认状态为待确认时无法批量设置人员', + theSelectedDataResponsibilityFieldCannotEmpty:'所选数据责任领域不能为空', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index 4a1285e36..f215a1b33 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -1,6 +1,6 @@ @@ -445,6 +450,7 @@ import resultReportedUpload from './resultReportedUpload' import listOfRegulationsView from './listOfRegulationsView' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' + import batchSettingPersonnel from './batchSettingPersonnel' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' import moment from 'moment' import { mapGetters } from 'vuex' @@ -462,6 +468,7 @@ globalAdvancedQuery, fixedPlate, resultReportedUpload, + batchSettingPersonnel, listOfRegulationsView }, data() { @@ -1145,6 +1152,47 @@ this.$message.warning(this.$t('selectLeastOne')) } }, + batchSettingPersonnelClick() { + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + let isTrue + let content = [] + for (let i = 0; i < this.dataSource.length; i++) { + for (let j = 0; j < selectedRowKeys.length; j++) { + if (this.dataSource[i].id == selectedRowKeys[j]) { + content.push(this.dataSource[i]) + } + } + } + for (let i = 0; i < content.length; i++) { + if (!content[i].dutyTerritory) { + this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty')) + return + } + for (let j = 1; j < content.length; j++) { + if (content[i].dutyTerritory != content[j].dutyTerritory || !content[i].dutyTerritory) { + this.$message.warning(this.$t('theInconsistentSameResponsibility')) + return + } + } + } + for (let i = 0; i < content.length; i++) { + if (content[i].roleCode == '0' && + content[i].taskAffirmStatus != 'List to confirm') { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.$t('taskConfirmedPersonnelCannotBeSetBatch')) + return + } + } + if (isTrue) { + this.$refs.batchSettingPersonnelRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), content) + } + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, questionClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -2072,19 +2120,27 @@ bringInRelevantPersonnelClick() { let _this = this - this.$confirm({ - content: _this.$t('confirmBringInRelevantPersonnel'), - onOk() { - getAction(_this.url.matchRelevantPeople, { projectLibraryId: _this.$route.query.id }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$confirm({ + content: _this.$t('confirmBringInRelevantPersonnel'), + onOk() { + let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + getAction(_this.url.matchRelevantPeople, { + ids: selectedRowKeys.join(','), + projectLibraryId: _this.$route.query.id + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, resultReportedClick(val) { @@ -2306,12 +2362,13 @@ ::v-deep .ant-card-body { padding: 24px 24px 0 24px; } + ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 6332b145c..0492867a4 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -56,45 +56,47 @@
-
-
- {{item.projectName}} -
+
+
{{item}}
-
-
-
{{item}}
+
+
+
+ {{item.projectName}} +
-
-
-
-
-
{{val.name}}
-
{{val.name}}
- - - - - - +
+
+
+
+
+
{{val.name}}
+
{{val.name}} +
+ + + + + + - + +
+
+
+
+ {{handlingTime}}
-
-
- {{handlingTime}} -
-
{{this.$t('dataLoading')}}
@@ -308,8 +310,8 @@ }, getTimeline() { let query = { - startTime: this.startTime || this.getNewDate('before',6), - endTime: this.endTime || this.getNewDate('after',5), + startTime: this.startTime || this.getNewDate('before', 6), + endTime: this.endTime || this.getNewDate('after', 5), ...this.queryParam } this.loadingMain = true @@ -341,8 +343,8 @@ }, getTimelineList(time) { let query = { - startTime: this.startTime || this.getNewDate('before',6), - endTime: this.endTime || this.getNewDate('after',5), + startTime: this.startTime || this.getNewDate('before', 6), + endTime: this.endTime || this.getNewDate('after', 5), ...this.queryParam } getAction(this.url.timelineList, query).then((res) => { @@ -529,7 +531,7 @@ width: 100%; height: 500px; margin-bottom: 20px; - padding: 20px 58px 20px 10px; + padding: 0 58px 20px 10px; box-sizing: border-box; overflow: auto; } @@ -572,7 +574,7 @@ .box-top-content-left { width: 140px; float: left; - padding-top: 100px; + padding-top: 57px; margin-right: 20px; } @@ -597,6 +599,12 @@ display: flex; flex-direction: row; justify-content: space-between; + position: sticky; + top: 0; + background: #fff; + z-index: 100; + padding-top: 20px; + padding-left: 160px; } .box-top-content-right-top-text { @@ -620,7 +628,7 @@ .box-top-content-right-bottom { position: relative; - padding-top: 60px; + padding-top: 50px; } .process-content { @@ -657,18 +665,20 @@ left: 50%; transform: translate(-50%, -50%); } - .process-content-right-button{ - font-size: 12px; - color: #040B29; - width: 75px; - background: #fff; - display: inline-block; - overflow: hidden; - position: absolute; - top: 12px; - left: 50%; - transform: translate(-50%, -50%); - } + + .process-content-right-button { + font-size: 12px; + color: #040B29; + width: 75px; + background: #fff; + display: inline-block; + overflow: hidden; + position: absolute; + top: 12px; + left: 50%; + transform: translate(-50%, -50%); + } + .process-content-right-button { width: 75px; font-size: 12px; @@ -706,5 +716,6 @@ font-weight: bold; font-size: 14px; width: 100px; + z-index: 101; } \ No newline at end of file From a001f8e65f86754b63ffeeb53068ce61a34b22db Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 23 Aug 2022 11:41:27 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0log=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91,?= =?UTF-8?q?=E5=A4=8D=E5=88=B6,=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index f3424e520..1013b4130 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -426,7 +426,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy); //设置更新log - setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); +// setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); //验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程 @@ -2593,14 +2593,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了“"+serialNumber+"”"; - String enContentLog = username+" copied “"+serialNumber+"”"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); - projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String username = sysUser.getUsername(); +// String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId(); +// String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); +// String contentLog = username+"复制了“"+serialNumber+"”"; +// String enContentLog = username+" copied “"+serialNumber+"”"; +// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); +// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); } @@ -2867,15 +2867,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Tue, 23 Aug 2022 13:39:46 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E8=B0=83=E5=8F=96=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=97=B6?= =?UTF-8?q?,=E5=A6=82=E6=9E=9C=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= =?UTF-8?q?=E4=B8=BA=E5=A4=9A=E4=B8=AA=E7=9A=84=E8=AF=9D,=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=BA=E5=A4=9A=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 1013b4130..419b6efb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -236,11 +236,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,projectLawsInventoryEO.getDummyInventoryBaseId()); List dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper); + List dummyInventoryInfoEOListNew = new ArrayList<>(); if(dummyInventoryInfoEOList.size() != 0){ List projectLawsInventoryEOS = new ArrayList<>(); if(projectLawsInventoryEOList.size() ==0){ - //此时法规清单中没有数据,直接将维护清单中的数据添加即可 + //责任领域如果有多个,则需要拆分成多条 for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) { + String dutyTerritory = dummyInventoryInfoEO.getDutyTerritory(); + if(StringUtils.isNotBlank(dutyTerritory)){ + for (String dutyTerritoryOne : dutyTerritory.split(",")) { + DummyInventoryInfoEO dummyInventoryInfoEONew = new DummyInventoryInfoEO(); + BeanUtils.copyProperties(dummyInventoryInfoEO,dummyInventoryInfoEONew); + dummyInventoryInfoEONew.setDutyTerritory(dutyTerritoryOne); + dummyInventoryInfoEOListNew.add(dummyInventoryInfoEONew); + } + }else{ + dummyInventoryInfoEOListNew.add(dummyInventoryInfoEO); + } + } + + //此时法规清单中没有数据,直接将维护清单中的数据添加即可 + for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) { ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp); @@ -253,7 +269,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOListTemp = new ArrayList<>(); - for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) { + for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) { List collect = projectLawsInventoryEOList.stream() .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); if(collect.size() != 0){