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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java

@@ -54,12 +54,16 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
     @AutoLog(value = "文档对比信息表-分页列表查询")
     @ApiOperation(value = "文档对比信息表-分页列表查询", notes = "文档对比信息表-分页列表查询")
     @GetMapping(value = "/page")
-    public Result<?> 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<SarFileCompareInfo> 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<SarFileCompareInfo> page = new Page<SarFileCompareInfo>(pageNo, pageSize);
         IPage<SarFileCompareInfo> 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<SarFileCompareI
     @ApiOperation(value = "文档对比信息表-更改发布状态", notes = "文档对比信息表-更改发布状态")
     @RequestMapping(value = "/changeState", method = RequestMethod.POST)
     public Result<?> 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("更改成功!");
     }
 

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 = "备注")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java

@@ -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;
-    }
-}

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<SarFileCompareInf
                         }
                         if (j >= rightItemList.size() - 1) {
                             int ts = leftItemList.get(i).getTargetStand();
-                            if(ts > -1){
+                            if (ts > -1) {
                                 rightItemList.get(ts).setTargetStand(i);
                             }
                         }

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',
 }

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

@@ -1344,4 +1344,5 @@ module.exports = {
   turnOnAutoMatch:'打开自动匹配',
   Adjustareasofresponsibility:'调整责任领域',
   regulatoryTechnicalAssessment:'法规技术评估',
+  punctuationmark:'只能输入除#号外的英文标点符号',
 }

jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue

@@ -78,15 +78,15 @@
                 </div>
               </a-col>
             </a-row>
-            <a-row :gutter="24">
+            <a-row :gutter="24" v-if='!required'>
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="Required" v-if='!required'>*</span>
+                    <span class="Required" >*</span>
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="!required?'separator':''">
+                  <a-form-model-item class="itemModel" prop="separator">
 <!--                    :disabled="disabled"-->
                     <a-input class="box-input"
                              v-model="formInline.separator"