From f4fcf8038256bed30b2477420d862af857585e47 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 25 Oct 2023 10:35:49 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=94=BF=E7=AD=96=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarLawsInformation.java            | 24 +++++++++++++++++++
 .../impl/SarLawsInformationServiceImpl.java   | 17 +++++++++++++
 .../tsDictionaryType/dao/TsDicTypeDao.java    |  2 ++
 .../service/ITsDicTypeService.java            |  7 ++++++
 .../service/impl/TsDicTypeServiceImpl.java    |  5 ++++
 .../SarLawsInformationMapper.xml              | 16 +++++++++++--
 .../tsDictionaryType/TsDicTypeMapper.xml      |  3 +++
 7 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java
index 8c21cbc3..f18b8cec 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java
@@ -35,24 +35,48 @@ public class SarLawsInformation extends BasePage implements Serializable {
     @TableField(value = "FIRST_TYPE")
     private String firstType;
 
+    /**
+     * 一级资料类别名称
+     */
+    @TableField(exist = false)
+    private String firstTypeName;
+
     /**
      * 二级资料类别
      */
     @TableField(value = "SECOND_TYPE")
     private String secondType;
 
+    /**
+     *  二级资料类别名称
+     */
+    @TableField(exist = false)
+    private String secondTypeName;
+
     /**
      * 三级资料类别
      */
     @TableField(value = "THIRD_TYPE")
     private String thirdType;
 
+    /**
+     * 三级资料类别名称
+     */
+    @TableField(exist = false)
+    private String thirdTypeName;
+
     /**
      * 四级资料类别
      */
     @TableField(value = "FOURTH_TYPE")
     private String fourthType;
 
+    /**
+     * 四级资料类别名称
+     */
+    @TableField(exist = false)
+    private  String fourthTypeName;
+
     /**
      * 资料名称
      */
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
index a1fadf83..8eb3d9d3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java
@@ -4,6 +4,7 @@ import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.slrs.sarLawsInformationCenterTree.entity.SarLawsInformationCenterTree;
 import com.adc.da.slrs.sarLawsInformationCenterTree.service.SarLawsInformationCenterTreeService;
+import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,10 +32,25 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
     private SarLawsInformationCenterTreeService treeService;
     @Resource
     private IAttFileEOService attFileEOService;
+    @Resource
+    private ITsDicTypeService dicTypeService;
 
     @Override
     public SarLawsInformation getLawsInformationInfo(String id) {
         SarLawsInformation sarLawsInformation = this.baseMapper.selectById(id);
+        // 根据类别Id查询类别名称
+        if (StringUtils.isNotBlank(sarLawsInformation.getFirstType())) {
+            sarLawsInformation.setFirstTypeName(dicTypeService.getDicTypeNameByDicCode(sarLawsInformation.getFirstType()));
+        }
+        if (StringUtils.isNotBlank(sarLawsInformation.getSecondType())) {
+            sarLawsInformation.setSecondTypeName(dicTypeService.getDicTypeNameByDicCode(sarLawsInformation.getSecondType()));
+        }
+        if (StringUtils.isNotBlank(sarLawsInformation.getThirdType())) {
+            sarLawsInformation.setThirdTypeName(dicTypeService.getDicTypeNameByDicCode(sarLawsInformation.getThirdType()));
+        }
+        if (StringUtils.isNotBlank(sarLawsInformation.getFourthType())) {
+            sarLawsInformation.setFourthTypeName(dicTypeService.getDicTypeNameByDicCode(sarLawsInformation.getFourthType()));
+        }
         // 查询资料文件信息
         if (StringUtils.isNotBlank(sarLawsInformation.getInformationFile())) {
             String[] split = sarLawsInformation.getInformationFile().split(",");
@@ -72,6 +88,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
     public Integer addLawsInformation(SarLawsInformation sarLawsInformation) {
         sarLawsInformation.setCreateTime(new Date());
         sarLawsInformation.setModifyTime(new Date());
+        sarLawsInformation.setUploadTime(new Date());
         sarLawsInformation.setValidFlag(0);
         // 若体系类别不存在，则默认属于根节点
         if (StringUtils.isBlank(sarLawsInformation.getTreeNodeId())) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java
index 604050f3..98141619 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/dao/TsDicTypeDao.java
@@ -16,4 +16,6 @@ import java.util.List;
  */
 public interface TsDicTypeDao extends BaseMapper<TsDicType> {
     public List<TsSearchMenu> getSearchMenu();
+
+    String selectDicTypeNameByDicCode(String typeCode);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java
index 31e5f3d3..ac04a9fe 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/ITsDicTypeService.java
@@ -18,4 +18,11 @@ public interface ITsDicTypeService extends IService<TsDicType> {
 
     public List<TsSearchMenu> getSearchMenu();
 
+    /**
+     * 根据数据字典编码查询字典值
+     * @param typeCode 字典编码
+     * @return 字典值
+     */
+    public String getDicTypeNameByDicCode(String typeCode);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
index c55fb826..cc94a502 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
@@ -25,4 +25,9 @@ public class TsDicTypeServiceImpl extends ServiceImpl<TsDicTypeDao, TsDicType> i
     public List<TsSearchMenu> getSearchMenu() {
         return getBaseMapper().getSearchMenu();
     }
+
+    @Override
+    public String getDicTypeNameByDicCode(String typeCode) {
+        return this.baseMapper.selectDicTypeNameByDicCode(typeCode);
+    }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml
index de045ca7..6cc59f52 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml
@@ -7,9 +7,13 @@
     <resultMap id="BaseResultMap" type="com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation">
         <id property="id" column="ID" jdbcType="VARCHAR"/>
         <result property="firstType" column="FIRST_TYPE" jdbcType="VARCHAR"/>
+        <result property="firstTypeName" column="firstTypeName" jdbcType="VARCHAR"/>
         <result property="secondType" column="SECOND_TYPE" jdbcType="VARCHAR"/>
+        <result property="secondTypeName" column="secondTypeName" jdbcType="VARCHAR"/>
         <result property="thirdType" column="THIRD_TYPE" jdbcType="VARCHAR"/>
+        <result property="thirdTypeName" column="thirdTypeName" jdbcType="VARCHAR"/>
         <result property="fourthType" column="FOURTH_TYPE" jdbcType="VARCHAR"/>
+        <result property="fourthTypeName" column="fourthTypeName" jdbcType="VARCHAR"/>
         <result property="name" column="NAME" jdbcType="VARCHAR"/>
         <result property="department" column="DEPARTMENT" jdbcType="VARCHAR"/>
         <result property="author" column="AUTHOR" jdbcType="VARCHAR"/>
@@ -25,8 +29,16 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        ID,FIRST_TYPE,SECOND_TYPE,
-        THIRD_TYPE,FOURTH_TYPE,`NAME`,
+        ID,
+        FIRST_TYPE,
+        (select DIC_TYPE_NAME from ts_dictype where DIC_ID = (SELECT ID FROM `ts_dictionary` where DICTIONARY_CODE = "firstMaterialType") and DIC_TYPE_CODE = FIRST_TYPE) firstTypeName,
+        SECOND_TYPE,
+        (select DIC_TYPE_NAME from ts_dictype where DIC_ID = (SELECT ID FROM `ts_dictionary` where DICTIONARY_CODE = "secondMaterialType") and DIC_TYPE_CODE = SECOND_TYPE) secondTypeName,
+        THIRD_TYPE,
+        (select DIC_TYPE_NAME from ts_dictype where DIC_ID = (SELECT ID FROM `ts_dictionary` where DICTIONARY_CODE = "thirdMaterialType") and DIC_TYPE_CODE = THIRD_TYPE) thirdTypeName,
+        FOURTH_TYPE,
+        (select DIC_TYPE_NAME from ts_dictype where DIC_ID = (SELECT ID FROM `ts_dictionary` where DICTIONARY_CODE = "fourthMaterialType") and DIC_TYPE_CODE = FOURTH_TYPE) fourthTypeName,
+        `NAME`,
         DEPARTMENT,AUTHOR,UPLOAD_TIME,
         `DESCRIPTION`,INFORMATION_FILE,VIEWABLE_BY,
         DOWNLOADABLE_BY,VALID_FLAG,CREATE_TIME,
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml
index 558feffe..3e637c31 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml
@@ -28,4 +28,7 @@
             t_d_t.DIC_TYPE_NAME is not null and
             t_d.DICTIONARY_NAME is not null
     </select>
+    <select id="selectDicTypeNameByDicCode" resultType="java.lang.String">
+        select DIC_TYPE_NAME from ts_dictype where DIC_TYPE_CODE = #{typeCode}
+    </select>
 </mapper>