From 066f9cf006b5255d77bbb74a0fde988f1244b550 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 7 Jul 2022 16:21:20 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E7=9B=B8=E5=85=B3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 d6db6a152..be210f2e8 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 @@ -2001,6 +2001,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Thu, 7 Jul 2022 16:59:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=A6=85=E9=81=93=2055588=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20-=20=E4=BB=BB=E5=8A=A1=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectTaskInventoryEOServiceImpl.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index bf51907cd..131545867 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -481,8 +481,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl Date: Fri, 8 Jul 2022 09:51:46 +0800 Subject: [PATCH 03/11] =?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/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/commentList.vue | 2 +- .../components/listOfRegulations.vue | 237 +++++++++++------- 4 files changed, 147 insertions(+), 98 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f2ed6cd8b..00330c781 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1092,4 +1092,7 @@ module.exports = { pleaseSelectStandard:'Please select a standard', theResponsiblePersonEmpty:'The responsible person of cannot be empty', theDeadlineEmpty:'The deadline of cannot be empty', + theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty', + For:'For', + markedRejection:'Marked rejection', } \ 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 490efd7a3..763b21f87 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1096,4 +1096,7 @@ module.exports = { pleaseSelectStandard:'请选择标准', theResponsiblePersonEmpty:'的责任人不能为空', theDeadlineEmpty:'的截止时间不能为空', + theDeliveryTypeCannotBeEmpty:'的交付物类型不能为空', + For:'针对于', + markedRejection:'标注的驳回意见', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue index f80a418f9..71c112204 100644 --- a/jero-web/src/views/projectManagement/components/commentList.vue +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -20,7 +20,7 @@
-
{{$t('record')+(index + 1)}}
+
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 0346415ed..819012375 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -30,9 +30,9 @@ {{ $t('areaOfResponsibility') }}
+ :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" + :type="'select'" + :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -226,7 +226,7 @@ {{text}} - + {{text}} @@ -435,7 +435,7 @@ export default { name: 'listOfRegulations', - props:['areaOfResponsibilityList'], + props: ['areaOfResponsibilityList'], components: { ImportFile, listAddModel, @@ -884,51 +884,51 @@ value: 'engineeringInterfacePerson', valueName: 'engineeringInterfacePersonName', text: this.$t('engineeringInterfacePerson') - }, + } ], - listOptions:[ + listOptions: [ { - value:'Not started', - key:'Not started', - label:this.$t('notLaunch'), + value: 'Not started', + key: 'Not started', + label: this.$t('notLaunch') }, { - value:'List to confirm', - key:'List to confirm', - label:this.$t('toBeConfirmed'), + value: 'List to confirm', + key: 'List to confirm', + label: this.$t('toBeConfirmed') }, { - value:'Accepted', - key:'Accepted', - label:this.$t('accept'), + value: 'Accepted', + key: 'Accepted', + label: this.$t('accept') }, { - value:'Rejected', - key:'Rejected', - label:this.$t('refuse'), - }, + value: 'Rejected', + key: 'Rejected', + label: this.$t('refuse') + } ], - taskOptions:[ + taskOptions: [ { - value:'Not started', - key:'Not started', - label:this.$t('notLaunch'), + value: 'Not started', + key: 'Not started', + label: this.$t('notLaunch') }, { - value:'List to confirm', - key:'List to confirm', - label:this.$t('toBeConfirmed'), + value: 'List to confirm', + key: 'List to confirm', + label: this.$t('toBeConfirmed') }, { - value:'Accepted', - key:'Accepted', - label:this.$t('accept'), + value: 'Accepted', + key: 'Accepted', + label: this.$t('accept') }, { - value:'Rejected', - key:'Rejected', - label:this.$t('refuse'), - }, + value: 'Rejected', + key: 'Rejected', + label: this.$t('refuse') + } ], visibleRoleSwitching: false, confirmLoadingRoleSwitching: false, @@ -945,8 +945,8 @@ }, detailedSuccessList: [], detailedWarningList: [], - rowKeysSuccessList:[], - rowKeysWarningList:[], + rowKeysSuccessList: [], + rowKeysWarningList: [] } }, @@ -1411,25 +1411,49 @@ for (let i = 0; i < dataSource.length; i++) { if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') { if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) { - if (dataSource[i].designDeliverableType){ - if (!dataSource[i].designInitiatorId){ - this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('designComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) - continue - } - } - if (dataSource[i].prehomoDeliverableType){ - if (!dataSource[i].prehomoInitiatorId){ - this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + if (dataSource[i].designDeliverableType) { + if (!dataSource[i].designInitiatorId) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>) + continue + } + if (!dataSource[i].designDutyId) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>) + continue + } + if (!dataSource[i].designDueDate) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('designComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>) continue } } - if (dataSource[i].verifyDeliverableType){ - if (!dataSource[i].verifyInitiatorId){ - this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + if (dataSource[i].prehomoDeliverableType) { + if (!dataSource[i].prehomoInitiatorId) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>) + continue + } + if (!dataSource[i].prehomoDutyId) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>) + continue + } + if (!dataSource[i].prehomoDueDate) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('preHomeConfirmation') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>) continue } } - this.detailedSuccessList.push(dataSource[i]) + if (dataSource[i].verifyDeliverableType) { + if (!dataSource[i].verifyInitiatorId) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('Sponsor') + this.$t('cannotEmpty') } < /div>) + continue + } + if (!dataSource[i].verifyDutyId) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('personLiable') + this.$t('cannotEmpty') } < /div>) + continue + } + if (!dataSource[i].verifyDueDate) { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('verificationComplianceReview') + this.$t('cutoffTime') + this.$t('cannotEmpty') } < /div>) + continue + } + } + this.detailedSuccessList.push(dataSource[i]) } else { this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) @@ -1438,7 +1462,7 @@ // return } } else { - this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') } < /div>) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) // isTrue = false // return @@ -1658,7 +1682,7 @@ }) }, - getRowKeys(value,num, callBack) { + getRowKeys(value, num, callBack) { let isTrue = true let dataSource = [] for (let i = 0; i < this.dataSource.length; i++) { @@ -1694,49 +1718,58 @@ // this.$message.warning(dataSource[i].serialNumber + this.$t('submitted')) // return } - if(num == 1){ - if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId + if (num == 1) { + if ((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].designInitiatorId == this.userInfo().id) || (dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId - && dataSource[i].designInitiatorId == this.userInfo().id)){ - if(!dataSource[i].designDutyId && !dataSource[i].designDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) + && dataSource[i].designInitiatorId == this.userInfo().id)) { + if (!dataSource[i].designDutyId && !dataSource[i].designDueDate) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue - }else if(!dataSource[i].designDutyId){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>) + } else if (!dataSource[i].designDutyId) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>) continue - }else if(!dataSource[i].designDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>) + } else if (!dataSource[i].designDueDate) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>) + continue + }else if (!dataSource[i].designDeliverableType) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) continue } } - if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId + if ((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].prehomoInitiatorId == this.userInfo().id) || (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId - && dataSource[i].prehomoInitiatorId == this.userInfo().id)){ - if(!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) + && dataSource[i].prehomoInitiatorId == this.userInfo().id)) { + if (!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue - }else if(!dataSource[i].prehomoDutyId){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) + } else if (!dataSource[i].prehomoDutyId) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) continue - }else if(!dataSource[i].prehomoDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>) + } else if (!dataSource[i].prehomoDueDate) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>) + continue + }else if (!dataSource[i].prehomoDeliverableType) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) continue } } - if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId + if ((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].verifyInitiatorId == this.userInfo().id) || (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId - && dataSource[i].verifyInitiatorId == this.userInfo().id)){ - if(!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) + && dataSource[i].verifyInitiatorId == this.userInfo().id)) { + if (!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue - }else if(!dataSource[i].verifyDutyId){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) + } else if (!dataSource[i].verifyDutyId) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) continue - }else if(!dataSource[i].verifyDueDate){ - this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>) + } else if (!dataSource[i].verifyDueDate) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>) + continue + }else if (!dataSource[i].verifyDeliverableType) { + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) continue } } @@ -1752,7 +1785,7 @@ if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { callBack && callBack() - }else{ + } else { let that = this this.$warning({ content: ( @@ -1768,19 +1801,19 @@ let _this = this let lawsInventoryList = [] for (let i = 0; i < this.rowKeysSuccessList.length; i++) { - let roleCode - if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id && - this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) { - roleCode = 4 - } else if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id) { - roleCode = 1 - } else if (this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) { - roleCode = 2 - } - lawsInventoryList.push({ - id: this.rowKeysSuccessList[i].id, - roleCode: roleCode - }) + let roleCode + if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id && + this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) { + roleCode = 4 + } else if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id) { + roleCode = 1 + } else if (this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) { + roleCode = 2 + } + lawsInventoryList.push({ + id: this.rowKeysSuccessList[i].id, + roleCode: roleCode + }) } let query = { operatorType: 1, @@ -1799,7 +1832,7 @@ _this.$message.warning(_this.$t('operationFailed')) _this.confirmLoading = false } - if(this.rowKeysWarningList && this.rowKeysWarningList.length > 0){ + if (this.rowKeysWarningList && this.rowKeysWarningList.length > 0) { let that = this this.$warning({ content: ( @@ -1822,13 +1855,17 @@ onOk() { if (num == 0) { let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - _this.getRowKeys(selectedRowKeys, 1,function() { + _this.getRowKeys(selectedRowKeys, 1, function() { _this.updateStatusBatch(num, selectedRowKeys) }) } else { let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - _this.getRowKeys(selectedRowKeys, 2,function() { + _this.getRowKeys(selectedRowKeys, 2, function() { _this.visibleComment = true + _this.formInlineComment = {} + _this.$nextTick(()=>{ + _this.$refs.ruleFormComment.clearValidate() + }) }) } } @@ -1841,8 +1878,14 @@ this.$refs.ruleFormComment.validate(valid => { if (valid) { let url = '/project/projectCommentEO/add' + let content = [] + if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { + this.rowKeysSuccessList.forEach(res => { + content.push(res.serialNumber) + }) + } let query = { - commentContent: this.formInlineComment.commentContent, + commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+'：' + this.formInlineComment.commentContent, projectLibraryId: this.$route.query.id } this.confirmLoadingComment = true @@ -1967,15 +2010,15 @@ } } }, - standardClick(row){ + standardClick(row) { let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { - id:row.id + id: row.id } }) window.open(newUrl.href, '_blank') - }, + } } } From f4a48a5012615389575b808315d739afb2003612 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 8 Jul 2022 10:01:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E8=BE=91-=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 60 ++++++++++--------- 1 file changed, 33 insertions(+), 27 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 c058412f4..da45cdff6 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 @@ -4993,14 +4993,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - - List listEn = Arrays.asList(infoDiffEn.get("subtitle").split(",")); - String infoDiffOldEn = listEn.get(0); - String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; - } - } + List listEn = Arrays.asList(infoDiffEn.get("subtitle").split(",")); + if(listEn.size() > 1){ + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + } + } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); @@ -5008,13 +5008,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - - List listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(",")); - String infoDiffOldEn = listEn.get(0); - String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; - } - } + } + List listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(",")); + if(listEn.size() > 1){ + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + } + } //实施类别 if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { @@ -5023,25 +5024,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - - List listEn = Arrays.asList(infoDiffEn.get("implementType").split(",")); - String infoDiffOldEn = listEn.get(0); - String infoDiffNewEn = listEn.get(1); - enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; - } - } + } + List listEn = Arrays.asList(infoDiffEn.get("implementType").split(",")); + if(listEn.size() > 1){ + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + } + } //在产车实施日期 if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) { List list = Arrays.asList(infoDiff.get("implementTimeString").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); + if(list.size() > 1){ + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + } List listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(",")); - String infoDiffOldEn = listEn.get(0); - String infoDiffNewEn = listEn.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; - enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + if(listEn.size() > 1){ + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + } } //新车型实施日期 From 5b2275a367e0e78bdb54ab6aefc300979f006c35 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 8 Jul 2022 10:20:17 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93id=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/蔚来标准sql/first_bug_fix_record.sql | 10 +++++++++- .../project/entity/ProjectLawsInventoryEO.java | 2 ++ .../project/entity/ProjectTaskInventoryEO.java | 3 +++ .../ProjectLawsInventoryEOServiceImpl.java | 18 ++++++++++++++++-- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 7ced5c156..d23e6123d 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -17,4 +17,12 @@ MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4 UPDATE `laws_weilai`.`onl_cgform_field` SET `id`='e4fe526794af4477321227f69b764b0d', `cgform_head_id`='48308196e7b04761b533dc31bc899707', `db_field_name`='description', `db_field_en_name`='Description', `db_field_txt`='描述', `order_num`='9', `db_field_name_old`=NULL, `db_is_key`='0', `db_is_null`='1', `db_type`='string', `db_length`='1000', `db_point_length`='0', `db_default_val`='', `dict_field`='', `dict_table`='', `dict_text`='', `field_show_type`='8', `field_href`='', `field_length`='120', `field_valid_type`=NULL, `field_must_input`='0', `field_extend_json`='', `field_default_value`='', `is_query`='0', `is_show_form`='1', `is_show_list`='0', `is_read_only`='0', `query_mode`='single', `main_table`='', `main_field`='', `update_by`='admin', `update_time`='2022-06-06 16:05:28', `create_time`='2022-01-21 14:41:40', `create_by`='admin', `converter`='', `query_def_val`='', `query_dict_text`='', `query_dict_field`='', `query_dict_table`='', `query_show_type`='text', `query_config_flag`='0', `query_valid_type`=NULL, `query_must_input`=NULL, `sort_flag`='0', `show_area`='1499657602378825729', `is_show_laws_list`='0', `is_show_search`='0', `is_delete`='0', `is_model`='1', `dict_id`=NULL WHERE (`id`='e4fe526794af4477321227f69b764b0d'); --- 2022年7月4日部署到正式环境 \ No newline at end of file +-- 2022年7月4日部署到正式环境 + + + +-- 2022年7月8日增加字段 未同步正式环境 +ALTER TABLE `project_laws_inventory` + ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `file_id`; +ALTER TABLE `project_task_inventory` + ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 2184cb6a0..97d1f5f5d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -465,5 +465,7 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "报告id") private String fileId; + @ApiModelProperty(value = "文档库id/标准id") + private String standId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java index 3b62cb7c8..c8c305aaf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java @@ -307,4 +307,7 @@ public class ProjectTaskInventoryEO implements Serializable { /**法规清单创建日期，任务清单中需要根据此字段进行倒序排序**/ @TableField(exist = false) private Date lawsInventoryCreateTime; + + @ApiModelProperty(value = "文档库id/标准id") + private String standId; } 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 c058412f4..e887543fa 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 @@ -280,6 +280,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = new ArrayList<>(); for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { + String standId = bussDocumentLibraryEO.getId(); + ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO(); BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp); String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", ""); @@ -343,12 +346,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectTaskInventoryEOList = new ArrayList<>(); - idList.forEach(id -> { + List projectLawsInventoryEOList = this.baseMapper.selectList(updateLawsInventoryWrapper); + projectLawsInventoryEOList.forEach(projectLawsInventory -> { + ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); + String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); + projectTaskInventoryEO.setId(projectTaskInventoryId); + projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId()); + projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId()); + projectTaskInventoryEOList.add(projectTaskInventoryEO); + }); + /*idList.forEach(id -> { ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); projectTaskInventoryEO.setId(projectTaskInventoryId); projectTaskInventoryEO.setProjectLawsInventoryId(id); projectTaskInventoryEOList.add(projectTaskInventoryEO); - }); + });*/ //项目任务清单数据初始化。 this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); From 3357a79d7838cd9c85e0605298ed1cb95656e4e0 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 8 Jul 2022 10:37:49 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=20-=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6=E3=80=81=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IConditionAssessmentEOService.java | 4 +++- .../impl/ConditionAssessmentEOServiceImpl.java | 6 +++++- .../impl/ProjectTaskInventoryEOServiceImpl.java | 12 +++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java index 11647eda4..b4ed25732 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java @@ -5,6 +5,8 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; import com.jero.modules.project.entity. ConditionAssessmentEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.entity.ProjectTaskInventoryEO; + import java.util.List; import java.util.Map; @@ -75,7 +77,7 @@ public interface IConditionAssessmentEOService extends IService queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); + if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ + queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess()); + } if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 131545867..649bae92d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -181,6 +181,11 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIdList); + + if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){ + taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getCertificationProgress,projectTaskInventoryEO.getCertificationProgress()); + } + List projectTaskInventoryEOList = this.baseMapper.selectList(taskInventoryQueryWrapper); //验证当前用户在该项目中是什么角色 @@ -207,7 +212,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl createTaskInventoryEOList(List projectTaskInventoryEOList, List projectTaskInventoryDetailEOList, Integer isProjectRole, - LoginUser currentUser) + LoginUser currentUser, + ProjectTaskInventoryEO projectTaskInventory) { List result = new ArrayList<>(); for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) { @@ -449,7 +455,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl Date: Fri, 8 Jul 2022 10:53:13 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3=E5=BA=93id,=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 3 +++ .../com/jero/modules/dummy/entity/DummyInventoryInfoEO.java | 3 +++ .../modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml | 1 + .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 1 + .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index d23e6123d..2358aa416 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -26,3 +26,6 @@ ALTER TABLE `project_laws_inventory` ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `file_id`; ALTER TABLE `project_task_inventory` ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`; + +ALTER TABLE `dummy_inventory_info` +ADD COLUMN `buss_document_library_id` varchar(32) NULL COMMENT '文档库id' AFTER `design_remark`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index b9aaa15ad..33b22ff2c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -284,6 +284,9 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private Integer pageSize; + //文档库id + private String bussDocumentLibraryId; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml index b6f9d9eb0..17adb3c5e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml @@ -40,5 +40,6 @@ + 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 523a29c4f..57067a3bf 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 @@ -156,6 +156,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Fri, 8 Jul 2022 11:08:24 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=20-=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E9=A1=B9=E7=9B=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=BF=87=E6=BB=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectTaskInventoryEO.java | 5 ++++ .../mapper/ProjectTaskInventoryEOMapper.java | 7 +++++ .../xml/ProjectTaskInventoryEOMapper.xml | 30 +++++++++++++++++++ .../ProjectTaskInventoryEOServiceImpl.java | 13 +++++++- 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java index c8c305aaf..70de0d84a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.util.Date; +import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -310,4 +311,8 @@ public class ProjectTaskInventoryEO implements Serializable { @ApiModelProperty(value = "文档库id/标准id") private String standId; + + /**法规清单id数组 查询使用**/ + @TableField(exist = false) + private List projectLawsInventoryIdList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java index 0e252ee67..142ce1c4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java @@ -76,4 +76,11 @@ public interface ProjectTaskInventoryEOMapper extends BaseMapper> getCertificationProgressStatisticsGroupByTerritory(@Param("projectLawsInventoryIdList") List projectLawsInventoryIdList, @Param("certificationProgress") String certificationProgress); + + /** + * 查询任务清单列表 + * @param projectTaskInventoryEO + * @return + */ + List selectProjectTaskInventoryList(@Param("projectTaskInventoryEO") ProjectTaskInventoryEO projectTaskInventoryEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml index 9a59d452b..0cb45d350 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml @@ -19,6 +19,13 @@ + + pti.id, pti.create_by,pti.create_time,pti.update_by,pti.update_time,pti.sys_org_code,pti.project_laws_inventory_id,pti.design_status,pti.design_flow_task_status,pti.design_p_id,pti.prehomo_status, + pti.prehomo_flow_task_status,pti.prehomo_p_id,pti.verify_status,pti.verify_flow_task_status,pti.verify_p_id,pti.certification_progress,pti.certification_progress_remark,pti.project_status_assess, + pti.design_send_msg_flag,pti.design_send_msg_current_flag,pti.prehomo_send_msg_flag,pti.prehomo_send_msg_current_flag,pti.verify_send_msg_flag,pti.verify_send_msg_current_flag, + pti.design_person_charge_feedback,pti.prehomo_person_charge_feedback,pti.verify_person_charge_feedback,pti.process_end_time + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 649bae92d..66a301c9d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -185,7 +185,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl projectTaskInventoryEOList = this.baseMapper.selectProjectTaskInventoryList(projectTaskInventoryEO);*/ List projectTaskInventoryEOList = this.baseMapper.selectList(taskInventoryQueryWrapper); //验证当前用户在该项目中是什么角色 @@ -627,6 +628,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl (StringUtils.equals(e.getShowFlag(),TaskStatusEnum.SHOW_FLAG.getValue()))).collect(Collectors.toList()); + //根据当前项目状态筛选一次。 + if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ + result = result.stream().filter(e -> { + boolean flag = false; + if(StringUtils.equals(e.getProjectStatusAssess(),projectTaskInventory.getProjectStatusAssess())){ + flag = true; + } + return false; + }).collect(Collectors.toList()); + } } return result; } From e4d1cdda75d9600c637ddbc4515316e0e49254f9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 8 Jul 2022 11:19:16 +0800 Subject: [PATCH 09/11] update --- .../project/service/impl/ProjectTaskInventoryEOServiceImpl.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/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 66a301c9d..7f92ea6dd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -635,7 +635,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl Date: Fri, 8 Jul 2022 11:25:58 +0800 Subject: [PATCH 10/11] =?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/projectInformation.vue | 15 ++++- .../processForm/taskListProcess/index.vue | 3 +- .../projectManagement/components/TaskList.vue | 58 ++++++++++++++++--- .../components/listOfRegulations.vue | 6 +- 4 files changed, 69 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 65e75b9f7..7cc17091d 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -13,7 +13,10 @@ @click="urlClick(queryForm[item.value])" v-if="item.type == 1" >{{queryForm[item.value]}} - + {{queryForm[item.value]}} {{queryForm[item.value]}}
@@ -25,6 +28,7 @@ 1打开新页面 2显示文件 3点击事件处理\需要传点击事件 + 4标注号的跳转 -->