From b0178526e2953cf179614072b34f731e3c840926 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 16:41:40 +0800 Subject: [PATCH 01/56] =?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/circulationHistory.vue | 4 +- .../components/engineeringConfirmation.vue | 2 +- .../processForm/handshakeProcess/index.vue | 2 +- .../components/listEditModel.vue | 292 ++++++++---------- 4 files changed, 133 insertions(+), 167 deletions(-) diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index d14ddadc7..29856b886 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -34,10 +34,10 @@ dataSource: [], loading: false, approvalResult: { - 0: this.$t('agree'), + 0: this.$t('accept'), 1: this.$t('disagree'), 2: this.$t('terminationProcess'), - 3: this.$t('issue') + 3: this.$t('inquiry') }, columns: [ { diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index b616e146d..38a70644d 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -517,7 +517,7 @@ this.$message.success(this.$t('OperationSuccessful')) } else { this.confirmLoading = false - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } } }) diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 68b7dca7e..bcf18f0a6 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -158,7 +158,7 @@ this.textLoading = this.$t('Submitting') this.loading = true if (!this.isFlag) { - res.flag = 0 + res.flag = '' } this.completeTask(res, handlingTime) }) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 95a4009af..c7e77282b 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -46,7 +46,7 @@ @@ -55,86 +55,100 @@
- WVTA ID + {{$t('applicableSupplement')}}
- + - -
- - - - -
-
- {{$t('correspondingStandard')}} -
- - - -
- - -
-
- {{$t('implementationCategory')}} -
- - - -
- - - - -
-
- {{$t('vehicleInProductionDate')}} -
- - - -
- - -
-
- {{$t('ImplementationDate')}} -
- - + :disabled="formInline.roleCode == 0 ? false : true" + v-model="formInline.applicableSupplement" + :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -186,7 +200,7 @@
- +
* @@ -211,7 +225,7 @@
- +
@@ -262,54 +276,40 @@ - -
-
- {{$t('zoneOfApplication')}} -
- - - - - - -
- - -
-
- {{$t('applicableSupplement')}} -
- - - -
- - - - -
-
- {{$t('remarks')}} -
- - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 {{$t('confirmationOfDesignConformity')}}
@@ -325,7 +325,7 @@ tree-node-filter-prop="title" v-model="formInline.designDeliverableType" :maxTagCount="1" - :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false" + :disabled="formInline.taskAffirmStatus != 'Not started' ? true : false" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -349,7 +349,7 @@
{{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' || formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -398,7 +398,6 @@
@@ -452,7 +450,6 @@ @@ -473,7 +470,6 @@ tree-node-filter-prop="title" v-model="formInline.prehomoDeliverableType" :maxTagCount="1" - :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -498,7 +494,6 @@ {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' || @@ -551,7 +546,6 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - :disabled="prehomoDutyIdDisabled" v-model="formInline.prehomoDutyId"> @@ -602,7 +595,6 @@ @@ -623,7 +615,6 @@ tree-node-filter-prop="title" v-model="formInline.verifyDeliverableType" :maxTagCount="1" - :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -648,7 +639,6 @@ {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' || formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -700,7 +690,6 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - :disabled="verifyDutyIdDisabled" v-model="formInline.verifyDutyId"> @@ -751,7 +739,6 @@ @@ -908,36 +895,22 @@ }) }, getDis(val) { - if (val.taskAffirmStatus != 'Not started' && !val.designInitiatorId) { + if (val.taskAffirmStatus != 'Not started') { this.designInitiatorDisabled = true } else if (val.roleCode == 0) { this.designInitiatorDisabled = false } else { this.designInitiatorDisabled = true } - if (val.taskAffirmStatus != 'Not started' && !val.designDutyId) { - this.designDutyIdDisabled = true - } else if (val.roleCode == 0) { - this.designDutyIdDisabled = false - } else { - this.designDutyIdDisabled = true - } - if (val.taskAffirmStatus != 'Not started' && !val.prehomoInitiatorId) { + if (val.taskAffirmStatus != 'Not started') { this.prehomoInitiatorIdDisabled = true } else if (val.roleCode == 0) { this.prehomoInitiatorIdDisabled = false } else { this.prehomoInitiatorIdDisabled = true } - if (val.taskAffirmStatus != 'Not started' && !val.prehomoDutyId) { - this.prehomoDutyIdDisabled = true - } else if (val.roleCode == 0) { - this.prehomoDutyIdDisabled = false - } else { - this.prehomoDutyIdDisabled = true - } - if (val.taskAffirmStatus != 'Not started' && !val.verifyDutyId) { + if (val.taskAffirmStatus != 'Not started') { this.verifyDutyIdDisabled = true } else if (val.roleCode == 0) { this.verifyDutyIdDisabled = false @@ -945,13 +918,6 @@ this.verifyDutyIdDisabled = true } - if (val.taskAffirmStatus != 'Not started' && !val.verifyInitiatorId) { - this.verifyInitiatorIdDisabled = true - } else if (val.roleCode == 0) { - this.verifyInitiatorIdDisabled = false - } else { - this.verifyInitiatorIdDisabled = true - } }, getProject(row, res, callback) { //设计符合性确认-发起人 From 5d04b64baafa042e44a5d62c54429d3a9137d5fb Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 16:41:53 +0800 Subject: [PATCH 02/56] =?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/listOfRegulations.vue | 194 +++++++++++------- 1 file changed, 125 insertions(+), 69 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index b8ad627a7..a270be398 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -840,7 +840,9 @@ trigger: 'change' } ] - } + }, + detailedSuccessList: [], + detailedWarningList: [] } }, @@ -1279,28 +1281,41 @@ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let isTrue = true + this.detailedSuccessList = [] + this.detailedWarningList = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') { if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) { - isTrue = true + this.detailedSuccessList.push(this.dataSource[i]) } else { - this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) - isTrue = false - return + this.detailedWarningList.push(
{this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') }
) + // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) + // isTrue = false + // return } } else { - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) - isTrue = false - return + this.detailedWarningList.push(
{this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') }
) + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) + // isTrue = false + // return } } } } - if (isTrue) { + if (this.detailedSuccessList && this.detailedSuccessList.length > 0) { this.visible = true this.formInline = {} + }else{ + let that = this + this.$warning({ + content: ( + < div > + {that.detailedWarningList} + < /div> + ) + }) } } else { this.$message.warning(this.$t('selectLeastOne')) @@ -1313,61 +1328,81 @@ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let isTrue = true + this.TaskSuccessList = [] + this.TaskWarningList = [] + let dataList = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') && - this.dataSource[i].inventoryAffirmStatus == 'Accepted') { - if (this.dataSource[i].engineeringInterfacePerson) { - if (this.dataSource[i].verifyRemark) { - if (this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId - && this.dataSource[i].verifyInitiatorId) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) - return - } - } - - if (this.dataSource[i].prehomoRemark) { - if (this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId - && this.dataSource[i].prehomoInitiatorId) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) - return - } - } - - if (this.dataSource[i].designRemark) { - if (this.dataSource[i].designDueDate && this.dataSource[i].designDutyId - && this.dataSource[i].designInitiatorId) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) - return - } - } - - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) - return - } - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected')) - return - } + dataList.push(this.dataSource[i]) } } } - if (isTrue) { + for (let i = 0; i < dataList.length; i++) { + if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') && + dataList[i].inventoryAffirmStatus == 'Accepted') { + if (dataList[i].engineeringInterfacePerson) { + if (dataList[i].verifyRemark) { + if (dataList[i].verifyDueDate && dataList[i].verifyDutyId + && dataList[i].verifyInitiatorId) { + } else { + this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') }
) + continue; + // isTrue = false + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) + // return + } + } + + if (dataList[i].prehomoRemark) { + if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId + && dataList[i].prehomoInitiatorId) { + } else { + this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') }
) + continue; + // isTrue = false + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) + // return + } + } + + if (dataList[i].designRemark) { + if (dataList[i].designDueDate && dataList[i].designDutyId + && dataList[i].designInitiatorId) { + } else { + this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') }
) + continue; + // isTrue = false + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) + // return + } + } + this.TaskSuccessList.push(dataList[i]) + } else { + this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('theProjectContactEmpty') }
) + // isTrue = false + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) + // return + } + } else { + this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') }
) + // isTrue = false + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected')) + // return + } + } + if (this.TaskWarningList && this.TaskWarningList.length > 0) { this.visible = true this.formInline = {} + }else{ + let that = this + this.$warning({ + content: ( + < div > + {that.TaskWarningList} + < /div> + ) + }) } } else { this.$message.warning(this.$t('selectLeastOne')) @@ -1377,8 +1412,11 @@ handleOk() { this.$refs.ruleForm.validate(valid => { if (valid) { - let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) if (this.timeName == '清单') { + let selectedRowKeys = [] + this.detailedSuccessList.forEach(res => { + selectedRowKeys.push(res.id) + }) let query = { operatorType: 0, ids: selectedRowKeys.join(','), @@ -1397,26 +1435,34 @@ this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false } + let that = this + if (this.detailedWarningList.length > 0){ + this.$warning({ + content: ( + < div > + {that.detailedWarningList} + < /div> + ) + }) + } + this.detailedSuccessList = [] + this.detailedWarningList = [] }) } else { let index = 0 - for (let i = 0; i < this.dataSource.length; i++) { - for (let j = 0; j < selectedRowKeys.length; j++) { - if (this.dataSource[i].id == selectedRowKeys[j]) { + for (let i = 0; i < this.TaskSuccessList.length; i++) { index++ - this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate - Object.keys(this.dataSource[i]).forEach(res => { - if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) { - this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“') - this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘') + this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + Object.keys(this.TaskSuccessList[i]).forEach(res => { + if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { + this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') + this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') } }) setTimeout(() => { this.confirmLoading = true - this.startProcess(this.dataSource[i], index) + this.startProcess(this.TaskSuccessList[i], index) }, 500) - } - } } } } @@ -1449,12 +1495,22 @@ } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { - if (index == this.selectedRowKeys.length) { + if (index == this.TaskSuccessList.length) { this.visible = false this.selectedRowKeys = [] this.$message.success(this.$t('OperationSuccessful')) this.confirmLoading = false this.getList() + let that = this + if (this.TaskWarningList.length > 0){ + this.$warning({ + content: ( + < div > + {that.TaskWarningList} + < /div> + ) + }) + } } } else { this.$message.warning(this.$t('operationFailed')) From d65bac3c2bec0811819c5fda1256657beffc8246 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 1 Jul 2022 17:28:47 +0800 Subject: [PATCH 03/56] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=EF=BC=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=9B=9B=E7=A7=8D=EF=BC=89=E3=80=82?= =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=EF=BC=8C=E6=B3=95=E8=A7=84=E3=80=81=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=20=E9=80=9A=E8=BF=87=E3=80=81=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E6=97=B6=20=20=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=20?= =?UTF-8?q?-=2055228bug=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/InventoryAffirmStatusEnum.java | 5 + .../ProjectLawsInventoryEOServiceImpl.java | 213 +++++++++++++++++- 2 files changed, 208 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java index b44f8662c..3978f6c87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java @@ -16,6 +16,11 @@ public enum InventoryAffirmStatusEnum { LIST_TO_CONFIRM("待确认","List to confirm"), ACCEPTED("接受","Accepted"), REJECTED("拒绝","Rejected"), + + REG_ENG_TO_CONFIRM("法规工程师待确认","To be confirmed by Reg Eng."), + HOMO_ENG_TO_CONFIRM("认证工程师待确认","To be confirmed by Homo Eng."), + REG_ENG_REJECTED("法规工程师拒绝 ","Reg Eng. rejected"), + HOMO_ENG_REJECTED("认证工程师拒绝 ","Homo Eng. rejected"), ; 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 bdec38953..476e218ed 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 @@ -1015,15 +1015,78 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() + .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + + QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); + ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); + + QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); + ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); //TODO 切换成枚举，不要在代码里出现魔数 if(StringUtils.equals(operatorType, OperatorTypeEnum.INVENTORY_AFFIRM.getValue())){ String ids = json.getString("ids"); @@ -1224,8 +1297,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOS = this.baseMapper.selectList(queryWrapper); - ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper() - .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + List userIdList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { @@ -1254,13 +1326,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); - projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); - ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); - QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); - projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId()); - ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper); //消息内容 String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for " @@ -1378,9 +1444,94 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + String contentInfo = msgContentEN + " " + href; + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + //发送消息 + List userIdList = new ArrayList<>(); + userIdList.add(projectLibraryBase.getStudioEngineer()); + sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK); + + } + if(isProjectRole == Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()) || isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())){ + msgContentEN = "The regulation list confirmation of "+projectLawsInventoryEO.getSerialNumber() + " for " + + projectNameInfoEO.getProjectName() +" is rejected by " + currentUser.getUsername() +". Please check and address it in a timely manner."; + + // 飞书消息封装 + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + feishuMsgVo.setContent("Hello! This task is rejected by "+currentUser.getUsername()+". Please check and address it in a timely manner."); + feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber()); + feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); + feishuMsgVo.setInitiator(currentUser.getUsername()); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate())); + + //飞书跳转链接 + String hrefFeishu = backUrl + + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + "-" + + projectYearNameInfoEO.getYearName() + + "&targetMarket=" + projectLibraryBase.getTargetMarket(); + //系统内部跳转链接 + String href = "" + "Jump link" + ""; + String contentInfo = msgContentEN + " " + href; + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + //发送消息 + List userIdList = new ArrayList<>(); + userIdList.add(projectLibraryBase.getStudioEngineer()); + sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK); } } @@ -1388,6 +1539,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + "Jump link" + ""; + String contentInfo = msgContentEN + " " + href; + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + //发送消息 + List userIdList = new ArrayList<>(); + userIdList.add(projectLibraryBase.getStudioEngineer()); + sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK); + } } } }else { From 1cae6e92398b2edc53f449aa57fdc37389a0d0ed Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 1 Jul 2022 17:50:18 +0800 Subject: [PATCH 04/56] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentManage/tags/tabs/TagContent.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 0df58f3f4..bf0488485 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -259,7 +259,9 @@ }, hideModal() { this.form.dictName = this.form.dictName.trim() - this.form.description = this.form.description.trim() + if (this.form.description){ + this.form.description = this.form.description.trim() + } let params = { ...this.form } From 1912f76fc2938fe2c1c7e59fd1b2282bfa910841 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 18:10:37 +0800 Subject: [PATCH 05/56] =?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 | 4 + jero-web/src/common/lang/zh-cn.js | 4 + .../components/engineeringConfirmation.vue | 2 - .../processForm/handshakeProcess/index.vue | 12 +- .../projectManagement/components/TaskList.vue | 3 + .../components/listEditModel.vue | 106 ++++++++++++------ .../components/listOfRegulations.vue | 86 ++++++++------ 7 files changed, 138 insertions(+), 79 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3cc0b4441..420faa5b6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1068,4 +1068,8 @@ module.exports = { newNiONumber: 'Number', English: 'English', requiredParametersEmpty:'Required parameters cannot be empty', + PleaseTaskConfirmationRejected:'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', + theProjectContactEmpty:'The project contact person of cannot be empty', + pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected', + TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of 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 d477abc5a..58a24510e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -681,7 +681,11 @@ module.exports = { listConfirmation: '清单确认', ListConfirmationDeadline: '清单确认截止时间', dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空', + pleaseSelectinitiatedOrRejected:'请选择清单确认状态为未发起或拒绝的数据', + TheEngineerAndCertification:'的法规工程师、认证工程师不能为空', taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空', + theProjectContactEmpty:'的工程接口人不能为空', + PleaseTaskConfirmationRejected:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据', pleaseSelectPersonFirst: '请先选择人员', onlyOnePersonCanBeSelected: '只能选择一个人员', overrule: '驳回', diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 38a70644d..5082b874a 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -509,7 +509,6 @@ distributionEngineerList: this.distributionEngineerList } postAction(this.url.DetailEOAdd, query).then((res) => { - if (res.success) { if (res.success) { this.confirmLoading = false this.getList() @@ -519,7 +518,6 @@ this.confirmLoading = false this.$message.warning(res.message) } - } }) }, feedbackData(url, Action) { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index bcf18f0a6..f486e8b1c 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -158,7 +158,7 @@ this.textLoading = this.$t('Submitting') this.loading = true if (!this.isFlag) { - res.flag = '' + res.flag = 0 } this.completeTask(res, handlingTime) }) @@ -195,17 +195,17 @@ this.$message.success(this.$t('OperationSuccessful')) if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') { if (value.flag == 0) { - if (this.queryProject.verifyRemark) { + if (this.queryProject.verifyDeliverableType) { this.startProcessDesign(this.queryBy, 4) } - if (this.queryProject.prehomoRemark) { + if (this.queryProject.prehomoDeliverableType) { this.startProcessDesign(this.queryBy, 3) } - if (this.queryProject.designRemark) { + if (this.queryProject.designDeliverableType) { this.startProcessDesign(this.queryBy, 2) } - if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark && - !this.queryProject.designRemark) { + if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType && + !this.queryProject.designDeliverableType) { setTimeout(() => { this.loading = false window.close() diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 68f508967..e1f9c7be6 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -321,6 +321,7 @@ DueDate: 'designDueDate', remarks: 'designRemark', projectName: this.$route.query.projectName, + targetMarket:this.$route.query.targetMarket, projectNameId: this.$route.query.projectNameId, primaryKeyId: val.designTaskDetailId, PersonChargeFeedback: val.designPersonChargeFeedback @@ -345,6 +346,7 @@ DueDate: 'prehomoDueDate', remarks: 'prehomoRemark', projectName: this.$route.query.projectName, + targetMarket:this.$route.query.targetMarket, projectNameId: this.$route.query.projectNameId, primaryKeyId: val.prehomoTaskDetailId, PersonChargeFeedback: val.prehomoPersonChargeFeedback @@ -369,6 +371,7 @@ DueDate: 'verifyDueDate', remarks: 'verifyRemark', projectName: this.$route.query.projectName, + targetMarket:this.$route.query.targetMarket, projectNameId: this.$route.query.projectNameId, primaryKeyId: val.verifyTaskDetailId, PersonChargeFeedback: val.verifyPersonChargeFeedback diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index c7e77282b..2d4052ab3 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -46,7 +46,7 @@ @@ -60,7 +60,7 @@ @@ -158,7 +158,8 @@ @@ -168,13 +169,14 @@
- * + * {{$t('certificationLevel')}}
@@ -186,24 +188,24 @@
- * + * {{$t('areaOfResponsibility')}}
- +
- * + * {{$t('regulatoryEngineer')}}
@@ -211,7 +213,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - :disabled="formInline.roleCode == 0 ? false : true" + :disabled="formInline.roleCodeIndex == 0 ? false : true" v-model="formInline.regulationOwnerId"> - +
- * + * {{$t('certifiedEngineer')}}
@@ -237,7 +239,7 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - :disabled="formInline.roleCode == 0 ? false : true" + :disabled="formInline.roleCodeIndex == 0 ? false : true" v-model="formInline.homologationEngineerId">
- * + * {{$t('engineeringInterfacePerson')}}
@@ -261,7 +263,7 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - :disabled="formInline.roleCode == 0 ? false : true" + :disabled="formInline.roleCodeIndex == 0 ? false : true" v-model="formInline.engineeringInterfacePerson"> --> -
+
 {{$t('confirmationOfDesignConformity')}}
