diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index d843c6a97..90b53ed10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -54,12 +54,16 @@ public class SarFileCompareInfoController extends JeroController queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + public Result queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "cut", defaultValue = "cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.DRAFT.getValue()); Page page = new Page(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); + for (SarFileCompareInfo info : pageList.getRecords()) { + info.setReleaseStateTitle(ReleaseConditionEnum.getTextByValue(info.getReleaseState(), cut)); + } return Result.OK(pageList); } @@ -208,12 +212,13 @@ public class SarFileCompareInfoController extends JeroController changeState(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { - if (sarFileCompareInfo.getReleaseState().equals(ReleaseConditionEnum.DRAFT.getValue())) { - sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.PUBLISHED.getValue()); + SarFileCompareInfo info = sarFileCompareInfoService.queryById(sarFileCompareInfo.getId()); + if (ReleaseConditionEnum.DRAFT.getValue().equals(sarFileCompareInfo.getReleaseState())) { + info.setReleaseState(ReleaseConditionEnum.PUBLISHED.getValue()); } else { - sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.DRAFT.getValue()); + info.setReleaseState(ReleaseConditionEnum.DRAFT.getValue()); } - sarFileCompareInfoService.editById(sarFileCompareInfo); + sarFileCompareInfoService.editById(info); return Result.OK("更改成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java index 7760d639c..81f9d00e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; 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; @@ -126,6 +127,10 @@ public class SarFileCompareInfo implements Serializable { @ApiModelProperty(value = "发布状态") private String releaseState; + /**发布状态-翻译后*/ + @TableField(exist = false) + private String releaseStateTitle; + /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java deleted file mode 100644 index fa94f0621..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jero.modules.compare.enums; - -/** - * 对比信息发布状态 - */ -public enum ComparesInfoStateEnum { - DRAFT(0, "草稿"), RELEASE(1, "发布"); - - private int value; - private String lable; - - private ComparesInfoStateEnum(int value, String lable) { - this.value = value; - this.lable = lable; - } - - public int getValue() { - return value; - } - - public String getLable() { - return lable; - } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index e16cd6be7..e0dfcc381 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -160,7 +160,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl= rightItemList.size() - 1) { int ts = leftItemList.get(i).getTargetStand(); - if(ts > -1){ + if (ts > -1) { rightItemList.get(ts).setTargetStand(i); } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 54b9257fd..5c3ca92c9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -95,7 +95,7 @@ module.exports = { newUser: 'New User', ExistingUsers: 'Existing Users', total: 'Total', - strip: 'Data', + strip: 'Items', RoleCode: 'Role Code', createTime: 'Creation Time', userName: 'User Name', @@ -276,7 +276,7 @@ module.exports = { AggregateRouting: 'Aggregated Route', OpenMode: 'Open Mode', external: 'External', - inside: 'Inside', + inside: 'Internal', enterMenuTitle: 'Please enter the menu title', enterAuthorizationPolicy: 'Please enter authorization policy', AuthorizationIDExists: 'Authorization ID already exists', @@ -610,7 +610,7 @@ module.exports = { deliverableTemplate: 'Deliverable Template', entryName: 'Project', targetMarket: 'Target Market', - projectStatus: 'Status', + projectStatus: 'Development', StudioEngineer: 'R&H Studio', CertificationTime: 'Certification Time', NTplatform: 'NT Platform', @@ -686,12 +686,12 @@ module.exports = { confirmOverrule: 'Confirm Overrule', The: 'The', submitted: 'Data has been submitted and cannot be submitted again', - basicInformationOfParameters: 'Project Basic Information', + basicInformationOfParameters: 'General Info', regulatoryCertificationTaskPlan: 'Regulation/Homologation Task Plan', bringInRelevantPersonnel: 'Bring In Relevant Personnel', confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel', problemType: 'Issue Type', - projectDetails: 'Project Info', + projectDetails: 'Project Details', listOfRegulations: 'Regulation List', taskList: 'Task List', TaskParameterCollection: 'Task Parameter Collection', @@ -1241,4 +1241,5 @@ module.exports = { turnOnAutoMatch:'Turn on auto match', Adjustareasofresponsibility:'Adjust areas of responsibility', regulatoryTechnicalAssessment:'Regulatory Technical Assessment', + punctuationmark:'Only English punctuation marks other than the # sign can be entered', } \ 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 f51f2b79d..8ccc785e9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1344,4 +1344,5 @@ module.exports = { turnOnAutoMatch:'打开自动匹配', Adjustareasofresponsibility:'调整责任领域', regulatoryTechnicalAssessment:'法规技术评估', + punctuationmark:'只能输入除#号外的英文标点符号', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 046a35993..765546dd3 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -78,15 +78,15 @@ - +
- * + * {{$t('MergeSeparator')}}
- +