From 8dac1141d46de5f11faa758f8102dfd387478a6b Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 7 Jun 2024 14:32:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AF=9D=E6=9C=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xinelu/common/constant/Constants.java |  5 +++
 .../termbank/TermBankController.java          |  5 +++
 .../manage/domain/termbank/TermBank.java      |  4 +-
 .../termbank/impl/TermBankServiceImpl.java    |  8 ++++
 .../mapper/manage/termbank/TermBankMapper.xml | 42 +++++++++----------
 5 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
index 5886c10a..456772f8 100644
--- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
+++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
@@ -244,6 +244,11 @@ public class Constants {
      */
     public static final String ROUTE_CODE = "RC";
 
+    /**
+     * 常用术语编码
+     */
+    public static final String TERM_CODE = "TC";
+
     /**
      * 院后微信小程序accessToken的redis的键前缀
      */
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java
index af70ec2c..5fa9eb38 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/termbank/TermBankController.java
@@ -38,6 +38,11 @@ public class TermBankController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/selectTermBankList")
+    public AjaxResult selectTermBankList(TermBank termBank) {
+        return AjaxResult.success(termBankService.selectTermBankList(termBank));
+    }
+
     /**
      * 导出常用术语(知识库)列表
      */
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/termbank/TermBank.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/termbank/TermBank.java
index 5b0c5888..f52e8f7c 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/termbank/TermBank.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/termbank/TermBank.java
@@ -63,14 +63,14 @@ public class TermBank extends BaseEntity {
      */
     @ApiModelProperty(value = "层级，从1开始，1,2,3……")
     @Excel(name = "层级，从1开始，1,2,3……")
-    private Integer termLevel;
+    private Long termLevel;
 
     /**
      * 内容排序
      */
     @ApiModelProperty(value = "内容排序")
     @Excel(name = "内容排序")
-    private Integer termSort;
+    private Long termSort;
 
     /**
      * 内容备注信息
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java
index 58216c83..c1941146 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/termbank/impl/TermBankServiceImpl.java
@@ -1,5 +1,8 @@
 package com.xinelu.manage.service.termbank.impl;
 
+import com.xinelu.common.constant.Constants;
+import com.xinelu.common.utils.SecurityUtils;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
 import com.xinelu.manage.domain.termbank.TermBank;
 import com.xinelu.manage.mapper.termbank.TermBankMapper;
 import com.xinelu.manage.service.termbank.ITermBankService;
@@ -19,6 +22,8 @@ import java.util.List;
 public class TermBankServiceImpl implements ITermBankService {
     @Resource
     private TermBankMapper termBankMapper;
+    @Resource
+    private GenerateSystemCodeUtil generateSystemCodeUtil;
 
     /**
      * 查询常用术语(知识库)
@@ -39,6 +44,7 @@ public class TermBankServiceImpl implements ITermBankService {
      */
     @Override
     public List<TermBank> selectTermBankList(TermBank termBank) {
+        termBank.setTermLevel(1l);
         return termBankMapper.selectTermBankList(termBank);
     }
 
@@ -51,6 +57,8 @@ public class TermBankServiceImpl implements ITermBankService {
     @Override
     public int insertTermBank(TermBank termBank) {
         termBank.setCreateTime(LocalDateTime.now());
+        termBank.setCreateBy(SecurityUtils.getUsername());
+        termBank.setTermCode(Constants.TERM_CODE + generateSystemCodeUtil.generateSystemCode(Constants.TERM_CODE));
         return termBankMapper.insertTermBank(termBank);
     }
 
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/termbank/TermBankMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/termbank/TermBankMapper.xml
index 5376ce48..c2a66407 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/termbank/TermBankMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/termbank/TermBankMapper.xml
@@ -26,27 +26,27 @@
     <select id="selectTermBankList" parameterType="TermBank" resultMap="TermBankResult">
         <include refid="selectTermBankVo"/>
         <where>
-                        <if test="termCode != null  and termCode != ''">
-                            and term_code = #{termCode}
-                        </if>
-                        <if test="termName != null  and termName != ''">
-                            and term_name like concat('%', #{termName}, '%')
-                        </if>
-                        <if test="termContent != null  and termContent != ''">
-                            and term_content = #{termContent}
-                        </if>
-                        <if test="parentTermCode != null  and parentTermCode != ''">
-                            and parent_term_code = #{parentTermCode}
-                        </if>
-                        <if test="termLevel != null ">
-                            and term_level = #{termLevel}
-                        </if>
-                        <if test="termSort != null ">
-                            and term_sort = #{termSort}
-                        </if>
-                        <if test="termRemark != null  and termRemark != ''">
-                            and term_remark = #{termRemark}
-                        </if>
+            <if test="termCode != null  and termCode != ''">
+                and term_code = #{termCode}
+            </if>
+            <if test="termName != null  and termName != ''">
+                and term_name like concat('%', #{termName}, '%')
+            </if>
+            <if test="termContent != null  and termContent != ''">
+                and term_content = #{termContent}
+            </if>
+            <if test="parentTermCode != null  and parentTermCode != ''">
+                and parent_term_code = #{parentTermCode}
+            </if>
+            <if test="termLevel != null ">
+                and term_level = #{termLevel}
+            </if>
+            <if test="termSort != null ">
+                and term_sort = #{termSort}
+            </if>
+            <if test="termRemark != null  and termRemark != ''">
+                and term_remark = #{termRemark}
+            </if>
         </where>
     </select>