From e583b57369b96014e87f4ccddbfe096c6c04daef Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 14:30:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentTools/documentComparison/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index f7abb8e7b..4a09cfb6d 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -176,7 +176,7 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'releaseState' + dataIndex: 'releaseStateTitle' }, { title: this.$t('remarks'), @@ -301,9 +301,9 @@ onOk() { let releaseState = '' if (record.releaseState == 'draft') { - releaseState = 'published' - } else { releaseState = 'draft' + } else { + releaseState = 'published' } let query = { releaseState: releaseState, From 844ef210ad3e1da167e27e62b49c6ea2da2a223d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 8 Aug 2022 14:37:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=A1=AB=E5=86=99--?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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 index 4401d668d..9b92dc342 100644 --- 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 @@ -132,14 +132,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId()); + iNewOpinionTemplateEOService.remove(wrapper); + //新增 List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); - iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList); + iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ - //新发布标准清单模板 + //新发布标准清单模板(先删除在新增) + //删除 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId()); + iNewStandardTemplateEOService.remove(lambdaQueryWrapper); + //新增 List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); - iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList); + iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); } } From b49f58ae6f3c3c5180e6dafa5442cd8335b65277 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 8 Aug 2022 14:41:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 18 ++++++++++-------- jero-web/src/common/lang/zh-cn.js | 2 ++ .../parameter/ParameterTemplate/index.vue | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5c3ca92c9..b140fafa0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -408,8 +408,8 @@ module.exports = { NewLabelItem: 'Newly Added Tag Item', editLabelItem: 'Edit Tag Item', NodeQuickLookup: 'Node Quick Lookup', - AreAllLabelsRead: 'Are All Labels Read', - AllLabelsRead: 'Labels Read', + AreAllLabelsRead: 'Are All Mark as Read', + AllLabelsRead: 'Mark as Read', SubscriptionNotification: 'Subscription Notification', warningInformation: 'Warning Information', ForwardPush: 'Forward Push', @@ -608,7 +608,7 @@ module.exports = { engineeringInterfacePerson: 'Engineering Interface', typeOfDeliverables: 'Deliverable Type', deliverableTemplate: 'Deliverable Template', - entryName: 'Project', + entryName: 'Project Name', targetMarket: 'Target Market', projectStatus: 'Development', StudioEngineer: 'R&H Studio', @@ -801,7 +801,7 @@ module.exports = { parameterBatch: 'Parameter Batch', releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', - contentDescription: 'Content Description', + contentDescription: 'Description', WhetherMergeParameters: 'Whether to merge parameters', merge: 'Merge', nonjoinder: 'Nonjoinder', @@ -884,10 +884,10 @@ module.exports = { toTrack: 'To be tracked', Launch: 'Launch', maintainProgress: 'Maintain', - redSchedule: 'Red: not in conformity, and there is no acceptable scheme and schedule', - yellowSchedule: 'Yellow: non conformance / to be tracked, with acceptable scheme and schedule', - greenRequirements: 'Green: confirm that it meets or meets the current requirements', - blueUndeterminedState: 'Blue: undetermined state', + redSchedule: 'Red: unqualified without available solutions or timeline. ', + yellowSchedule: 'Yellow: unqualified and with available solutions and timeline. ', + greenRequirements: 'Green: qualified and confirmed.', + blueUndeterminedState: 'Blue: pending', authenticationMessage: 'Homo Parameter Task', taskRegulationComplianceTask: 'Regulation Compliance Task', accept: 'Accept', @@ -1242,4 +1242,6 @@ module.exports = { Adjustareasofresponsibility:'Adjust areas of responsibility', regulatoryTechnicalAssessment:'Regulatory Technical Assessment', punctuationmark:'Only English punctuation marks other than the # sign can be entered', + created: 'Created', + updated:'Updated', } \ 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 8ccc785e9..60585341d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1345,4 +1345,6 @@ module.exports = { Adjustareasofresponsibility:'调整责任领域', regulatoryTechnicalAssessment:'法规技术评估', punctuationmark:'只能输入除#号外的英文标点符号', + created: '创建时间', + updated:'更新时间', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index dde4540c1..3a4eb070c 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -177,7 +177,7 @@ export default { // scopedSlots: { customRender: 'titleName' } }, { - title: this.$t('createTime'), + title: this.$t('created'), align: 'center', dataIndex: 'createTime', width: 160,