diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index c3c39bd8a..2a5b0ced8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -393,7 +393,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl right_length ? i + left_length : i + right_length; } if (includeComments || StringUtils.isEmpty(selectIds)) { Row row = sheet.createRow(i); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index df0bd1d1a..8722fb974 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -191,14 +191,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl params) { String ids = (String)params.get("ids"); String cut = (String)params.get("cut"); + String lawsTechnologyEvaluationId = (String)params.get("lawsTechnologyEvaluationId"); + if(StringUtils.isEmpty(lawsTechnologyEvaluationId)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("法规技术评估id为空,请检查!"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("The lawsTechnologyEvaluationId is empty, please check!"); + } + } + LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = this.lawsTechnologyEvaluationEOService.queryById(lawsTechnologyEvaluationId); if(!StringUtils.isEmpty(ids)){ lawsTechnologyEvaluationComplianceResultEO.setIds(ids); @@ -187,12 +200,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){ title = "相关章节,问题说明,附件"; bottomTitle = "符合性结果:"; - fileName = "评估结果" + ".xls"; + fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " 评估结果" + ".xls"; sheetName = "反馈结果"; }else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){ title = "Related section,Problem description,Accessory"; bottomTitle = "Compliance results:"; - fileName = "Evaluation results" + ".xls"; + fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " Evaluation results" + ".xls"; sheetName = "Feedback result"; } 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 index 11892a582..3d91a9ccb 100644 --- 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 @@ -122,7 +122,7 @@ public class LawsMonthlyReportWriteEO implements Serializable { /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") - @Dict(dicCode = "state") + @Dict(dicCode = "fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4") private java.lang.String state; /**用法*/ 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 cb571424d..d2abd92d2 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 @@ -1050,10 +1050,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl{{$t('title')}} - + + + + + @@ -24,10 +28,14 @@ :title="$t('englishTitle')">{{$t('englishTitle')}} - + + + + + diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue index 41b44678b..8fb6a1f6e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -9,10 +9,14 @@ :title="$t('title')">{{$t('title')}} - + + + + + @@ -24,10 +28,14 @@ :title="$t('englishTitle')">{{$t('englishTitle')}} - + + + + + diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 0c5a95218..043fd45b1 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -266,7 +266,7 @@ form: {}, rules: { name: [ - { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' }, + // { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' }, { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' } ], itemName: [