From c30cb597f3588e850c629e80f532f014f8bb9d37 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 15:46:09 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../parameter/managementdetails/index.vue | 251 +++++++++++++++++- .../ParameterItemCollectionList.vue | 246 ++++++++++++++++- 4 files changed, 495 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d7facbfbc..0d78ec8e3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1746,4 +1746,5 @@ module.exports = { andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list', pleasefillintherange:'Please fill in the range', databasereportingtime:'Synchronize the database reporting time', + synchronizationtime:'Synchronization time', } \ 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 f25e6f914..c7c595952 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1848,4 +1848,5 @@ module.exports = { andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据', pleasefillintherange:'请填写范围', databasereportingtime:'同步上报库时间', + synchronizationtime:'同步时间', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index f6fa244d4..2077e1322 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -100,6 +100,36 @@ {{$t('CustomExport')}} + + + +
+ + {{ $t('customize') }} +
+
@@ -233,7 +263,110 @@ NotSelectedRowKeysValue: [], NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有 NotSelectedNoEngineerValue: [], - paramsManifest: {} + paramsManifest: {}, + customizevisible: false, + indeterminate: false, + checkAll: false, + selectedValue: [], + checkedList: ['NiONumber', 'ParameterName', 'operation'], + customizeList: [ + { + sort: '1', + name: this.$t('NiONumber'), + disabled: true, + headFieldCn: 'NIO编号', + headFieldEn: 'NiONumber', + field: 'NiONumber', + key: 1, + moduleFlag: '上报库', + status: 1 + }, + { + sort: '2', + disabled: true, + name: this.$t('ParameterName'), + headFieldCn: '参数名称', + headFieldEn: 'Parameter Name', + field: 'ParameterName', + key: 2, + moduleFlag: '上报库', + status: 2 + }, + { + sort: '', + name: this.$t('ParameterDescription'), + headFieldCn: '参数说明', + headFieldEn: 'Parameter Description', + field: 'ParameterDescription', + key: 3, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('status'), + headFieldCn: '状态', + headFieldEn: 'status', + field: 'status', + key: 4, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('areaOfResponsibility'), + headFieldCn: '责任领域', + headFieldEn: 'Responsible Field', + field: 'areaOfResponsibility', + key: 5, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('engineeringInterfacePerson'), + headFieldCn: '工程接口人', + headFieldEn: 'Eng. Interface', + field: 'engineeringInterfacePerson', + key: 6, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('completedBy'), + headFieldCn: '填写人', + headFieldEn: 'Filled by', + field: 'completedBy', + key: 15, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('Version'), + headFieldCn: '版本', + headFieldEn: 'Version', + field: 'Version', + key: 23, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('synchronizationtime'), + headFieldCn: '同步时间', + headFieldEn: 'Synchronization time', + field: 'synchronizationtime', + key: 21, + moduleFlag: '上报库' + }, + { + sort: '', + disabled: true, + name: this.$t('operation'), + headFieldCn: '操作', + headFieldEn: 'Operation', + key: 35, + field: 'operation', + moduleFlag: '上报库', + status: 2 + } + ], } }, props: {}, @@ -243,6 +376,52 @@ document.title = this.$t('ParameterViewPage') }, methods: { + onCheckAllChange(e) { + let selectedValue = ['NiONumber', 'ParameterName', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue + this.selectedValue = this.checkedList + this.indeterminate = false + }, + onChange() { + this.selectedValue = this.checkedList + }, + getcustomize() { + this.customizevisible = true + }, + cancel() { + this.customizevisible = false + }, + handleSubmitcustomize() { + let list = [] + let uniqueArray = this.selectedValue.filter((item, index, array) => { + return array.indexOf(item) === index + }) + uniqueArray.forEach(item => { + this.customizeList.forEach((val, index) => { + if (item == val.field) { + val.sort = index + 1 + list.push(val) + } + }) + }) + this.confirmLoading = true + let headCustomEOList = JSON.parse(JSON.stringify(list)) + let query = { + headCustomEOList: headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false + this.$refs.CollectionTabel.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + this.customizevisible = false + } + }) + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, @@ -588,7 +767,43 @@ text-align: right; margin-top: 20px; } + .customize-text { + /*height: 1533px;*/ + display: flex; + flex-direction: column; + align-items: flex-start; + } + .customize-text-title { + margin-left: 0; + font-size: 14px; + font-weight: 400; + color: #040B29; + margin-bottom: 22px; + } + .drawer-bootom-button { + position: absolute; + bottom: 0; + z-index: 100; + width: 100%; + border-top: 1px solid #e8e8e8; + padding: 10px 16px; + text-align: right; + left: 0; + background: #fff; + border-radius: 0 0 2px 2px; + } + .ant-table-placeholder { + padding: 0; + border-top: none; + } + + .itemModelComment .ant-form-item-control-wrapper { + width: 100% !important; + } + .second { + padding: 0 !important; + } .operator-text-left { font-size: 14px; margin-right: 20px; @@ -641,4 +856,38 @@ .Required { color: red; } + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 968fc7dff..0756617be 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -268,7 +268,36 @@ {{$t('CompulsoryWithdrawal')}}
- + + + +
+ + {{ $t('customize') }} +
+
{{this.$t('pleaseWaitWhileRunning')}} +
@@ -539,6 +569,7 @@ import parameterColumn from '../dialog/parametercolumn' import { getAction, postAction, downloadFile } from '../../../api/manage' import eventBUs from '../../../common/event' + import customizeList from './customizeList' import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index' @@ -560,6 +591,7 @@ components: { TableCollection, ParameterLibraryAdd, + customizeList, parameterColumn, AssignedBy, AssignedByHomo, @@ -711,6 +743,110 @@ dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 } ], + customizevisible: false, + indeterminate: false, + checkAll: false, + selectedValue: [], + checkedList: ['NiONumber', 'ParameterName', 'operation'], + customizeList: [ + { + sort: '1', + name: this.$t('NiONumber'), + disabled: true, + headFieldCn: 'NIO编号', + headFieldEn: 'NiONumber', + field: 'NiONumber', + key: 1, + moduleFlag: '参数收集', + status: 1 + }, + { + sort: '2', + disabled: true, + name: this.$t('ParameterName'), + headFieldCn: '参数名称', + headFieldEn: 'Parameter Name', + field: 'ParameterName', + key: 2, + moduleFlag: '参数收集', + status: 2 + }, + { + sort: '', + name: this.$t('ParameterDescription'), + headFieldCn: '参数说明', + headFieldEn: 'Parameter Description', + field: 'ParameterDescription', + key: 3, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('status'), + headFieldCn: '状态', + headFieldEn: 'status', + field: 'status', + key: 4, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('areaOfResponsibility'), + headFieldCn: '责任领域', + headFieldEn: 'Responsible Field', + field: 'areaOfResponsibility', + key: 5, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('engineeringInterfacePerson'), + headFieldCn: '工程接口人', + headFieldEn: 'Eng. Interface', + field: 'engineeringInterfacePerson', + key: 6, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('completedBy'), + headFieldCn: '填写人', + headFieldEn: 'Filled by', + field: 'completedBy', + key: 15, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('Deadline'), + headFieldCn: '截止时间', + headFieldEn: 'Due Date', + field: 'designDueDate', + key: 23, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('databasereportingtime'), + headFieldCn: '同步上报库时间', + headFieldEn: 'database reporting time', + field: 'databasereportingtime', + key: 23, + moduleFlag: '参数收集' + }, + + { + sort: '', + disabled: true, + name: this.$t('operation'), + headFieldCn: '操作', + headFieldEn: 'Operation', + key: 35, + field: 'operation', + moduleFlag: '参数收集', + status: 2 + } + ], selectedRowKeys: [], textLoading: false, formInline: {}, @@ -1587,6 +1723,52 @@ } }) }, + onCheckAllChange(e) { + let selectedValue = ['NiONumber', 'ParameterName', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue + this.selectedValue = this.checkedList + this.indeterminate = false + }, + onChange() { + this.selectedValue = this.checkedList + }, + getcustomize() { + this.customizevisible = true + }, + cancel() { + this.customizevisible = false + }, + handleSubmitcustomize() { + let list = [] + let uniqueArray = this.selectedValue.filter((item, index, array) => { + return array.indexOf(item) === index + }) + uniqueArray.forEach(item => { + this.customizeList.forEach((val, index) => { + if (item == val.field) { + val.sort = index + 1 + list.push(val) + } + }) + }) + this.confirmLoading = true + let headCustomEOList = JSON.parse(JSON.stringify(list)) + let query = { + headCustomEOList: headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false + this.$refs.CollectionTabel.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + this.customizevisible = false + } + }) + }, // // 下发收集---请求接口 // distributionAndCollection() { // @@ -2177,7 +2359,7 @@ } } - \ No newline at end of file From 0bfdff4e7219b5c127d5b8f1580724c4e6576e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 15:59:33 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../library/docDetail/index.vue | 42 +++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 574b31938..0a7af1fd7 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -51,11 +51,15 @@ {{val}}
-
{{ol.db_field_txt}} {{ol.db_field_txt}} - {{ol.value ? ol.value+'的时间更好的付款就给和看景点风光和的空间古典风格' : '--'}} + {{ol.value ? ol.value : '--'}} Date: Mon, 3 Apr 2023 16:02:41 +0800 Subject: [PATCH 03/29] update --- .../src/views/projectManagement/historicalVersion/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/historicalVersion/index.vue b/jero-web/src/views/projectManagement/historicalVersion/index.vue index 8737d6ac9..21c53d6ec 100644 --- a/jero-web/src/views/projectManagement/historicalVersion/index.vue +++ b/jero-web/src/views/projectManagement/historicalVersion/index.vue @@ -415,7 +415,7 @@ } query = { actiProcInstId: row.designPId, - projectTaskInventoryId: row.id, + projectTaskInventoryId: row.projectLawsInventoryId, projectLibraryId: row.projectLibraryId, TaskKey: TaskKey, isDisplay: false, @@ -445,7 +445,7 @@ } query = { actiProcInstId: row.verifyPId, - projectTaskInventoryId: row.id, + projectTaskInventoryId: row.projectLawsInventoryId, projectLibraryId: row.projectLibraryId, TaskKey: TaskKey, flowType: 4, From 3c462393ac63e9efc429ef058dac01e467b976d6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 16:04:48 +0800 Subject: [PATCH 04/29] bug 67654 --- .../vehicleinformation/components/basicInformation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index d68f43ccd..d45d03b2c 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -305,7 +305,7 @@ import { message } from 'ant-design-vue' if(item.cpxh==null){ item.cpxh='' } - obj.value=item.ggpc+'-'+item.cpmc+'-'+item.cpxh + obj.value=item.cpdjbh+'-'+item.ggpc+'-'+item.cpxh this.selectList.push(obj) }) } From 01485dad2b743ea71893929d8793bfe231521f38 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 16:07:14 +0800 Subject: [PATCH 05/29] bug 67654 --- .../upgradeactivityrecord/components/upgradetargetmodel.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index a40abd2ea..152728cd1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -343,7 +343,6 @@ export default { }, changeId(value, option) { - debugger this.$nextTick(() => { this.form = { ...this.form } this.$refs.ruleForm.validateField('bapc') From 0e848b2595ffed60e298d09421c9f1fcc420e7a1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 3 Apr 2023 16:37:52 +0800 Subject: [PATCH 06/29] bug 67654 --- .../components/upgradetargetmodel.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 152728cd1..86eac3fb6 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -187,6 +187,7 @@ export default { projectNameList2: [], selectListPc: [], selectListMb: [], + flag:'', rules: { babh: [ { required: true, message: this.$t('upgraderecordnumber') + this.$t('cannotEmpty'), trigger: 'blur' } @@ -277,9 +278,11 @@ export default { this.form.otaId = otaId postAction('/ota/otaBaSjSjmbcx/add', { otaId: otaId, ...this.form }).then(res => { if (res.code == 200) { + this.flag = 1 localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) this.getData() + } }) } else { @@ -295,11 +298,17 @@ export default { // this.$refs.ruleForm.clearValidate('bapc') // }) // } - this.$refs.ruleForm.validate(valid => { - if (valid) { + // this.$refs.ruleForm.validate(valid => { + // if (valid) { + setTimeout(()=>{ + console.log(this.flag) + if(this.flag == 1){ this.$emit('basicInformationForm') } - }) + },1000) + + // } + // }) }, @@ -344,7 +353,7 @@ export default { }, changeId(value, option) { this.$nextTick(() => { - this.form = { ...this.form } + // this.form = { ...this.form } this.$refs.ruleForm.validateField('bapc') }) this.selectListPc.map(item => { From db54040f1a7789d82cda0aabe1cbd4eed04e25ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 17:03:16 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentManage/library/docDetail/index.vue | 2 +- .../projectManagement/components/certificationList/index.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 0a7af1fd7..dac92f625 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -1026,7 +1026,7 @@ } .TextInformation-box-box-text { - width: calc(25% - 20px); + width: calc(50% - 20px); margin-right: 20px; height: 36px; float: left; diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index e4b0bf2b9..407749f5e 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -258,6 +258,7 @@ ref="table" class="customizetable" :loading="loading" + :components="drag(columns,'columnsAll')" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 300px)'}" rowKey="id" @@ -489,12 +490,14 @@ import SelectedBy from '@/components/SelectedBy/index' import referenceDeliverablesList from './components/referenceDeliverablesList' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import moment from 'moment' import { mapGetters } from 'vuex' export default { name: 'index', props: ['isDisplayNum'], + mixins: [ResizeColumnProvide, ResizeHeader], components: { globalAdvancedQuery, ImportFile, From 89f88b5c2f99b50f669d9a795c1a402a0f905509 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 17:29:49 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BA=86=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E3=80=81?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8A=9E=E7=90=86=E4=BA=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 83 ++++++++++++++++++- .../feginClient/WorkFlowFeignClient.java | 7 ++ .../impl/WorkFlowFeignClientImpl.java | 9 ++ 3 files changed, 98 insertions(+), 1 deletion(-) 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 e2542b7ae..b0e41b087 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 @@ -68,7 +68,9 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum; import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; +import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.entity.ProcessHistoryEO; @@ -648,11 +650,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pidEoQueryWrap = new QueryWrapper<>(); + pidEoQueryWrap.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); + List pidEoList = this.processInfoDetailEOService.list(pidEoQueryWrap); + if(CollectionUtils.isNotEmpty(pidEoList)){ + // 过滤出来，清单确认流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 + List qdqrPidEoList = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.QDQR.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(),InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(qdqrPidEoList)) { + qdqrPidEoList.forEach(qdqrPidEo -> { + qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + }); + this.processInfoDetailEOService.updateBatchById(qdqrPidEoList); + } + + List taskIdList = new ArrayList<>(); + + // 过滤出来，设计符合性流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 + List designFlowPidEoList = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(designFlowPidEoList)) { + designFlowPidEoList.forEach(qdqrPidEo -> { + qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + }); + this.processInfoDetailEOService.updateBatchById(designFlowPidEoList); + + taskIdList.addAll(designFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); + } + + // 过滤出来，验证符合性流程，并且是法规工程师审核节点的数据，转办给新的法规工程师 + List verifyFlowPidEoList = pidEoList.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(verifyFlowPidEoList)) { + verifyFlowPidEoList.forEach(qdqrPidEo -> { + qdqrPidEo.setUserId(projectLawsInventoryEO.getRegulationOwnerId()); + }); + this.processInfoDetailEOService.updateBatchById(verifyFlowPidEoList); + + taskIdList.addAll(verifyFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); + } + + if (CollectionUtils.isNotEmpty(taskIdList)) { + String taskIds = String.join(",", taskIdList); + // 更新流程服务办理人 + this.workFlowFeignClient.changeAssigneeBatch(taskIds,projectLawsInventoryEO.getRegulationOwnerId()); + } + } } } if((projectLawsInventoryOld.getDesignDueDate() != null && projectLawsInventoryEO.getDesignDueDate() != null) && toBeCheckedFlag){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 0ec3392fa..df6305416 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -205,4 +205,11 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/getTaskConfirmAskedEngineer",method = RequestMethod.GET) Set getTaskConfirmAskedEngineer(@RequestParam("projectLawInventoryId")String projectLawInventoryId); + + /** + * 批量改派任务 + * @return + */ + @RequestMapping(value = "/bat-wkflow/changeAssigneeBatch",method = RequestMethod.GET) + Result changeAssigneeBatch(@RequestParam("taskIds") String taskIds,@RequestParam("newAssignee") String newAssignee); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index e0ab1dc66..a09885d65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -212,4 +212,13 @@ public class WorkFlowFeignClientImpl{ public Result dispostHistoryBusProcessNewData() { return workFlowFeignClient.dispostHistoryBusProcessNewData(); } + + /** + * 批量改派任务 + * @return + */ + public Result changeAssigneeBatch(@RequestParam("taskIds") String taskIds,@RequestParam("newAssignee") String newAssignee){ + Result run = workFlowFeignClient.changeAssigneeBatch(taskIds,newAssignee); + return run; + } } From 6fa7ddc24e7f3cac7f901415b93ac7c94e5689a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 18:06:06 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/transferListvirtal.vue | 10 +++++----- .../components/transferListvirtal.vue | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue index 68a324b9a..31bb656b7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue +++ b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue @@ -32,11 +32,11 @@ + {{$t('query')}} + {{$t('reset')}} - {{$t('query')}} - {{$t('reset')}} @@ -48,7 +48,7 @@ :scroll="{x: 800,y:600}" :data-source="dataList" :pagination="false" - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :loading="loading"> @@ -96,7 +96,7 @@ export default { align: 'left', dataIndex: 'serialNumber', width: 100, - fixed: 'left', + ellipsis: true, scopedSlots: { customRender: 'standard' } }, { @@ -104,7 +104,7 @@ export default { align: 'left', dataIndex: 'title', width: 100, - fixed: 'left', + ellipsis: true, scopedSlots: { customRender: 'titleName' } }, { diff --git a/jero-web/src/views/projectManagement/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/transferListvirtal.vue index 77d0fc1a4..95e0ef863 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtal.vue @@ -32,11 +32,11 @@ + {{$t('query')}} + {{$t('reset')}} - {{$t('query')}} - {{$t('reset')}} @@ -48,7 +48,7 @@ :scroll="{x: 800,y:600}" :data-source="dataList" :pagination="false" - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :loading="loading"> From c7a545d9cc88f28184c796eb708ca8b4a62da10b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 19:18:30 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=85=A5-=E5=88=A4=E6=96=AD=E5=88=86=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5=E9=9D=9E?= =?UTF-8?q?=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 10 ++++++++++ 1 file changed, 10 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 70fb733e2..dbb15ca4c 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 @@ -5993,6 +5993,16 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"); + if(phasedImplDetailsArr.length < 3){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-必填项不能为空, "; + }else{ + errorMsg += "Phased Implementation Details - Required items cannot be empty,"; + } + countError++; + break; + } + if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; if(StringUtils.isEmpty(standNumberOrClause)){ From a06b589fefe608b3b16d5683d411f64b46461c52 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 20:42:39 +0800 Subject: [PATCH 11/29] =?UTF-8?q?67761=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=EF=BC=8C=E8=B4=A3=E4=BB=BB=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E4=B8=B2=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/entity/SysDictItem.java | 1 + .../modules/system/enums/DicCodeEnum.java | 22 ++++++++++--------- .../system/mapper/SysDictItemMapper.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 11 ++++++++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 6bd5300c7..5dad3661e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -101,6 +101,7 @@ public class SysDictItem implements Serializable { private java.lang.String attributeType; /**逻辑删除标识*/ + /**value：0可用，1逻辑删除**/ @TableLogic public Integer delFlag; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index d109cf276..c1f571268 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -4,16 +4,17 @@ package com.jero.modules.system.enums; * 数据字典code枚举类 */ public enum DicCodeEnum { - REGION("适用地区","0","region"), + REGION("适用地区","1493782108399820801","region"), + DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"), ; String name; - String value; + String id; String code; - private DicCodeEnum(String name, String value, String code) { + private DicCodeEnum(String name, String id, String code) { this.name = name; - this.value = value; + this.id = id; this.code = code; } @@ -25,13 +26,14 @@ public enum DicCodeEnum { this.name = name; } - public String getValue() { - return value; + public String getId() { + return id; } - public void setValue(String value) { - this.value = value; + public void setId(String id) { + this.id = id; } + public String getCode() { return code; } @@ -40,10 +42,10 @@ public enum DicCodeEnum { this.code = code; } - public static String getTextByValue(String value) { + public static String getTextByCode(String code) { DicCodeEnum[] values = values(); for (DicCodeEnum dicCodeEnum : values) { - if (dicCodeEnum.value.equals(value)) { + if (dicCodeEnum.code.equals(code)) { return dicCodeEnum.name; } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index e3eade81d..45c415dc5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -26,7 +26,7 @@ public interface SysDictItemMapper extends BaseMapper { @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc") public List selectItemsOrderBySortOrder(String dictCode); - @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1") + @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0") List selectItemsAll(); /** 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 b0e41b087..fcd39b2d0 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 @@ -57,12 +57,14 @@ import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysRoleMapper; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysAnnouncementService; +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; @@ -254,6 +256,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); + List userNameList = new ArrayList<>(); String designDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).collect(Collectors.joining(",")); String verifyDutyIds = dataList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).collect(Collectors.joining(",")); @@ -7008,7 +7015,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); @@ -7055,7 +7062,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 3 Apr 2023 20:43:19 +0800 Subject: [PATCH 12/29] update --- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fcd39b2d0..e5dc52edf 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 @@ -7062,7 +7062,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 3 Apr 2023 21:03:58 +0800 Subject: [PATCH 13/29] =?UTF-8?q?bug=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/AuthDummyInventoryInfoEOServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 3563262d5..95cb3b506 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 @@ -37,6 +37,7 @@ import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysDictItemMapper; @@ -1218,6 +1219,8 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl dutyTerritoryDictItemList = this.sysDictItemService.selectItemsByDictCode(DicCodeEnum.DUTY_TERRITORY.getCode()); + //编号验证 verifySerialNumber(datas,authDummyInventoryInfoEOTemp); for(AuthDummyInventoryInfoEO authDummyInventoryInfoEO :datas){ @@ -1306,7 +1309,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Tue, 4 Apr 2023 09:38:00 +0800 Subject: [PATCH 14/29] =?UTF-8?q?OTA-67394bug-=E8=BD=A6=E5=9E=8B=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AFtab=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/basicInformation.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index d45d03b2c..fe9306ee4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -342,14 +342,14 @@ import { message } from 'ant-design-vue' this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined } } - if(res.result.dllx1 == null ){ + if(res.result.dllx1 == '' ){ res.result.dllx1 = undefined } - if(res.result.dllx2 == null){ + if(res.result.dllx2 == ''){ res.result.dllx2 = undefined } - if(res.result.cplb == null){ + if(res.result.cplb == ''){ res.result.cplb = undefined } if(res.result.qymc == null){ From eae136c89aa3de6f4762aaa9ea2c877f18494b08 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 4 Apr 2023 10:21:52 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/warn/service/LawsWarnService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index a00dc52ee..21bb11074 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -134,6 +134,7 @@ public class LawsWarnService { List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); List onlCgformFieldListTemp = onlCgformFieldList.stream().filter(e -> fieldList.contains(e.getDbFieldName())).collect(Collectors.toList()); List records = infoPage.getRecords(); + this.disposeData(records,cut); for (Map record : records) { //处理标题 if(CutEnum.EN.getValue().equals(cut)){ @@ -201,9 +202,6 @@ public class LawsWarnService { } } } - - this.disposeData(records,cut); - return infoPage; } From 1e73e2650a0c7fa294d9f702f5a204a1a729f5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 4 Apr 2023 10:29:44 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-studio=E5=92=8C=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E7=82=B9=E5=87=BB=E6=9B=B4=E5=A4=9A=EF=BC=8C?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=A9=BA=E7=99=BD=E8=BE=83=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 0756617be..f91c86f85 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -133,7 +133,7 @@ - +