- +
@@ -325,7 +331,6 @@ tree-node-filter-prop="title" v-model="formInline.designDeliverableType" :maxTagCount="1" - :disabled="formInline.taskAffirmStatus != 'Not started' ? true : false" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -349,7 +354,6 @@
{{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' || formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -359,7 +363,9 @@
- +
@@ -368,7 +374,7 @@
- +
@@ -439,7 +447,9 @@
- +
@@ -455,10 +465,14 @@
-
+
 {{$t('PrehomoConfirmation')}}
- +
@@ -504,7 +518,9 @@
- +
@@ -513,7 +529,7 @@
- +
@@ -584,7 +602,9 @@
- +
@@ -600,10 +620,14 @@
-
+
 {{$t('verificationAndConformityconfirmation')}}
- +
@@ -648,7 +672,9 @@
- +
@@ -660,7 +686,7 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - :disabled="verifyInitiatorIdDisabled" + :disabled="formInline.roleCodeIndex == 0 ? false : true" v-model="formInline.verifyInitiatorId"> - +
@@ -728,7 +756,9 @@
- +
@@ -760,6 +790,7 @@ import { getAction, postAction, putAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' import moment from 'moment' + import { mapGetters } from 'vuex' export default { name: 'listEditModel', @@ -842,13 +873,16 @@ prehomoDutyIdDisabled: false, verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, - DeliverableTreeList: [] + DeliverableTreeList: [], + userInfoQuery:{}, } }, mounted() { this.getDeliverableTree() + this.userInfoQuery = this.userInfo() }, methods: { + ...mapGetters(['userInfo']), getDeliverableTree() { getAction('/sys/category/getDeliverableTree', {}).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index a270be398..4ff799c8c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1197,6 +1197,16 @@ } }, edit(item) { + let roleCodeIndex + if (this.isDisplay) { + roleCodeIndex = 0 + } else { + roleCodeIndex = 4 + } + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + roleCodeIndex = 0 + } + item.roleCodeIndex = roleCodeIndex this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item))) }, deleteLib(val) { @@ -1290,13 +1300,19 @@ if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) { this.detailedSuccessList.push(this.dataSource[i]) } else { - this.detailedWarningList.push(
{this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') }
) + this.detailedWarningList.push( < div > { + this + .dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') + } < /div>) // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) // isTrue = false // return } } else { - this.detailedWarningList.push(
{this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') }
) + this.detailedWarningList.push( < div > { + this + .dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') + } < /div>) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) // isTrue = false // return @@ -1307,12 +1323,12 @@ if (this.detailedSuccessList && this.detailedSuccessList.length > 0) { this.visible = true this.formInline = {} - }else{ + } else { let that = this this.$warning({ content: ( < div > - {that.detailedWarningList} + { that.detailedWarningList } < /div> ) }) @@ -1342,36 +1358,36 @@ if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') && dataList[i].inventoryAffirmStatus == 'Accepted') { if (dataList[i].engineeringInterfacePerson) { - if (dataList[i].verifyRemark) { + if (dataList[i].verifyDeliverableType) { if (dataList[i].verifyDueDate && dataList[i].verifyDutyId && dataList[i].verifyInitiatorId) { } else { - this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') }
) - continue; + this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>) + continue // isTrue = false // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) // return } } - if (dataList[i].prehomoRemark) { + if (dataList[i].prehomoDeliverableType) { if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId && dataList[i].prehomoInitiatorId) { } else { - this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') }
) - continue; + this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>) + continue // isTrue = false // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) // return } } - if (dataList[i].designRemark) { + if (dataList[i].designDeliverableType) { if (dataList[i].designDueDate && dataList[i].designDutyId && dataList[i].designInitiatorId) { } else { - this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') }
) - continue; + this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>) + continue // isTrue = false // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) // return @@ -1379,27 +1395,27 @@ } this.TaskSuccessList.push(dataList[i]) } else { - this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('theProjectContactEmpty') }
) + this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('theProjectContactEmpty') } < /div>) // isTrue = false // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) // return } } else { - this.TaskWarningList.push(
{dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') }
) + this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>) // isTrue = false // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected')) // return } } - if (this.TaskWarningList && this.TaskWarningList.length > 0) { + if (this.TaskSuccessList && this.TaskSuccessList.length > 0) { this.visible = true this.formInline = {} - }else{ + } else { let that = this this.$warning({ content: ( < div > - {that.TaskWarningList} + { that.TaskWarningList } < /div> ) }) @@ -1436,11 +1452,11 @@ this.confirmLoading = false } let that = this - if (this.detailedWarningList.length > 0){ + if (this.detailedWarningList.length > 0) { this.$warning({ content: ( < div > - {that.detailedWarningList} + { that.detailedWarningList } < /div> ) }) @@ -1449,20 +1465,20 @@ this.detailedWarningList = [] }) } else { - let index = 0 for (let i = 0; i < this.TaskSuccessList.length; i++) { - index++ - this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate - Object.keys(this.TaskSuccessList[i]).forEach(res => { - if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') - } - }) - setTimeout(() => { - this.confirmLoading = true - this.startProcess(this.TaskSuccessList[i], index) - }, 500) + ((i) => { + this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + Object.keys(this.TaskSuccessList[i]).forEach(res => { + if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { + this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') + this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') + } + }) + setTimeout(() => { + this.confirmLoading = true + this.startProcess(this.TaskSuccessList[i], (i + 1)) + }, 500) + })(i) } } } @@ -1502,11 +1518,11 @@ this.confirmLoading = false this.getList() let that = this - if (this.TaskWarningList.length > 0){ + if (this.TaskWarningList.length > 0) { this.$warning({ content: ( < div > - {that.TaskWarningList} + { that.TaskWarningList } < /div> ) }) From 1fe481ca17241c4739e8bfc3f3423ea32b14a800 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 18:14:41 +0800 Subject: [PATCH 06/56] =?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 --- .../projectManagement/components/listOfRegulations.vue | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4ff799c8c..e113e041a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1300,19 +1300,13 @@ if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) { this.detailedSuccessList.push(this.dataSource[i]) } else { - this.detailedWarningList.push( < div > { - this - .dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') - } < /div>) + this.detailedWarningList.push( < div > { this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) // isTrue = false // return } } else { - this.detailedWarningList.push( < div > { - this - .dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected') - } < /div>) + this.detailedWarningList.push( < div > {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) // isTrue = false // return From 148b90030faf1d01a6204f7dab99abcee7a0ffc0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 1 Jul 2022 18:24:36 +0800 Subject: [PATCH 07/56] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index b9108ffba..455dd593e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -845,23 +845,38 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl可以 - if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) { - projectRelatedPersonnel.setLawEngineerName(lawEngineerName); - projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName); - projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName); - }else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) { - //除了责任领域,其他的可以全为空->可以 + if(StringUtils.isBlank(lawEngineerName)){ projectRelatedPersonnel.setLawEngineerName(""); - projectRelatedPersonnel.setEngineeringInterfacePersonName(""); - projectRelatedPersonnel.setCertificationEngineerName(""); - }else {//除了责任领域,备注,有一个为空都报错 - if(CutEnum.CN.getValue().equals(cut)){ - throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行"); - }else{ - throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check line" + (i+1)); - } + }else{ + projectRelatedPersonnel.setLawEngineerName(lawEngineerName); } + if(StringUtils.isBlank(engineeringInterfacePersonName)){ + projectRelatedPersonnel.setEngineeringInterfacePersonName(""); + }else{ + projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName); + } + if(StringUtils.isBlank(certificationEngineerName)){ + projectRelatedPersonnel.setCertificationEngineerName(""); + }else{ + projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName); + } +// //除了责任领域全有值->可以 +// if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) { +// projectRelatedPersonnel.setLawEngineerName(lawEngineerName); +// projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName); +// projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName); +// }else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) { +// //除了责任领域,其他的可以全为空->可以 +// projectRelatedPersonnel.setLawEngineerName(""); +// projectRelatedPersonnel.setEngineeringInterfacePersonName(""); +// projectRelatedPersonnel.setCertificationEngineerName(""); +// }else {//除了责任领域,备注,有一个为空都报错 +// if(CutEnum.CN.getValue().equals(cut)){ +// throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行"); +// }else{ +// throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check line" + (i+1)); +// } +// } //导入的备注为数字,被识别成小数点后一位 Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); From 2e2f07f1d798d86063134b3df7500b807f82df58 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 1 Jul 2022 18:28:43 +0800 Subject: [PATCH 08/56] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo?= =?UTF-8?q?=E3=80=81=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?dre=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectTaskInventoryFeedbackEO.java | 1 + ...ectTaskInventoryFeedbackEOServiceImpl.java | 125 ++++++++++++++++-- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java index a7d172da4..9b90ffa39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java @@ -107,4 +107,5 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable { @ApiModelProperty(value = "序号") private String serialNumber; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index 57113bcd0..bbc66edb3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -1,27 +1,30 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.system.vo.LoginUser; -import com.jero.modules.project.entity.FeedbackHistory; -import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; -import com.jero.modules.project.entity.ProjectTaskInventoryFeedbackEO; +import com.jero.modules.feishu.vo.FeishuMsgVo; +import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.FeedBackHistoryDataStatusEnum; +import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.mapper.FeedbackHistoryMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryFeedbackEOMapper; -import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService; +import com.jero.modules.project.service.*; +import com.jero.modules.project.util.SendMessageUtils; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; -import java.util.List; -import java.util.Date; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -41,6 +44,24 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl sysUserQueryWrapper = new QueryWrapper<>(); + sysUserQueryWrapper.lambda().eq(SysUser::getUsername,projectTaskInventoryFeedbackEO.getCreateBy()); + List sysUserList = this.sysUserService.list(sysUserQueryWrapper); + if (CollectionUtils.isNotEmpty(sysUserList)) { + List userIdList = sysUserList.stream().map(SysUser::getId).distinct().collect(Collectors.toList()); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = this.projectTaskInventoryDetailEOMapper.selectOne( + new QueryWrapper().lambda().eq(ProjectTaskInventoryDetailEO::getId, projectTaskInventoryFeedbackEO.getProjectTaskInventoryId()) + ); + + ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne( + new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId()) + ); + + ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne( + new QueryWrapper().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()) + ); + + ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId()) + ); + + QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId()); + ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper); + + // 飞书消息封装 + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + + feishuMsgVo.setContent("Hello! " + currentUser.getUsername() + " has reply to your engineering deliverable information. Please check and address it in a timely manner."); + feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber()); + feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()); + feishuMsgVo.setInitiator(currentUser.getUsername()); + + //消息内容 + String msgContentEN = ""; + String flowType = projectTaskInventoryFeedbackEO.getFlowType(); + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has reply to your engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time."; + + feishuMsgVo.setTaskType("Design Compliance Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate())); + }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has reply to your engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time."; + + feishuMsgVo.setTaskType("Pre-Homo Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has reply to your engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time."; + + feishuMsgVo.setTaskType("Validation Compliance Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate())); + } + + //飞书跳转链接 + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + "-" + + projectYearNameInfoEO.getYearName() + + "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket(); + //系统内部跳转链接 + String href = "" + "Jump link" + ""; + String contentInfo = msgContentEN + " " + href; + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + //发送消息 + SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK); + } } /** From 070b65e0718074a6428c3c47da325d804d26b0a9 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 18:40:02 +0800 Subject: [PATCH 09/56] =?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 --- .../projectManagement/components/TaskParameterCollection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 74218183e..e1ba7c7dd 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -336,7 +336,7 @@ // 默认为0 可全部删除 let flag = 1 this.selectedRowKeysvalArray.forEach((item) => { - if (item.state !== '已完成' && val.state !== 'Finished') { + if (item.state !== '已完成' && item.state !== 'Finished') { flag = 0 } }) From 87c8e98e4ef7fc9e8c9404f33b078c175a1335fc Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 1 Jul 2022 18:48:10 +0800 Subject: [PATCH 10/56] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--excel=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 19 ++++++++++++++++++- 1 file changed, 18 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 7a3676aa6..d59bc2c96 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 @@ -3310,8 +3310,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 1 Jul 2022 18:50:57 +0800 Subject: [PATCH 11/56] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo?= =?UTF-8?q?=E3=80=81=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8Cdre=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=BB=99?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8F=91=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectTaskInventoryFeedbackEOServiceImpl.java | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index bbc66edb3..6041bbcbf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -14,6 +14,7 @@ import com.jero.modules.project.service.*; import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -118,7 +119,6 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl sysUserQueryWrapper = new QueryWrapper<>(); sysUserQueryWrapper.lambda().eq(SysUser::getUsername,projectTaskInventoryFeedbackEO.getCreateBy()); List sysUserList = this.sysUserService.list(sysUserQueryWrapper); @@ -302,6 +302,94 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getActiProcInstId,projectTaskInventoryFeedbackEO.getActiProcInstId()); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getFlowType,projectTaskInventoryFeedbackEO.getFlowType()); + queryWrapper.lambda().eq(ProjectTaskInventoryDetailEO::getTaskDefinitionKey, DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey()); + List projectTaskInventoryDetailEOS = this.projectTaskInventoryDetailEOMapper.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOS)){ + List userIdList = projectTaskInventoryDetailEOS.stream().map(ProjectTaskInventoryDetailEO::getUserId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne( + new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEOS.get(0).getProjectTaskInventoryId()) + ); + + ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne( + new QueryWrapper().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()) + ); + + ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId()) + ); + + QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId()); + ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper); + + // 飞书消息封装 + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + + feishuMsgVo.setContent("Hello! " + currentUser.getUsername() + " has submitted the engineering deliverable information. Please check and address it in a timely manner."); + feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber()); + feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()); + feishuMsgVo.setInitiator(currentUser.getUsername()); + + //消息内容 + String msgContentEN = ""; + String flowType = projectTaskInventoryFeedbackEO.getFlowType(); + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + "for design compliance confirmation. Please check and address it in time."; + + feishuMsgVo.setTaskType("Design Compliance Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate())); + }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for Pre-Homo confirmation. Please check and address it in time."; + + feishuMsgVo.setTaskType("Pre-Homo Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has submitted the engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time."; + + feishuMsgVo.setTaskType("Validation Compliance Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate())); + } + + //飞书跳转链接 + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + "-" + + projectYearNameInfoEO.getYearName() + + "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket(); + //系统内部跳转链接 + String href = "" + "Jump link" + ""; + String contentInfo = msgContentEN + " " + href; + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + //发送消息 + SendMessageUtils.sendMessage(msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.TASK); + } + } } /** From 36733e11ed024bd0d9977771431bbad351f70312 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Jul 2022 18:53:06 +0800 Subject: [PATCH 12/56] =?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 --- .../projectManagement/components/TaskParameterCollection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index e1ba7c7dd..74218183e 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -336,7 +336,7 @@ // 默认为0 可全部删除 let flag = 1 this.selectedRowKeysvalArray.forEach((item) => { - if (item.state !== '已完成' && item.state !== 'Finished') { + if (item.state !== '已完成' && val.state !== 'Finished') { flag = 0 } }) From eee6db760dbc6354709ea30253bd1d2d7c8f4138 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 1 Jul 2022 19:16:49 +0800 Subject: [PATCH 13/56] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=92=E8=89=B2=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/ProjectRoleEnum.java | 2 +- .../ProjectLawsInventoryEOController.java | 4 +- .../project/enums/ProjectRoleEnum.java | 49 +++++++++++++------ .../IProjectLawsInventoryEOService.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 42 ++++++++++++---- 5 files changed, 69 insertions(+), 30 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index e34041afb..8f4b0c151 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -7,7 +7,7 @@ public enum ProjectRoleEnum { STUDIO_ENGINEER("studio工程师","0","R&H Studio"), REGULATI_ENGINEER("法规工程师","1","studio"), HOMOLOGATION_ENGINEER("认证工程师","2","homo"), - REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4",""), + REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4","Regulatory Engineer/Certification Engineer"), MANAGER("领导角色","11","R&H Manager"), ADMIN("系统管理员","12","admin"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index e6344e7f8..704c077f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -443,9 +443,9 @@ public class ProjectLawsInventoryEOController extends JeroController> getRoleByUserId(String projectLibraryId) { + public Result> getRoleByUserId(String projectLibraryId,String cut) { Result> result = new Result<>(); - List list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId); + List list = projectLawsInventoryEOService.getRoleByUserId(projectLibraryId,cut); if(list==null||list.size()<=0) { result.error500("未找到角色信息"); }else { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java index 4f6ee04d2..e51aac31f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java @@ -1,30 +1,35 @@ package com.jero.modules.project.enums; +import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.system.util.StringUtils; + /** * 项目角色枚举类 */ public enum ProjectRoleEnum { - STUDIO_ENGINEER("studio工程师","0"), - REGULATI_ENGINEER("法规工程师","1"), - HOMOLOGATION_ENGINEER("认证工程师","2"), - ENGINEERING_INTERFACE_PERSON("工程接口人","3"), - REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4"), - DESIGNINITIATOR("设计符合性确认-发起人","5"), - DESIGNDUTY("设计符合性确认-责任人","6"), - PREHOMOINITIATOR("prehomo确认-发起人","7"), - PREHOMODUTY("prehomo确认-责任人","8"), - VERIFYINITIATOR("验证符合性确认-发起人","9"), - VERIFYDUTY("验证符合性确认-责任人","10"), - MANAGER("验证符合性确认-责任人","11"), - ADMIN("系统管理员","12"), + STUDIO_ENGINEER("studio工程师","0","R&H Studio"), + REGULATI_ENGINEER("法规工程师","1","Regulatory Engineer"), + HOMOLOGATION_ENGINEER("认证工程师","2","Certification Engineer"), + ENGINEERING_INTERFACE_PERSON("工程接口人","3","Engineering interface person"), + REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4","Regulatory and certification engineer"), + DESIGNINITIATOR("设计符合性确认-发起人","5",""), + DESIGNDUTY("设计符合性确认-责任人","6",""), + PREHOMOINITIATOR("prehomo确认-发起人","7",""), + PREHOMODUTY("prehomo确认-责任人","8",""), + VERIFYINITIATOR("验证符合性确认-发起人","9",""), + VERIFYDUTY("验证符合性确认-责任人","10",""), + MANAGER("验证符合性确认-责任人","11",""), + ADMIN("系统管理员","12",""), ; String name; String value; + String enName; - private ProjectRoleEnum(String name, String value) { + private ProjectRoleEnum(String name, String value,String enName) { this.name = name; this.value = value; + this.enName = enName; } public String getName() { @@ -43,11 +48,23 @@ public enum ProjectRoleEnum { this.value = value; } - public static String getTextByValue(String value) { + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public static String getTextByValue(String value,String cut) { ProjectRoleEnum[] values = values(); for (ProjectRoleEnum projectRoleEnum : values) { if (projectRoleEnum.value.equals(value)) { - return projectRoleEnum.name; + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return projectRoleEnum.name; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return projectRoleEnum.enName; + } } } return null; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 61e4e02af..5d5161245 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -148,5 +148,5 @@ public interface IProjectLawsInventoryEOService extends IService expediting(JSONObject json); - List getRoleByUserId(String projectLibraryId); + List getRoleByUserId(String projectLibraryId,String cut); } 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 d59bc2c96..e893bab9d 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 @@ -6293,7 +6293,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl getRoleByUserId(String projectLibraryId) { + public List getRoleByUserId(String projectLibraryId,String cut) { List sysRoles = new LinkedList<>(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //项目详情中取R&H Studio和认证工程师 @@ -6305,7 +6305,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl manager = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); List admin = roleList.stream().filter(e -> com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode().equals(e.getRoleCode())).collect(Collectors.toList()); - if (manager.size() != 0) { - manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue()); - sysRoles.addAll(manager); - } - if (admin.size() != 0) { - admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getValue()); - sysRoles.addAll(admin); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if (manager.size() != 0) { + manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getValue()); + sysRoles.addAll(manager); + } + if (admin.size() != 0) { + admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getValue()); + sysRoles.addAll(admin); + } + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + if (manager.size() != 0) { + manager.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.MANAGER.getCode()); + sysRoles.addAll(manager); + } + if (admin.size() != 0) { + admin.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode()); + admin.get(0).setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.ADMIN.getCode()); + sysRoles.addAll(admin); + } } + } return sysRoles; } From c3d02f6996e9c8b87fe1afe3647672bb16532966 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Sat, 2 Jul 2022 09:12:32 +0800 Subject: [PATCH 14/56] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= 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 e893bab9d..bb75562ad 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 @@ -6356,6 +6356,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Sat, 2 Jul 2022 09:47:35 +0800 Subject: [PATCH 15/56] =?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 --- .../ParameterItemCollectionList.vue | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 8a5ca15a8..57ceeffdf 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -303,39 +303,39 @@ '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' - + '{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}' - + '{{$t('CollectionInitiated')}}' - + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' - + {{$t('Submitted')}} - + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' - + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - + {{$t('completed')}} - + {{$t('Submitted')}} {{$t('timeoperation')}} @@ -954,6 +954,7 @@ } else if (homoJurisdictionSynchronousLibrary == 0) { this.visibleoperationFailed = true this.jurisdiction = 'HOMOTBSBK' + this.NoEngineer = 1 } }, // 同步上报库 @@ -969,11 +970,13 @@ handleSubmit() { // 填写人 权限 let dreJurisdictionSubmit = this.dreJurisdictionSubmit() + console.log(dreJurisdictionSubmit) if (dreJurisdictionSubmit == 1) { this.ishandleSubmit() } else if (dreJurisdictionSubmit == 0) { this.visibleoperationFailed = true this.jurisdiction = 'DREYYCS' + this.NoEngineer = 1 } }, // 提交数据 From 3ba874dfe879137f7e7694faa206478fe08b034b Mon Sep 17 00:00:00 2001 From: liyawei Date: Sat, 2 Jul 2022 09:52:01 +0800 Subject: [PATCH 16/56] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E9=85=8D=E7=BD=AE=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 18 +++++++ .../impl/ParamsManifestEOServiceImpl.java | 51 ------------------- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 6cc8feeff..bead11a58 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import com.jero.modules.cert.collect.entity.ParamsManifestEO; import com.jero.modules.cert.collect.enums.ManifestStateEnum; +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.service.IParamsConfigEOService; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; @@ -48,6 +49,9 @@ public class ParamsManifestEOController extends JeroController getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) { + boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId); + return Result.OK(configFlag); + } + /** * 添加 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 08e7848b1..730bc2942 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -290,60 +290,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = rows.getRecords(); - if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { - List manifestIdList = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList()); - Map> manifestMap = paramsCollectManifestEOService.queryByManifestIdList(manifestIdList); - - paramsManifestEOList.forEach(manifestEO -> { - /*Map map = paramsCollectManifestEOService.isCollectFinished(manifestEO.getId()); - Boolean finish = (Boolean) map.get("finish"); - Date time = (Date) map.get("time"); - if (finish) { - manifestEO.setState(ManifestStateEnum.FINISHED.getValue()); - manifestEO.setFinishTime(time); - - // 更新清单状态和完成时间 - ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); - updateParamsManifestEO.setId(manifestEO.getId()); - updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue()); - updateParamsManifestEO.setFinishTime(time); - updateById(updateParamsManifestEO); - - } else { - if (ManifestStateEnum.FINISHED.getValue().equals(manifestEO.getState())) { - // 更新清单状态和完成时间 - ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); - updateParamsManifestEO.setId(manifestEO.getId()); - updateParamsManifestEO.setState(ManifestStateEnum.COLLECTING.getValue()); - updateParamsManifestEO.setFinishTime(null); - updateById(updateParamsManifestEO); - } - manifestEO.setState(ManifestStateEnum.COLLECTING.getValue()); - manifestEO.setFinishTime(null); - - }*/ - - // 添加配置标识，清单参数项状态为 待发起、变更时，可添加配置 - boolean configFlag = getManifestConfigFlag(manifestMap.get(manifestEO.getId())); - manifestEO.setConfigFlag(configFlag); - - }); - } return rows; } - private boolean getManifestConfigFlag(List list) { - int number = (int) list.stream().filter(e->CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) - || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count(); - if (number == list.size() && list.size() > 0) { - return true; - } else { - return false; - } - } - /** * 变更扩展 * 仅能选择一条进行变更扩展 From a889cb39a89b08866bb75c0ae92722e58dfca180 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 09:59:55 +0800 Subject: [PATCH 17/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/jero/JLoading.vue | 2 +- .../components/ParameterItemCollectionList.vue | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue index 29a67aea8..8266f08ee 100644 --- a/jero-web/src/components/jero/JLoading.vue +++ b/jero-web/src/components/jero/JLoading.vue @@ -54,7 +54,7 @@ position: absolute; top: 0; left: 0; - z-index: 999; + z-index: 111999; width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.9); diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 57ceeffdf..79b133147 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1048,6 +1048,7 @@ }) let _this = this let param = { ids: _array.join(',') } + this.textLoading = true axios({ url: '/jero-boot/params/collectManifest/back', method: 'post', @@ -1066,14 +1067,17 @@ }) .then((res) => { if (res.data.success) { + this.textLoading = false _this.$message.success(_this.$t('OperationSuccessful')) _this.GetgetTableList() _this.selectedRowKeysValue = [] } else { + this.textLoading = false _this.$message.warning(_this.$t('operationFailed')) } }) .catch((error) => { + this.textLoading = false }) }, // 强制撤回权限 @@ -1093,6 +1097,7 @@ }) let _this = this let param = { ids: _array.join(',') } + this.textLoading = true axios({ url: '/jero-boot/params/collectManifest/withdraw', method: 'post', @@ -1111,14 +1116,17 @@ }) .then((res) => { if (res.data.success) { + this.textLoading = false _this.$message.success(_this.$t('OperationSuccessful')) _this.GetgetTableList() _this.selectedRowKeysValue = [] } else { + this.textLoading = false _this.$message.warning(_this.$t('operationFailed')) } }) .catch((error) => { + this.textLoading = false }) }, // 分配填写人 @@ -1195,6 +1203,7 @@ this.$confirm({ content: _this.$t('ConfirmBatchDeletion'), onOk() { + this.textLoading = true axios({ url: '/jero-boot/params/collectManifest/deleteBatch', method: 'post', @@ -1217,11 +1226,14 @@ _this.selectedRowKeys = [] _this.$refs.CollectionTabel.getData() _this.$refs.CollectionTabel.getTableList() + this.textLoading = false } else { + this.textLoading = false _this.$message.warning(_this.$t('operationFailed')) } }) .catch((error) => { + this.textLoading = false }) } }) From f78eab8764931eff282401d15e3c6f217e14f45a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sat, 2 Jul 2022 10:04:31 +0800 Subject: [PATCH 18/56] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E8=B0=83?= =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3=E6=8E=A7=E5=88=B6=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 14 ++++++++++++-- .../views/projectManagement/dialog/configure.vue | 6 ++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index e1ba7c7dd..6ccd19ade 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -198,7 +198,8 @@ conAdd: 'params/config/addBatch', conList: 'params/config/list', changeExtension: 'params/manifest/changeExtension', - verifyConfig: 'params/manifest/verifyConfig' + verifyConfig: 'params/manifest/verifyConfig', + configurelist:'params/manifest/getConfigFlag', }, loading: false, dataSource: [], @@ -214,6 +215,7 @@ version: 0, itemId: '', // 配置id itemRow: {}, // 配置一行数据 + configFlag:'', historicalVisible: false, historicalRow: {}, // 历史版本得数据 drawerVisible: false, @@ -272,9 +274,17 @@ }, // 配置 configure(item) { + console.log(item) this.itemId = item.id + getAction(this.url.configurelist, { paramsManifestId: this.itemId }).then((res) => { + if (res.success) { + this.configFlag = res.result + } else { + this.$message.warning(res.message) + } + }) this.itemRow = item - this.$refs.configureRef.addModel(item.id) + this.$refs.configureRef.addModel(item.id,this.configFlag) }, handleCancel(val) { this.areaVisible = val diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index db46275fa..f98be423a 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -155,6 +155,7 @@ projectNameList: [], title: '', stateOne: '', + configFlag:'', contentList: [], paramsConfigEOList: [ { @@ -185,10 +186,11 @@ } }) }, - addModel(id) { + addModel(id,configFlag) { this.paramsConfigEOList = [] this.visible = true this.title = this.$t('MaintainConfigureInfo') + this.configFlag = configFlag this.formInline = {} this.getconList(id) }, @@ -217,7 +219,7 @@ }) }, addConfiguration(item) { - if (this.itemRow.configFlag) { + if (this.configFlag) { this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { id: '', configName: '', // 配置名称 From ef2abd0e34734477771a1fdde0f5d6355a35c1c0 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 2 Jul 2022 10:16:47 +0800 Subject: [PATCH 19/56] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 22b43150c..8cd569344 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -8,3 +8,5 @@ ALTER TABLE `dummy_inventory_info` ADD COLUMN `verify_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '验证备注' AFTER `applicable_supplement`, ADD COLUMN `prehomo_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'pre备注' AFTER `verify_remark`, ADD COLUMN `design_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计备注' AFTER `prehomo_remark`; + +-- 2022年7月2日部署到正式环境 From 01d374319606b449f7817f09e81251c54f76063b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sat, 2 Jul 2022 10:25:32 +0800 Subject: [PATCH 20/56] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 16 ++++++++-------- .../views/projectManagement/dialog/configure.vue | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 6ccd19ade..7d07ab124 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -22,19 +22,19 @@
-
+
{{$t('addDetailList')}}
-
+
{{$t('changeExtension')}}
-
+
{{$t('copyParamDetailList')}}
-
+
{{$t('BatchDelete')}}
@@ -63,10 +63,10 @@ - {{$t('configure')}} - {{$t('edit')}} - {{$t('deleteLib')}} - {{$t('historicalVersion')}} + {{$t('configure')}} + {{$t('edit')}} + {{$t('deleteLib')}} + {{$t('historicalVersion')}}
diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index f98be423a..77b79bd53 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -95,9 +95,9 @@
- {{$t('addConfiguration')}} + {{$t('addConfiguration')}} - + {{$t('deleteConfiguration')}}
From b37d28de24966e9839028d88b616c2c9b368438b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sat, 2 Jul 2022 10:42:38 +0800 Subject: [PATCH 21/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/ProjectDetails/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index ce3f3f29c..b60174c35 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -51,7 +51,7 @@ {{$t('nonConformance')}}
-
@@ -80,7 +80,7 @@ @click="textClick(3,$t('nonConformance'))">
-
From 16979ff77904e294c0e7661c3c42afcbfd12e046 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 10:57:02 +0800 Subject: [PATCH 22/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 26 +++++++++++++++++- .../src/components/tableCollection/index.vue | 4 +-- .../ParameterItemCollectionList.vue | 27 ++++++++++--------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index c1a98b68e..b1667ab35 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -18,6 +18,7 @@
@@ -163,6 +164,7 @@
@@ -170,6 +172,7 @@
@@ -263,6 +267,7 @@
@@ -366,6 +372,7 @@
- + {{ itemin.label }} @@ -513,6 +520,7 @@
@@ -521,6 +529,7 @@
@@ -694,6 +703,13 @@ .ant-table td { white-space: nowrap; } + .selectWid .ant-select-selection--multiple { + overflow: auto; + } + + .selectWid .ant-select-selection--multiple::-webkit-scrollbar { + display: none; /* Chrome Safari */ + } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index fe68141ec..5aec4838b 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -375,10 +375,10 @@ this.areaVisible = true // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { + this.Dateline = {...this.Dateline} this.getquerySdtList(record) + this.$refs.ruleForm.clearValidate() }) - this.$refs.ruleForm.clearValidate() - }, dataValueTobeinitiated() { this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission')) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 79b133147..9bc09aff5 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -983,30 +983,31 @@ ishandleSubmit() { let _this = this let postDate = [] - for (let i = 0; i < this.selectedRowKeysValue.length; i++) { + let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue)) + for (let i = 0; i < selectedRowKeysValue.length; i++) { let postDateobj = {} - let itemIn = Object.keys(this.selectedRowKeysValue[i]) + let itemIn = Object.keys(selectedRowKeysValue[i]) for (let j = 0; j < itemIn.length; j++) { if (itemIn[j] !== 'sdt') { - if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') } - if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() } - if (!this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && this.selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' - && this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { - this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) + if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' + && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { + this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) return } } } } } - postDateobj.id = this.selectedRowKeysValue[i].id + postDateobj.id = selectedRowKeysValue[i].id postDate.push(postDateobj) } From ee95f795662dae2ac96cfca2ad946fddcb1a644b Mon Sep 17 00:00:00 2001 From: liyawei Date: Sat, 2 Jul 2022 11:02:02 +0800 Subject: [PATCH 23/56] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 26 ++++++++++--------- .../cert/collect/entity/ParamsManifestEO.java | 3 --- .../ParamsCollectManifestEOServiceImpl.java | 10 ++++--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index bead11a58..88cada6f2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -68,7 +69,7 @@ public class ParamsManifestEOController extends JeroController queryPageList(ParamsManifestEO paramsManifestEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -130,12 +131,13 @@ public class ParamsManifestEOController extends JeroController getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) { boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId); return Result.OK(configFlag); @@ -150,7 +152,7 @@ public class ParamsManifestEOController extends JeroController add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { boolean isSuccess = paramsManifestEOService.add(paramsManifestEO); if (isSuccess) { @@ -169,7 +171,7 @@ public class ParamsManifestEOController extends JeroController edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO); if (isSuccess) { @@ -188,7 +190,7 @@ public class ParamsManifestEOController extends JeroController delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { boolean isSuccess = paramsManifestEOService.deleteById(id, cut); if (isSuccess) { @@ -207,7 +209,7 @@ public class ParamsManifestEOController extends JeroController deleteBatch(@RequestBody ParamsManifestVO paramsManifestVO) { if (StringUtils.isEmpty(paramsManifestVO.getIds()) || StringUtils.isEmpty(paramsManifestVO.getCut())) { return Result.error("参数不能为空！"); @@ -229,7 +231,7 @@ public class ParamsManifestEOController extends JeroController changeExtension(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { boolean isSuccess = paramsManifestEOService.changeExtension(id, cut); if(isSuccess) { @@ -248,7 +250,7 @@ public class ParamsManifestEOController extends JeroController history(@RequestParam(name="title",required=true) String title) { List historyVersionList = paramsManifestEOService.getHistoryVersionList(title); return Result.OK(historyVersionList); @@ -263,7 +265,7 @@ public class ParamsManifestEOController extends JeroController getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="projectName",required=false) String projectName) { @@ -280,7 +282,7 @@ public class ParamsManifestEOController extends JeroController getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -299,7 +301,7 @@ public class ParamsManifestEOController extends JeroController copy(@RequestBody ParamsManifestVO paramsManifestVO) { ParamsManifestEO paramsManifestEO = new ParamsManifestEO(); BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO); @@ -315,7 +317,7 @@ public class ParamsManifestEOController extends JeroController queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) { List list = paramsConfigEOService.queryList(paramsManifestId); if (CollectionUtil.isNotEmpty(list)) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 68430dd6e..4862bf93f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -97,9 +97,6 @@ public class ParamsManifestEO implements Serializable { @TableField(exist = false) private String paramsTemplateName; - @TableField(exist = false) - private Boolean configFlag; // true-可添加配置；false-不可添加配置 - @TableField(exist = false) private String cut; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 55655c56c..917df22c9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -36,6 +36,7 @@ import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOSe import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; +import com.jero.modules.ocr.service.WebSocketServer; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -115,7 +116,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Sat, 2 Jul 2022 11:12:23 +0800 Subject: [PATCH 24/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/components/whole.vue | 8 ++++---- .../components/TaskParameterCollection.vue | 11 ++--------- .../views/projectManagement/dialog/configure.vue | 14 +++++++++++--- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index da08f6cd9..7c7b1e57b 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -10,7 +10,7 @@
-
+
+ v-html="item.serial_number"> - + - +
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7d07ab124..dda041031 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -274,17 +274,10 @@ }, // 配置 configure(item) { - console.log(item) this.itemId = item.id - getAction(this.url.configurelist, { paramsManifestId: this.itemId }).then((res) => { - if (res.success) { - this.configFlag = res.result - } else { - this.$message.warning(res.message) - } - }) + this.itemRow = item - this.$refs.configureRef.addModel(item.id,this.configFlag) + this.$refs.configureRef.addModel(item.id) }, handleCancel(val) { this.areaVisible = val diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 77b79bd53..b0ae4022b 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -175,6 +175,7 @@ }, mounted() { + }, methods: { getNameList() { @@ -186,13 +187,19 @@ } }) }, - addModel(id,configFlag) { + addModel(id) { this.paramsConfigEOList = [] this.visible = true this.title = this.$t('MaintainConfigureInfo') - this.configFlag = configFlag this.formInline = {} this.getconList(id) + getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => { + if (res.success) { + this.configFlag = res.result + } else { + this.$message.warning(res.message) + } + }) }, getconList(id) { getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => { @@ -219,7 +226,8 @@ }) }, addConfiguration(item) { - if (this.configFlag) { + console.log(this.configFlag) + if (this.configFlag == true) { this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { id: '', configName: '', // 配置名称 From d155adacc0dabdb61e3383e883a3b11e10d3d77c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 11:35:19 +0800 Subject: [PATCH 25/56] =?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/ReferenceParameter/index.vue | 135 +++++++++++++++--- 1 file changed, 113 insertions(+), 22 deletions(-) diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index d73eaf0a2..94db39bf8 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -6,41 +6,76 @@ ref='ruleForm' :model='formInline' :rules='rules' - :label-col='labelCol' - :wrapper-col='wrapperCol' > - -
- * -
{{ $t('from') }}   
- - - +
+
+ * + {{$t('from')}} +
+ + + + {{ item.label }} -
    {{ $t('configure') }}
-
- +     {{ $t('configure') }} + + +
+ + + + + + + + + + + + + + - -
- * -
{{ $t('ReferenceTo') }}   
- - - +
+
+ * + {{$t('ReferenceTo')}} +
+ + + + {{ item.label }} -
    {{ $t('configure') }}
-
- +     {{ $t('configure') }} + +
+ + + + + + + + + + + + + + @@ -265,6 +300,14 @@ export default { display: flex; justify-content: center; } +.itemOption { + display: inline-block; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} \ No newline at end of file From bf68ee69c00b3d19561dc8fece1fbfea2bc21f37 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sat, 2 Jul 2022 11:41:32 +0800 Subject: [PATCH 26/56] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOController.java | 170 ++++++++++++++ .../NewOpinionTemplateEOController.java | 170 ++++++++++++++ .../NewStandardTemplateEOController.java | 170 ++++++++++++++ .../entity/LawsMonthlyReportWriteEO.java | 193 ++++++++++++++++ .../report/entity/NewOpinionTemplateEO.java | 91 ++++++++ .../report/entity/NewStandardTemplateEO.java | 98 ++++++++ .../report/enums/ContentTemplateEnum.java | 40 ++++ .../LawsMonthlyReportWriteEOMapper.java | 17 ++ .../mapper/NewOpinionTemplateEOMapper.java | 17 ++ .../mapper/NewStandardTemplateEOMapper.java | 17 ++ .../xml/LawsMonthlyReportWriteEOMapper.xml | 33 +++ .../mapper/xml/NewOpinionTemplateEOMapper.xml | 17 ++ .../xml/NewStandardTemplateEOMapper.xml | 18 ++ .../ILawsMonthlyReportWriteEOService.java | 72 ++++++ .../service/INewOpinionTemplateEOService.java | 61 +++++ .../INewStandardTemplateEOService.java | 61 +++++ .../LawsMonthlyReportWriteEOServiceImpl.java | 212 ++++++++++++++++++ .../impl/NewOpinionTemplateEOServiceImpl.java | 89 ++++++++ .../NewStandardTemplateEOServiceImpl.java | 89 ++++++++ 19 files changed, 1635 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java new file mode 100644 index 000000000..ea0dc4d54 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Api(tags="月报填写") +@RestController +@RequestMapping("/report/lawsMonthlyReportWriteEO") +@Slf4j +public class LawsMonthlyReportWriteEOController extends JeroController { + @Autowired + private ILawsMonthlyReportWriteEOService lawsMonthlyReportWriteEOService; + + /** + * 分页列表查询 + * + * @param lawsMonthlyReportWriteEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "月报填写-分页列表查询") + @ApiOperation(value="月报填写-分页列表查询", notes="月报填写-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = lawsMonthlyReportWriteEOService.getPageInfo(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "月报填写-列表查询") + @ApiOperation(value="月报填写-列表查询", notes="月报填写-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = lawsMonthlyReportWriteEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @AutoLog(value = "月报填写-添加") + @ApiOperation(value="月报填写-添加", notes="月报填写-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + lawsMonthlyReportWriteEOService.add(lawsMonthlyReportWriteEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @AutoLog(value = "月报填写-编辑") + @ApiOperation(value="月报填写-编辑", notes="月报填写-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + lawsMonthlyReportWriteEOService.editById(lawsMonthlyReportWriteEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "月报填写-通过id删除") + @ApiOperation(value="月报填写-通过id删除", notes="月报填写-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + lawsMonthlyReportWriteEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "月报填写-批量删除") + @ApiOperation(value="月报填写-批量删除", notes="月报填写-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.lawsMonthlyReportWriteEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "月报填写-通过id查询") + @ApiOperation(value="月报填写-通过id查询", notes="月报填写-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = lawsMonthlyReportWriteEOService.queryById(id); + if(lawsMonthlyReportWriteEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(lawsMonthlyReportWriteEO); + } + + /** + * 导出excel + * + * @param request + * @param lawsMonthlyReportWriteEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + return super.exportXls(request, lawsMonthlyReportWriteEO, LawsMonthlyReportWriteEO.class, "月报填写"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LawsMonthlyReportWriteEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java new file mode 100644 index 000000000..af8e55437 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewOpinionTemplateEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.jero.modules.report.service.INewOpinionTemplateEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Api(tags="新征求意见清单模板") +@RestController +@RequestMapping("/report/newOpinionTemplateEO") +@Slf4j +public class NewOpinionTemplateEOController extends JeroController { + @Autowired + private INewOpinionTemplateEOService newOpinionTemplateEOService; + + /** + * 分页列表查询 + * + * @param newOpinionTemplateEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "新征求意见清单模板-分页列表查询") + @ApiOperation(value="新征求意见清单模板-分页列表查询", notes="新征求意见清单模板-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(NewOpinionTemplateEO newOpinionTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(newOpinionTemplateEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = newOpinionTemplateEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "新征求意见清单模板-列表查询") + @ApiOperation(value="新征求意见清单模板-列表查询", notes="新征求意见清单模板-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = newOpinionTemplateEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param newOpinionTemplateEO + * @return + */ + @AutoLog(value = "新征求意见清单模板-添加") + @ApiOperation(value="新征求意见清单模板-添加", notes="新征求意见清单模板-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody NewOpinionTemplateEO newOpinionTemplateEO) { + newOpinionTemplateEOService.add(newOpinionTemplateEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param newOpinionTemplateEO + * @return + */ + @AutoLog(value = "新征求意见清单模板-编辑") + @ApiOperation(value="新征求意见清单模板-编辑", notes="新征求意见清单模板-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody NewOpinionTemplateEO newOpinionTemplateEO) { + newOpinionTemplateEOService.editById(newOpinionTemplateEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "新征求意见清单模板-通过id删除") + @ApiOperation(value="新征求意见清单模板-通过id删除", notes="新征求意见清单模板-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + newOpinionTemplateEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "新征求意见清单模板-批量删除") + @ApiOperation(value="新征求意见清单模板-批量删除", notes="新征求意见清单模板-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.newOpinionTemplateEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "新征求意见清单模板-通过id查询") + @ApiOperation(value="新征求意见清单模板-通过id查询", notes="新征求意见清单模板-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NewOpinionTemplateEO newOpinionTemplateEO = newOpinionTemplateEOService.queryById(id); + if(newOpinionTemplateEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(newOpinionTemplateEO); + } + + /** + * 导出excel + * + * @param request + * @param newOpinionTemplateEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NewOpinionTemplateEO newOpinionTemplateEO) { + return super.exportXls(request, newOpinionTemplateEO, NewOpinionTemplateEO.class, "新征求意见清单模板"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NewOpinionTemplateEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java new file mode 100644 index 000000000..9dfdc1ded --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/NewStandardTemplateEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.report.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.jero.modules.report.service.INewStandardTemplateEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Api(tags="新发布标准清单模板") +@RestController +@RequestMapping("/report/newStandardTemplateEO") +@Slf4j +public class NewStandardTemplateEOController extends JeroController { + @Autowired + private INewStandardTemplateEOService newStandardTemplateEOService; + + /** + * 分页列表查询 + * + * @param newStandardTemplateEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "新发布标准清单模板-分页列表查询") + @ApiOperation(value="新发布标准清单模板-分页列表查询", notes="新发布标准清单模板-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(NewStandardTemplateEO newStandardTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(newStandardTemplateEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = newStandardTemplateEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "新发布标准清单模板-列表查询") + @ApiOperation(value="新发布标准清单模板-列表查询", notes="新发布标准清单模板-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = newStandardTemplateEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param newStandardTemplateEO + * @return + */ + @AutoLog(value = "新发布标准清单模板-添加") + @ApiOperation(value="新发布标准清单模板-添加", notes="新发布标准清单模板-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody NewStandardTemplateEO newStandardTemplateEO) { + newStandardTemplateEOService.add(newStandardTemplateEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param newStandardTemplateEO + * @return + */ + @AutoLog(value = "新发布标准清单模板-编辑") + @ApiOperation(value="新发布标准清单模板-编辑", notes="新发布标准清单模板-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody NewStandardTemplateEO newStandardTemplateEO) { + newStandardTemplateEOService.editById(newStandardTemplateEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "新发布标准清单模板-通过id删除") + @ApiOperation(value="新发布标准清单模板-通过id删除", notes="新发布标准清单模板-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + newStandardTemplateEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "新发布标准清单模板-批量删除") + @ApiOperation(value="新发布标准清单模板-批量删除", notes="新发布标准清单模板-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.newStandardTemplateEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "新发布标准清单模板-通过id查询") + @ApiOperation(value="新发布标准清单模板-通过id查询", notes="新发布标准清单模板-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NewStandardTemplateEO newStandardTemplateEO = newStandardTemplateEOService.queryById(id); + if(newStandardTemplateEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(newStandardTemplateEO); + } + + /** + * 导出excel + * + * @param request + * @param newStandardTemplateEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NewStandardTemplateEO newStandardTemplateEO) { + return super.exportXls(request, newStandardTemplateEO, NewStandardTemplateEO.class, "新发布标准清单模板"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NewStandardTemplateEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java new file mode 100644 index 000000000..c7b84b430 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -0,0 +1,193 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Data +@TableName("laws_monthly_report_write") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_monthly_report_write对象", description="月报填写") +public class LawsMonthlyReportWriteEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**月份*/ + @Excel(name = "月份", width = 15) + @ApiModelProperty(value = "月份") + private java.lang.String month; + + /**章节目录*/ + @Excel(name = "章节目录", width = 15) + @ApiModelProperty(value = "章节目录") + private java.lang.String memoriesChapter; + + //章节目录名称 + @TableField(exist = false) + private java.lang.String memoriesChapterName; + + /**内容模板*/ + @Excel(name = "内容模板", width = 15) + @ApiModelProperty(value = "内容模板") + private java.lang.String contentTemplate; + + /**中文标题*/ + @Excel(name = "中文标题", width = 15) + @ApiModelProperty(value = "中文标题") + private java.lang.String titleCn; + + /**英文标题*/ + @Excel(name = "英文标题", width = 15) + @ApiModelProperty(value = "英文标题") + private java.lang.String titleEn; + + /**相关领域*/ + @Excel(name = "相关领域", width = 15) + @ApiModelProperty(value = "相关领域") + private java.lang.String technologyTerritory; + + /**适用车型*/ + @Excel(name = "适用车型", width = 15) + @ApiModelProperty(value = "适用车型") + private java.lang.String applyCar; + + /**适用范围*/ + @Excel(name = "适用范围", width = 15) + @ApiModelProperty(value = "适用范围") + private java.lang.String applyScope; + + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String state; + + /**用法*/ + @Excel(name = "用法", width = 15) + @ApiModelProperty(value = "用法") + private java.lang.String useMethod; + + /**实施车型*/ + @Excel(name = "实施车型", width = 15) + @ApiModelProperty(value = "实施车型") + private java.lang.String implementCar; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date issueTime; + + /**新车型实施日期*/ + @Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "新车型实施日期") + private java.util.Date newCarImplementTime; + + /**在产车实施日期*/ + @Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "在产车实施日期") + private java.util.Date productionCarImplementTime; + + /**主要内容中文*/ + @Excel(name = "主要内容中文", width = 15) + @ApiModelProperty(value = "主要内容中文") + private java.lang.String contentCn; + + /**主要内容英文*/ + @Excel(name = "主要内容英文", width = 15) + @ApiModelProperty(value = "主要内容英文") + private java.lang.String contentEn; + + /**NIO工作进展中文*/ + @Excel(name = "NIO工作进展中文", width = 15) + @ApiModelProperty(value = "NIO工作进展中文") + private java.lang.String workProgressCn; + + /**NIO工作进展英文*/ + @Excel(name = "NIO工作进展英文", width = 15) + @ApiModelProperty(value = "NIO工作进展英文") + private java.lang.String workProgressEn; + + /**法规联系人*/ + @Excel(name = "法规联系人", width = 15) + @ApiModelProperty(value = "法规联系人") + private java.lang.String lawsContact; + + /**链接*/ + @Excel(name = "链接", width = 15) + @ApiModelProperty(value = "链接") + private java.lang.String link; + + /**导出状态*/ + @ApiModelProperty(value = "导出状态") + private java.lang.String exportState; + + //新征求意见清单模板 + @TableField(exist = false) + private List newOpinionTemplateEOList; + + //新发布标准清单模板 + @TableField(exist = false) + private List newStandardTemplateEOList; + + @TableField(exist = false) + private String cut; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java new file mode 100644 index 000000000..fcd2ec8d8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java @@ -0,0 +1,91 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Data +@TableName("new_opinion_template") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="new_opinion_template对象", description="新征求意见清单模板") +public class NewOpinionTemplateEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**月报填写表id*/ + @Excel(name = "月报填写表id", width = 15) + @ApiModelProperty(value = "月报填写表id") + private java.lang.String lawsMonthlyReportWriteId; + + /**计划号中文*/ + @Excel(name = "计划号中文", width = 15) + @ApiModelProperty(value = "计划号中文") + private java.lang.String planNumberCn; + + /**标准名称中文*/ + @Excel(name = "标准名称中文", width = 15) + @ApiModelProperty(value = "标准名称中文") + private java.lang.String standardNameCn; + + /**标准名称英文*/ + @Excel(name = "标准名称英文", width = 15) + @ApiModelProperty(value = "标准名称英文") + private java.lang.String standardNameEn; + + /**征求意见截止日期*/ + @Excel(name = "征求意见截止日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "征求意见截止日期") + private java.util.Date expirationDate; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java new file mode 100644 index 000000000..ca7363247 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java @@ -0,0 +1,98 @@ +package com.jero.modules.report.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Data +@TableName("new_standard_template") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="new_standard_template对象", description="新发布标准清单模板") +public class NewStandardTemplateEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**月报填写表id*/ + @Excel(name = "月报填写表id", width = 15) + @ApiModelProperty(value = "月报填写表id") + private java.lang.String lawsMonthlyReportWriteId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 15) + @ApiModelProperty(value = "标准编号") + private java.lang.String standardNumber; + + /**标准名称中文*/ + @Excel(name = "标准名称中文", width = 15) + @ApiModelProperty(value = "标准名称中文") + private java.lang.String standardNameCn; + + /**标准名称英文*/ + @Excel(name = "标准名称英文", width = 15) + @ApiModelProperty(value = "标准名称英文") + private java.lang.String standardNameEn; + + /**发布日期*/ + @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private java.util.Date issueTime; + + /**实施日期*/ + @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实施日期") + private java.util.Date implementTime; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java new file mode 100644 index 000000000..08679a039 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java @@ -0,0 +1,40 @@ +package com.jero.modules.report.enums; + +import com.sun.tools.doclets.formats.html.resources.standard; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum ContentTemplateEnum { + DEFAULT_TEMPLATE("Content template","1"), + NEW_REQUEST_LIST_TEMPLATE("新征求意见清单模板","2"), + NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"); + + + + String name; + String value; + + private ContentTemplateEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java new file mode 100644 index 000000000..71197a5af --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/LawsMonthlyReportWriteEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface LawsMonthlyReportWriteEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java new file mode 100644 index 000000000..441b6351d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewOpinionTemplateEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface NewOpinionTemplateEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java new file mode 100644 index 000000000..33b248d73 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/NewStandardTemplateEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.report.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface NewStandardTemplateEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml new file mode 100644 index 000000000..17fc90742 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml new file mode 100644 index 000000000..ddd0bdae5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewOpinionTemplateEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml new file mode 100644 index 000000000..c41c66e29 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/NewStandardTemplateEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java new file mode 100644 index 000000000..733f6d18f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java @@ -0,0 +1,72 @@ +package com.jero.modules.report.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface ILawsMonthlyReportWriteEOService extends IService { + + /** + * 保存 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); + + /** + * 编辑 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + LawsMonthlyReportWriteEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * 分页 + * @param page + * @param queryWrapper + * @return + */ + IPage getPageInfo(Page page, QueryWrapper queryWrapper); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java new file mode 100644 index 000000000..401a0c9f6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewOpinionTemplateEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.report.service; + +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface INewOpinionTemplateEOService extends IService { + + /** + * 保存 + * + * @param newOpinionTemplateEO + * @return + */ + void add(NewOpinionTemplateEO newOpinionTemplateEO); + + /** + * 更新 + * + * @param newOpinionTemplateEO + * @return + */ + void editById(NewOpinionTemplateEO newOpinionTemplateEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + NewOpinionTemplateEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java new file mode 100644 index 000000000..357b739f4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/INewStandardTemplateEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.report.service; + +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +public interface INewStandardTemplateEOService extends IService { + + /** + * 保存 + * + * @param newStandardTemplateEO + * @return + */ + void add(NewStandardTemplateEO newStandardTemplateEO); + + /** + * 更新 + * + * @param newStandardTemplateEO + * @return + */ + void editById(NewStandardTemplateEO newStandardTemplateEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + NewStandardTemplateEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java new file mode 100644 index 000000000..5cd7e09cd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -0,0 +1,212 @@ +package com.jero.modules.report.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.jero.modules.report.enums.ContentTemplateEnum; +import com.jero.modules.report.mapper.LawsMonthlyReportWriteEOMapper; +import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; +import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; +import com.jero.modules.report.service.INewOpinionTemplateEOService; +import com.jero.modules.report.service.INewStandardTemplateEOService; +import com.jero.modules.system.util.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import java.util.UUID; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 月报填写 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Service +public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportWriteEOService { + + @Autowired + private INewOpinionTemplateEOService iNewOpinionTemplateEOService; + @Autowired + private INewStandardTemplateEOService iNewStandardTemplateEOService; + @Autowired + private ILawsMonthlyReportTitleTemplateEOService lawsMonthlyReportTitleTemplateEOService; + /** + * 保存 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @Override + public void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + Date now = new Date(); + lawsMonthlyReportWriteEO.setCreateTime(now); + lawsMonthlyReportWriteEO.setUpdateTime(now); + save(lawsMonthlyReportWriteEO); + + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + for (NewOpinionTemplateEO newOpinionTemplateEO : newOpinionTemplateEOList) { + newOpinionTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } + iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); + + }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + for (NewStandardTemplateEO newStandardTemplateEO : newStandardTemplateEOList) { + newStandardTemplateEO.setLawsMonthlyReportWriteId(lawsMonthlyReportWriteEO.getId()); + } + iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); + } + } + + /** + * 编辑 + * + * @param lawsMonthlyReportWriteEO + * @return + */ + @Override + public void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + Date now = new Date(); + lawsMonthlyReportWriteEO.setUpdateTime(now); + saveOrUpdate(lawsMonthlyReportWriteEO); + + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); + iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList); + + }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); + iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList); + } + + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + //删除新征求意见清单模板 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,ids); + iNewOpinionTemplateEOService.remove(wrapper); + + //删除新发布标准清单模板 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,ids); + iNewStandardTemplateEOService.remove(queryWrapper); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public LawsMonthlyReportWriteEO queryById(String id) { + LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = getById(id); + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,id); + List newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(newOpinionTemplateEOList); + + }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,id); + List newStandardTemplateEOList = iNewStandardTemplateEOService.list(queryWrapper); + lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(newStandardTemplateEOList); + } + return lawsMonthlyReportWriteEO; + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public IPage getPageInfo(Page page, QueryWrapper queryWrapper) { + Page pageInfo = this.page(page, queryWrapper); + //法规月报id + List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); + //获取章节目录 + List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); + + //新征求意见清单模板 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + List newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + + //新发布标准清单模板 + LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); + qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + List newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); + + for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { + //处理章节目录 + if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ + List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); + }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); + } + } + + if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新征求意见清单模板 + List collect = newOpinionTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); + lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect); + + }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ + //新发布标准清单模板 + List collect = newStandardTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); + lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect); + } + } + return pageInfo; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java new file mode 100644 index 000000000..4774386de --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewOpinionTemplateEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.report.service.impl; + +import com.jero.modules.report.entity.NewOpinionTemplateEO; +import com.jero.modules.report.mapper.NewOpinionTemplateEOMapper; +import com.jero.modules.report.service.INewOpinionTemplateEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 新征求意见清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Service +public class NewOpinionTemplateEOServiceImpl extends ServiceImpl implements INewOpinionTemplateEOService { + + /** + * 保存 + * + * @param newOpinionTemplateEO + * @return + */ + @Override + public void add(NewOpinionTemplateEO newOpinionTemplateEO) { + Date now = new Date(); + newOpinionTemplateEO.setCreateTime(now); + newOpinionTemplateEO.setUpdateTime(now); + save(newOpinionTemplateEO); + } + + /** + * 更新 + * + * @param newOpinionTemplateEO + * @return + */ + @Override + public void editById(NewOpinionTemplateEO newOpinionTemplateEO) { + Date now = new Date(); + newOpinionTemplateEO.setUpdateTime(now); + saveOrUpdate(newOpinionTemplateEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public NewOpinionTemplateEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java new file mode 100644 index 000000000..ed1bcb4b8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/NewStandardTemplateEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.report.service.impl; + +import com.jero.modules.report.entity.NewStandardTemplateEO; +import com.jero.modules.report.mapper.NewStandardTemplateEOMapper; +import com.jero.modules.report.service.INewStandardTemplateEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 新发布标准清单模板 + * @Author: jero-boot + * @Date: 2022-07-02 + * @Version: V1.0 + */ +@Service +public class NewStandardTemplateEOServiceImpl extends ServiceImpl implements INewStandardTemplateEOService { + + /** + * 保存 + * + * @param newStandardTemplateEO + * @return + */ + @Override + public void add(NewStandardTemplateEO newStandardTemplateEO) { + Date now = new Date(); + newStandardTemplateEO.setCreateTime(now); + newStandardTemplateEO.setUpdateTime(now); + save(newStandardTemplateEO); + } + + /** + * 更新 + * + * @param newStandardTemplateEO + * @return + */ + @Override + public void editById(NewStandardTemplateEO newStandardTemplateEO) { + Date now = new Date(); + newStandardTemplateEO.setUpdateTime(now); + saveOrUpdate(newStandardTemplateEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public NewStandardTemplateEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From fcbd926115b47071e4d1c51cbc82236660f0de48 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sat, 2 Jul 2022 12:09:57 +0800 Subject: [PATCH 27/56] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BC=BA=E5=B0=91=E4=B8=AD=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d477abc5a..1bd9d1cd4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -880,7 +880,8 @@ module.exports = { yellowSchedule: '黄：不符合/待追踪，有可接受的方案和时间表', greenRequirements: '绿：确认符合或满足当前要求', blueUndeterminedState: '蓝：未判断状态', - authenticationMessage: '认证消息', + authenticationMessage: '认证参数任务', + taskRegulationComplianceTask: '法规符合性任务', accept: '接受', refuse: '拒绝', taskTermination: '任务终止', From 50003ad6f53eb1b45b0d75ccc84c9a79792b1fff Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 12:19:30 +0800 Subject: [PATCH 28/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 24 +++++++++++-- .../ParameterItemCollectionList.vue | 34 +++++++++++++++---- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 5aec4838b..7ee83c1f0 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -139,6 +139,7 @@ import axios from 'axios' import Vue from 'vue' import VueDraggableResizable from 'vue-draggable-resizable' + import { mapGetters } from 'vuex' export default { name: 'index', @@ -266,6 +267,7 @@ } }, methods: { + ...mapGetters(['userInfo']), rowClassName(row, index) { if (row.changeFlag == '1') { return 'rowClassRedYellow' @@ -397,8 +399,26 @@ } getAction(this.url.getLoginUserType, params).then((res) => { if (res.success) { - this.getTableList(res.result[0].value) - this.$emit('LoginUserType', res.result, this.currentPersonRole) + this.getAndUserId(res.result) + } + }) + }, + getAndUserId(result) { + let query = { + paramsManifestId: this.$route.query.id, + projectId:this.$route.query.projectId, + userId: this.userInfo().id + } + getAction('/params/userTypeLog/queryCurrentType', query).then((res) => { + if (res.success) { + if (res.result && res.result.userType){ + this.getTableList(res.result.userType) + }else{ + this.getTableList(result[0].value) + } + this.$emit('LoginUserType', result, this.currentPersonRole,res.result.userType) + } else { + } }) }, diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 9bc09aff5..2ee7d3388 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -363,6 +363,7 @@ import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' import Vue from 'vue' + import { mapGetters } from 'vuex' export default { name: 'ParameterItemCollectionList', @@ -506,14 +507,35 @@ document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') }, methods: { + ...mapGetters(['userInfo']), handleCancelRoleSwitching() { this.visibleRoleSwitching = false }, handleOkRoleSwitching() { - this.visibleRoleSwitching = false - this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode - localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) - this.selectedRowKeysValue = [] + this.$refs.ruleFormRoleSwitching.validate(valid => { + if (valid) { + let query = { + userType: this.formInlineRoleSwitching.roleSwitchingCode, + paramsManifestId: this.$route.query.id, + projectId: this.$route.query.projectId, + userId: this.userInfo().id + } + this.confirmLoadingRoleSwitching = true + postAction('/params/userTypeLog/edit', query).then((res) => { + if (res.success) { + this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode + this.$message.success(this.$t('OperationSuccessful')) + this.visibleRoleSwitching = false + this.confirmLoadingRoleSwitching = false + localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) + this.selectedRowKeysValue = [] + } else { + this.confirmLoadingRoleSwitching = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) }, roleSwitchingClick() { this.visibleRoleSwitching = true @@ -792,13 +814,13 @@ } return flag }, - LoginUserType(val, currentPersonRole) { + LoginUserType(val, currentPersonRole,userType) { this.RoleType = [] if (this.currentPersonRole == '') { this.currentPersonRole = val.length >= 1 ? val[0].value : '' } this.RoleType = val - this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || val[0].value + this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } }, // 表格所选中得行内容 From 44d0f740fdb75265a6b41009c77ae9e64cc52b46 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 12:23:36 +0800 Subject: [PATCH 29/56] =?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 --- .../processCenter/components/reviewedByThePersonInCharge.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index acff4364e..fc760921f 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -93,11 +93,12 @@
- * + {{$t('Deliverables')}}
- + + {{ (formInline.fileId === 'null' || formInline.fileId === '' || From 140944f67bf33d247a9f851fe2f50b374908119d Mon Sep 17 00:00:00 2001 From: liyawei Date: Sat, 2 Jul 2022 12:46:10 +0800 Subject: [PATCH 30/56] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=88=87=E6=8D=A2=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=97=A5=E5=BF=97-=E7=BC=96=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestUserTypeLogEOServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java index 9d34288d8..1eb8f8523 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.collect.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO; import com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper; @@ -41,6 +42,14 @@ public class ParamsCollectManifestUserTypeLogEOServiceImpl extends ServiceImpl

Date: Sat, 2 Jul 2022 13:05:56 +0800 Subject: [PATCH 31/56] =?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/listEditModel.vue | 90 ++++++++++++------- .../components/listOfRegulations.vue | 8 +- 2 files changed, 66 insertions(+), 32 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 2d4052ab3..3eed26d00 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -313,13 +313,17 @@

+ (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">  {{$t('confirmationOfDesignConformity')}}
+ (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -364,8 +368,10 @@ + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -427,8 +433,10 @@ + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -448,8 +456,10 @@ + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -466,13 +476,17 @@
+ (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">  {{$t('PrehomoConfirmation')}}
+ (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -519,8 +533,10 @@ + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -582,8 +598,10 @@ + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -603,8 +621,10 @@ + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.prehomoInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -621,13 +641,17 @@
+ (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">  {{$t('verificationAndConformityconfirmation')}}
+ (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -673,8 +697,10 @@ + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -736,8 +762,10 @@ + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
@@ -757,8 +785,10 @@ + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId && + formInline.homologationEngineerId == userInfoQuery.id) || + (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId && + formInline.regulationOwnerId == userInfoQuery.id)">
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e113e041a..ea9ca3462 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -161,7 +161,11 @@ > {{ $t('edit') }} @@ -1356,7 +1360,7 @@ if (dataList[i].verifyDueDate && dataList[i].verifyDutyId && dataList[i].verifyInitiatorId) { } else { - this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>) + this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('pleaseConformityVerification') } < /div>) continue // isTrue = false // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) From 1507953aee923b5a3675965ac6202298c74927bb Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 13:41:51 +0800 Subject: [PATCH 32/56] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/report/enums/ContentTemplateEnum.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java index 08679a039..26fa31c6d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java @@ -1,6 +1,5 @@ package com.jero.modules.report.enums; -import com.sun.tools.doclets.formats.html.resources.standard; /** * @description From 0c7e693472f1e264397600c74bd742191599eac7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Sat, 2 Jul 2022 13:45:49 +0800 Subject: [PATCH 33/56] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E9=85=8D=E7=BD=AE=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 3 +- .../projectManagement/dialog/configure.vue | 53 +++++++++++-------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index dda041031..941b85887 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -275,9 +275,8 @@ // 配置 configure(item) { this.itemId = item.id - this.itemRow = item - this.$refs.configureRef.addModel(item.id) + this.$refs.configureRef.addModel(item.id,item) }, handleCancel(val) { this.areaVisible = val diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index b0ae4022b..71e7e0c24 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -95,7 +95,7 @@
- {{$t('addConfiguration')}} + {{$t('addConfiguration')}} {{$t('deleteConfiguration')}} @@ -146,6 +146,7 @@ formInline: {}, confirmLoading: false, visible: false, + loading:false, rules: { // nioNumber:[ // { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' }, @@ -155,7 +156,7 @@ projectNameList: [], title: '', stateOne: '', - configFlag:'', + conFlag:'', contentList: [], paramsConfigEOList: [ { @@ -187,19 +188,13 @@ } }) }, - addModel(id) { + addModel(id,item) { this.paramsConfigEOList = [] this.visible = true this.title = this.$t('MaintainConfigureInfo') this.formInline = {} this.getconList(id) - getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => { - if (res.success) { - this.configFlag = res.result - } else { - this.$message.warning(res.message) - } - }) + }, getconList(id) { getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => { @@ -226,19 +221,29 @@ }) }, addConfiguration(item) { - console.log(this.configFlag) - if (this.configFlag == true) { - this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { - id: '', - configName: '', // 配置名称 - version: '', // 版本 - carType: '', // 车型 - battery: '', // 电池 - motor: '' // 电机 - }) - } else { - this.$message.warning(this.$t('Theselectedconfiguration')) - } + this.loading = true + getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => { + if (res.success) { + this.conFlag = res.result + if (this.conFlag == true) { + this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { + id: '', + configName: '', // 配置名称 + version: '', // 版本 + carType: '', // 车型 + battery: '', // 电池 + motor: '' // 电机 + }) + this.loading = false + } else { + this.loading = false + this.$message.warning(this.$t('Theselectedconfiguration')) + } + } else { + this.$message.warning(res.message) + } + }) + }, deleteConfiguration(displaySeq, index) { if (this.paramsConfigEOList.length === 1) { @@ -262,6 +267,8 @@ }, handleCancel() { this.visible = false + this.$refs.ruleForm.clearValidate() + this.conFlag = '' }, handleSubmit() { let flag = 1 From 6d70cc7e905146f3edebb420d2d880fcfe156853 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 13:57:11 +0800 Subject: [PATCH 34/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 35 ++++++++++++------- .../ParameterItemCollectionList.vue | 2 +- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 7ee83c1f0..cc7ae0aa4 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -261,7 +261,8 @@ watch: { currentPersonRole: { handler: function() { - this.getTableList(); + console.log(123) + this.getTableList() }, immediate: true } @@ -377,7 +378,7 @@ this.areaVisible = true // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { - this.Dateline = {...this.Dateline} + this.Dateline = { ...this.Dateline } this.getquerySdtList(record) this.$refs.ruleForm.clearValidate() }) @@ -406,17 +407,19 @@ getAndUserId(result) { let query = { paramsManifestId: this.$route.query.id, - projectId:this.$route.query.projectId, + projectId: this.$route.query.projectId, userId: this.userInfo().id } getAction('/params/userTypeLog/queryCurrentType', query).then((res) => { if (res.success) { - if (res.result && res.result.userType){ + if (res.result && res.result.userType) { this.getTableList(res.result.userType) - }else{ + console.log(11) + } else { + console.log(222) this.getTableList(result[0].value) } - this.$emit('LoginUserType', result, this.currentPersonRole,res.result.userType) + this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType) } else { } @@ -532,7 +535,9 @@ this.dataSource = tt this.total = res.result.total this.selectedRowKeys = [] - this.loading = false + setTimeout(() => { + this.loading = false + }, 500) } else { this.loading = false } @@ -616,7 +621,9 @@ this.selectedRowrowValue = [] this.$emit('value', this.selectedRowKeys) this.$emit('rowValue', this.selectedRowrowValue) - this.loading = false + setTimeout(() => { + this.loading = false + }, 500) } else { this.loading = false } @@ -638,7 +645,7 @@ detailClick(item, index) { // this.$emit('detailClick', item) } - }, + } } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2ee7d3388..ca847d402 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -817,7 +817,7 @@ LoginUserType(val, currentPersonRole,userType) { this.RoleType = [] if (this.currentPersonRole == '') { - this.currentPersonRole = val.length >= 1 ? val[0].value : '' + this.currentPersonRole = currentPersonRole || userType || val[0].value } this.RoleType = val this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value From 491848aaacfe82d1743a299cb478c608c87bf2bc Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sat, 2 Jul 2022 14:07:35 +0800 Subject: [PATCH 35/56] =?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=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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 bb75562ad..dca30e633 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 @@ -2369,8 +2369,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); - String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setAttestationRank(attestationRankName); + List attestationRankList = Arrays.asList(projectLawsInventoryEO.getAttestationRank().split(",")); + StringBuilder attestationRankBuilder = new StringBuilder(); + for (String midAttestationRank : attestationRankList) { + String dutyTerritoryName = attestationRank.stream().filter(e -> e.getItemValue().equals(midAttestationRank)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + attestationRankBuilder.append(dutyTerritoryName).append(","); + } + projectLawsInventoryEO.setAttestationRank(attestationRankBuilder.substring(0, attestationRankBuilder.toString().length() - 1)); } else { projectLawsInventoryEO.setAttestationRank("空"); } @@ -2731,13 +2736,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); - String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setAttestationRank(attestationRankName); + List attestationRankList = Arrays.asList(projectLawsInventoryEO.getAttestationRank().split(",")); + StringBuilder attestationRankBuilder = new StringBuilder(); + for (String midAttestationRank : attestationRankList) { + String dutyTerritoryName = attestationRank.stream().filter(e -> e.getItemValue().equals(midAttestationRank)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + attestationRankBuilder.append(dutyTerritoryName).append(","); + } + projectLawsInventoryEO.setAttestationRank(attestationRankBuilder.substring(0, attestationRankBuilder.toString().length() - 1)); } else { projectLawsInventoryEO.setAttestationRank("null"); } - //责任领域 if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) { List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); From f163558c0c20e41131613b8680beb6036d6e0b32 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 14:19:03 +0800 Subject: [PATCH 36/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 1 + .../ParameterItemCollectionList.vue | 66 ++++++++++++++++++- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index cc7ae0aa4..ffb6d6052 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -621,6 +621,7 @@ this.selectedRowrowValue = [] this.$emit('value', this.selectedRowKeys) this.$emit('rowValue', this.selectedRowrowValue) + this.$emit('getDataSource', this.dataSource) setTimeout(() => { this.loading = false }, 500) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index ca847d402..2d1e8886f 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -130,6 +130,11 @@ {{$t('referenceparameter')}}
+ +
+ + {{$t('preservation')}} +
@@ -157,7 +162,9 @@
@@ -503,9 +510,15 @@ }, mounted() { this.GetgetLoginUserType() + this.time = setInterval(() => { + this.handlePreservation() + }, 10000) this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') }, + beforeDestroy() { + clearInterval(this.time); + }, methods: { ...mapGetters(['userInfo']), handleCancelRoleSwitching() { @@ -814,7 +827,7 @@ } return flag }, - LoginUserType(val, currentPersonRole,userType) { + LoginUserType(val, currentPersonRole, userType) { this.RoleType = [] if (this.currentPersonRole == '') { this.currentPersonRole = currentPersonRole || userType || val[0].value @@ -1001,6 +1014,55 @@ this.NoEngineer = 1 } }, + getDataSource(data) { + this.dataSource = data + }, + handlePreservation(num) { + let _this = this + let postDate = [] + let data = JSON.parse(JSON.stringify(this.dataSource)) + let selectedRowKeysValue = [] + data.forEach(res => { + if (res.state == 'Wait Fill' || res.state == '待填写') { + selectedRowKeysValue.push(res) + } + }) + for (let i = 0; i < selectedRowKeysValue.length; i++) { + let postDateobj = {} + let itemIn = Object.keys(selectedRowKeysValue[i]) + for (let j = 0; j < itemIn.length; j++) { + if (itemIn[j] !== 'sdt') { + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + } + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + } + } + } + } + } + postDateobj.id = selectedRowKeysValue[i].id + postDate.push(postDateobj) + } + let configDataList = { configDataList: postDate } + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + postAction('/params/collectManifest/save', configDataList).then((res) => { + if (res.success) { + if (num && num == 1) { + _this.$message.success(_this.$t('OperationSuccessful')) + } + } else { + if (num && num == 1) { + _this.$message.warning(_this.$t('operationFailed')) + } + } + }) + } + }, // 提交数据 ishandleSubmit() { let _this = this From a1b453f82d962cef294d44fd08fabebe6b792c38 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 14:23:57 +0800 Subject: [PATCH 37/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 28 ++++++++++++++----- .../ParameterItemCollectionList.vue | 7 ++++- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index b1667ab35..6e8313cf6 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -99,7 +99,9 @@
- @@ -114,7 +116,9 @@
- @@ -141,7 +145,9 @@
- @@ -336,7 +342,9 @@
- @@ -453,7 +461,9 @@
- @@ -475,7 +485,9 @@
- @@ -497,7 +509,9 @@
- diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2d1e8886f..e85d4ffaa 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -517,7 +517,7 @@ document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') }, beforeDestroy() { - clearInterval(this.time); + clearInterval(this.time) }, methods: { ...mapGetters(['userInfo']), @@ -1050,14 +1050,19 @@ } let configDataList = { configDataList: postDate } if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + if (num && num == 1) { + this.textLoading = true + } postAction('/params/collectManifest/save', configDataList).then((res) => { if (res.success) { if (num && num == 1) { _this.$message.success(_this.$t('OperationSuccessful')) + this.textLoading = false } } else { if (num && num == 1) { _this.$message.warning(_this.$t('operationFailed')) + this.textLoading = false } } }) From 19cef7e0ac5155b88abc56eea9de1a1042b39bf6 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sat, 2 Jul 2022 14:41:03 +0800 Subject: [PATCH 38/56] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index a52b3a8c9..959556614 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -44,8 +44,8 @@
- - + + welcome,{{ userInfo().username }} @@ -209,7 +209,7 @@ }, /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/ ...mapActions(['Logout']), - ...mapGetters(['nickname', 'avatar', 'userInfo']), + ...mapGetters(['username', 'avatar', 'userInfo']), getAvatar() { return getFileAccessHttpUrl(this.avatar()) }, From 614d99a5e1006d1e7aba44165caa6768b93656a8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 15:23:43 +0800 Subject: [PATCH 39/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/AssignedBy/index.vue | 4 + .../components/ReferenceParameter/index.vue | 3 + .../SynchronousSubmissionLibrary/index.vue | 4 + .../src/components/TaskCutOffTime/index.vue | 3 + jero-web/src/main.js | 3 +- jero-web/src/utils/socketVuexOne.js | 116 ++++++++++++++++++ .../ParameterItemCollectionList.vue | 4 +- .../components/TaskParameterCollection.vue | 26 +++- 8 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 jero-web/src/utils/socketVuexOne.js diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 90bcdd144..7d6973111 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -178,6 +178,7 @@ export default { this.$message.warning(this.$t('OnlyOneSelected')) } else { let param = {ids: this.selectedRowKeysArray, paramsManifestId:this.$route.query.id ,projectId: this.$route.query.projectId, dre:this.selectedRowKeysDate[0].username } + this.confirmLoading = true axios({ url: '/jero-boot/params/collectManifest/updateDreBatch', method: 'post', @@ -199,14 +200,17 @@ export default { _this.$message.success(_this.$t('OperationSuccessful')) // 填写人 // 获取当前登陆人 + this.confirmLoading = false this.$emit('GetgetLoginUserType') this.$emit('GetgetTableList') this.$emit('areaVisibleAssignedbyflag', false) }else{ + this.confirmLoading = false _this.$message.warning(_this.$t('operationFailed')) } }) .catch( (error) =>{ + this.confirmLoading = false console.log(error); }); } diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index 94db39bf8..0e2ca7182 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -231,13 +231,16 @@ export default { this.formInline.targetConfigIds = this.formInline.targetConfigIds.join(',') } let param = {ids: this.selectedRowKeysArray, ...this.formInline } + this.confirmLoading = true postAction('params/collectManifest/referParams', param).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.$emit('areaVisibleAssignedbyflag', false) this.$emit('GetgetTableList') + this.confirmLoading = false } else { this.$message.warning(res.message) + this.confirmLoading = false } }) }}) diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index 7edd7ad05..a3f002ce2 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -92,6 +92,7 @@ export default { handleSubmit() { let _this = this let param = {ids: this.selectedRowKeysArray, paramsManifestId: this.paramsManifest.id } + this.confirmLoading = true axios({ url: '/jero-boot/params/collectManifest/syncReport', method: 'post', @@ -114,12 +115,15 @@ export default { _this.$message.success(_this.$t('OperationSuccessful')) this.$emit('areaVisibsynchronous', false) this.$emit('GetgetTableList') + this.confirmLoading = false }else{ _this.$message.warning(_this.$t('operationFailed')) + this.confirmLoading = false } }) .catch( (error) =>{ console.log(error); + this.confirmLoading = false }); } } diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 7ca73d419..e1e570155 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -107,12 +107,15 @@ export default { handleSubmit() { let _this = this let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, } + this.confirmLoading = true postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => { if (res.success) { this.$emit('areaVisibleTaskCutOffTimeflag', false) this.$message.success(res.message) + this.confirmLoading = false } else { this.$message.warning(res.message) + this.confirmLoading = false } }) }, diff --git a/jero-web/src/main.js b/jero-web/src/main.js index f0bdff612..171fe1fb7 100644 --- a/jero-web/src/main.js +++ b/jero-web/src/main.js @@ -50,9 +50,10 @@ import { import config from '@/defaultSettings' //引入 import socketPublic from '@/utils/socketVuex.js' - +import socketPublicOne from '@/utils/socketVuexOne.js' //挂载 Vue.prototype.$socketPublic = socketPublic +Vue.prototype.$socketPublicOne = socketPublicOne import JDictSelectTag from './components/dict/index.js' import hasPermission from '@/utils/hasPermission' import vueBus from '@/utils/vueBus' diff --git a/jero-web/src/utils/socketVuexOne.js b/jero-web/src/utils/socketVuexOne.js new file mode 100644 index 000000000..5e1e6a4ae --- /dev/null +++ b/jero-web/src/utils/socketVuexOne.js @@ -0,0 +1,116 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import store from '@/store/' + +Vue.use(Vuex) +// console.log(window._CONFIG['domianWebSocketURL']) + +export default new Vuex.Store({ + state: { + ws: null, //建立的连接 + lockReconnect: false, //是否真正建立连接 + timeout: 15000, //15秒一次心跳 + timeoutObj: null, //心跳心跳倒计时 + serverTimeoutObj: null, //心跳倒计时 + timeoutnum: null, //断开 重连倒计时 + msg: null //接收到的信息 + + }, + getters: { + // 获取接收的信息 + socketMsgs: state => { + return state.msg + } + }, + mutations: { + //初始化ws 用户登录后调用 + webSocketInit(state) { + let that = this + //this 创建一个state.ws对象【发送、接收、关闭socket都由这个对象操作】 + const userId = store.getters.userInfo.id + state.ws = new WebSocket(window._CONFIG['domianWebSocketURL'].replace('https://', 'wss://').replace('http://', 'ws://') + '/websocket/socketServer') + state.ws.onopen = function(res) { + console.log('Connection success...') + /** + * 启动心跳检测 + */ + that.commit('start') + } + state.ws.onmessage = function(res) { + if (res.data === 'heartCheck') { + // 收到服务器信息，心跳重置 + that.commit('reset') + } else { + state.msg = res + } + } + state.ws.onclose = function(res) { + //重连 + that.commit('reconnect') + } + state.ws.onerror = function(res) { + //重连 + that.commit('reconnect') + } + }, + reconnect(state) { + //重新连接 + let that = this + if (state.lockReconnect) { + return + } + state.lockReconnect = true + //没连接上会一直重连,30秒重试请求重连，设置延迟避免请求过多 + state.timeoutnum && + clearTimeout(state.timeoutnum) + state.timeoutnum = setTimeout(() => { + //新连接 + that.commit('webSocketInit') + state.lockReconnect = false + }, 5000) + }, + reset(state) { + //重置心跳 + let that = this + //清除时间 + clearTimeout(state.timeoutObj) + clearTimeout(state.serverTimeoutObj) + //重启心跳 + that.commit('start') + }, + start(state) { + //开启心跳 + var self = this + state.timeoutObj && + clearTimeout(state.timeoutObj) + state.serverTimeoutObj && + clearTimeout(state.serverTimeoutObj) + state.timeoutObj = setTimeout(() => { + //这里发送一个心跳，后端收到后，返回一个心跳消息， + if (state.ws.readyState === 1) { + //如果连接正常 + state.ws.send('heartCheck') + } else { + //否则重连 + self.commit('reconnect') + } + state.serverTimeoutObj = setTimeout(function() { + //超时关闭 + state.ws.close() + }, state.timeout) + }, state.timeout) + } + }, + actions: { + webSocketInit({ + commit + }, url) { + commit('webSocketInit', url) + }, + webSocketSend({ + commit + }, p) { + commit('webSocketSend', p) + } + } +}) \ 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 e85d4ffaa..5a9322ba1 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -511,7 +511,9 @@ mounted() { this.GetgetLoginUserType() this.time = setInterval(() => { - this.handlePreservation() + if (this.currentPersonRole == "dre"){ + this.handlePreservation() + } }, 10000) this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 941b85887..0c1b447f0 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -65,7 +65,8 @@ {{$t('configure')}} {{$t('edit')}} - {{$t('deleteLib')}} + {{$t('deleteLib')}} {{$t('historicalVersion')}} @@ -114,6 +115,7 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import eventBUs from '@/common/event' + import store from '@/store/' export default { name: 'TaskParameterCollection', @@ -199,7 +201,7 @@ conList: 'params/config/list', changeExtension: 'params/manifest/changeExtension', verifyConfig: 'params/manifest/verifyConfig', - configurelist:'params/manifest/getConfigFlag', + configurelist: 'params/manifest/getConfigFlag' }, loading: false, dataSource: [], @@ -215,7 +217,7 @@ version: 0, itemId: '', // 配置id itemRow: {}, // 配置一行数据 - configFlag:'', + configFlag: '', historicalVisible: false, historicalRow: {}, // 历史版本得数据 drawerVisible: false, @@ -224,6 +226,22 @@ selectedRowKeysvalArray: [] } }, + created() { + if (store.getters.userInfo) { + this.$socketPublicOne.dispatch('webSocketInit')//初始化ws + } + }, + watch: { + '$socketPublicOne.state.msg': { + //处理接收到的消息 + handler: function(res) { + let that = this + if (res.data == '1'){ + this.getlist() + } + } + } + }, mounted() { this.getlist() }, @@ -276,7 +294,7 @@ configure(item) { this.itemId = item.id this.itemRow = item - this.$refs.configureRef.addModel(item.id,item) + this.$refs.configureRef.addModel(item.id, item) }, handleCancel(val) { this.areaVisible = val From 0dda7f354b94439881364f296f6717d12d777555 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 15:27:19 +0800 Subject: [PATCH 40/56] =?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 --- .../parameter/ParameterTemplate/index.vue | 2 + .../parameter/escalationlibrary/index.vue | 576 +++++++++--------- .../views/parameter/parameterexport/index.vue | 2 + .../views/parameter/parameterlist/index.vue | 2 + 4 files changed, 297 insertions(+), 285 deletions(-) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 3929a5a96..0cd0284c7 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -1,6 +1,7 @@