Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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<LawsMonthly
     	saveOrUpdate(lawsMonthlyReportWriteEO);
 
 		if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
-			//新征求意见清单模板
+			//新征求意见清单模板(先删除在新增)
+			//删除
+			LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId());
+			iNewOpinionTemplateEOService.remove(wrapper);
+			//新增
 			List<NewOpinionTemplateEO> newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList();
-			iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList);
+			iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList);
 
 		}else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
-			//新发布标准清单模板
+			//新发布标准清单模板(先删除在新增)
+			//删除
+			LambdaQueryWrapper<NewStandardTemplateEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId());
+			iNewStandardTemplateEOService.remove(lambdaQueryWrapper);
+			//新增
 			List<NewStandardTemplateEO> newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList();
-			iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList);
+			iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList);
 		}
 
     }

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',
+  AreAllLabelsRead: 'Are All Mark as Read',
-  AllLabelsRead: 'Labels 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',
+  redSchedule: 'Red: unqualified without available solutions or timeline. ',
-  yellowSchedule: 'Yellow: non conformance / to be tracked, with acceptable scheme and schedule',
+  yellowSchedule: 'Yellow: unqualified and with available solutions and timeline. ',
-  greenRequirements: 'Green: confirm that it meets or meets the current requirements',
+  greenRequirements: 'Green: qualified and confirmed.',
-  blueUndeterminedState: 'Blue: undetermined state',
+  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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1345,4 +1345,6 @@ module.exports = {
   Adjustareasofresponsibility:'调整责任领域',
   regulatoryTechnicalAssessment:'法规技术评估',
   punctuationmark:'只能输入除#号外的英文标点符号',
+  created: '创建时间',
+  updated:'更新时间',
 }

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,

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,