From 52f7345832dcced1664be5b996155312748c2913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 3 Jul 2024 14:51:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E5=BA=93?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsMarketStandard.java            | 23 ++++++++++++++++++-
 .../mapper/xml/LawsMarketStandardMapper.xml   |  7 +++++-
 .../impl/LawsMarketStandardServiceImpl.java   | 15 +++++++++---
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java
index 6d6f5d54..45ce3246 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java
@@ -73,6 +73,13 @@ public class LawsMarketStandard implements Serializable {
     @ApiModelProperty(value = "国家")
     private String country;
 
+    /**
+     * 国家翻译
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "国家翻译")
+    private String countryText;
+
     /**
      * 清单编号
      */
@@ -92,6 +99,13 @@ public class LawsMarketStandard implements Serializable {
     @ApiModelProperty(value = "驾驶位置")
     private String drivePosition;
 
+    /**
+     * 驾驶位置翻译
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "驾驶位置翻译")
+    private String drivePositionText;
+
     /**
      * 清单版本
      */
@@ -116,10 +130,17 @@ public class LawsMarketStandard implements Serializable {
     /**
      * 密级
      */
-    @Dict(dicCode = "security_level")
+    @Dict(dicCode = "security_class")
     @ApiModelProperty(value = "密级")
     private String securityLevel;
 
+    /**
+     * 密级翻译
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "密级翻译")
+    private String securityLevelText;
+
     /**
      * 清单状态
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
index 7088f81d..1ca2ae40 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
@@ -35,7 +35,12 @@
     <select id="queryByPage" resultType="com.jero.modules.laws.marketStandard.entity.LawsMarketStandard">
         select ms.*
         from laws_market_standard ms
-                 left join sys_user as u on u.id = ms.author
+        JOIN (
+            SELECT manifest_no as manifest_no_max, MAX(manifest_version) AS manifest_version_max
+            FROM laws_market_standard
+            GROUP BY manifest_no
+        ) ms1 on ms1.manifest_version_max = ms.manifest_version and ms1.manifest_no_max = ms.manifest_no
+        left join sys_user as u on u.id = ms.author
             ${ew.customSqlSegment}
     </select>
 </mapper>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 62e3e7f7..64750a30 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.laws.marketStandard.constans.MarketStandardConstants;
 import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
@@ -14,8 +15,6 @@ import com.jero.modules.laws.marketStandard.entity.MarketStandardDetailVO;
 import com.jero.modules.laws.marketStandard.mapper.LawsMarketStandardMapper;
 import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService;
 import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService;
-import com.jero.modules.system.entity.SysRole;
-import com.jero.modules.system.service.ISysRoleService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -46,7 +45,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     @Resource
     private ILawsMarketStandardDetailService lawsMarketStandardDetailService;
     @Resource
-    private ISysRoleService sysRoleService;
+    private ISysBaseAPI sysBaseAPI;
 
     /**
      * 法规管理员
@@ -123,6 +122,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     @Override
     public void export(HttpServletResponse response, LawsMarketStandard lawsMarketStandard, String fileName, String sheetName, HttpServletRequest req) {
         //TODO 导出具体模板查看NAS文档
+
     }
 
     @Override
@@ -140,6 +140,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         List<String> idList = Arrays.asList(ids.split(","));
 
         LawsMarketStandard manifest = getById(idList.get(0));
+        if(Objects.isNull(manifest)){
+            throw new JeroBootException("数据不存在");
+        }
         // 清单版本不为空,查询指定版本
         if(!StringUtils.isBlank(marketStandardDetail.getManifestVersion())){
             LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
@@ -152,6 +155,12 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
             idList = new ArrayList<>();
             idList.add(manifest.getId());
         }
+        String countryText =  sysBaseAPI.translateDict("market_state",manifest.getCountry());
+        manifest.setCountryText(countryText);
+        String securityLevelText =  sysBaseAPI.translateDict("security_class",manifest.getSecurityLevel());
+        manifest.setSecurityLevelText(securityLevelText);
+        String drivePositionText =  sysBaseAPI.translateDict("drive_position",manifest.getDrivePosition());
+        manifest.setDrivePositionText(drivePositionText);
         result.setManifest(manifest);
 
         // 列表数据