From c53476bc57db71d879bd99c92e85c625b856805e Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 28 Nov 2023 10:52:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B0=86=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E6=8D=A2=E6=88=90?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarMenuStandard/entity/StandSystemDTO.java  |  3 +++
 .../impl/SarMenuStandardNewServiceNewImpl.java  | 17 ++++++++++-------
 .../mapper/SarStandMenu/SarStandMenuMapper.xml  |  4 +++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
index 34ed449e..8e2f01ee 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
@@ -51,6 +51,9 @@ public class StandSystemDTO {
     @ApiModelProperty(value = "标准状态")
     private String standState;
 
+    @ApiModelProperty(value = "文本状态")
+    private String textStatus;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "开始发布日期")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index b297ba57..4c7e5156 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -276,7 +276,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         SarMenuStandard.setSystemSortDFS(sarMenuStandard, currentNumber);
 
         // 国标外标标准状态字典
-        List<TsDicType> gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE");
+//        List<TsDicType> gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE");
+        // 国标外标标准文本状态
+        List<TsDicType> gbTextStateDictList = dicItemService.selectAllDicTypeNameByDicCode("WBZTCLASS");
         // 企标标准状态字典
         List<TsDicType> esStateDictList = dicItemService.selectAllDicTypeNameByDicCode("TEXTSTATUSBUSS");
 
@@ -289,7 +291,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
             SarMenuStandard node = SarMenuStandard.findNodeById(targetNode, dto.getMenuId());
             dto.setSystemSort(node.getSystemSort());
             // 翻译
-            this.translateStandardSystemDTO(dto, gbStateDictList, esStateDictList);
+//            this.translateStandardSystemDTO(dto, gbStateDictList, esStateDictList);
+            this.translateStandardSystemDTO(dto, gbTextStateDictList, esStateDictList);
         }
 
         // 两个时间排序
@@ -348,19 +351,19 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         return page;
     }
 
-    private void translateStandardSystemDTO(StandSystemDTO dto, List<TsDicType> gbStateDictList, List<TsDicType> esStateDictList) {
+    private void translateStandardSystemDTO(StandSystemDTO dto, List<TsDicType> gbTextStateDictList, List<TsDicType> esStateDictList) {
         // 翻译数据来源、标准状态
         switch (dto.getDataSource()) {
             case "INLAND":
                 dto.setDataSource("国内标准库");
-                dto.setStandState(gbStateDictList.stream()
-                        .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState()))
+                dto.setStandState(gbTextStateDictList.stream()
+                        .filter(dict -> dict.getDicTypeCode().equals(dto.getTextStatus()))
                         .findFirst().orElse(new TsDicType()).getDicTypeName());
                 break;
             case "FOREIGN":
                 dto.setDataSource("海外标准库");
-                dto.setStandState(gbStateDictList.stream()
-                        .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState()))
+                dto.setStandState(gbTextStateDictList.stream()
+                        .filter(dict -> dict.getDicTypeCode().equals(dto.getTextStatus()))
                         .findFirst().orElse(new TsDicType()).getDicTypeName());
                 break;
             case "ENTERPRISE":
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
index 9ad53d50..f6ec0123 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
@@ -177,9 +177,11 @@
     <select id="getStandInfoSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
         SELECT
             gb.ID AS standId,
-            CONCAT(gb.STAND_SORT, ' ', gb.STAND_NUMBER) AS standNo,
+            CONCAT(gb.STAND_SORT, ' ', ifnull(gb.STAND_NUMBER,''),
+                case when gb.STAND_YEAR is not null and gb.STAND_YEAR!= '' then concat('-',gb.STAND_YEAR) else '' end) AS standNo,
             gb.STAND_NAME AS standName,
             gb.STAND_STATE AS standState,
+            gb.TEXT_STATUS AS textStatus,
             CASE
                 WHEN gb.ISSUE_TIME = '' THEN NULL
             ELSE gb.ISSUE_TIME