From a242a89fc2094d3ac63b40c48b64602d7aa219d2 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Tue, 10 Sep 2024 17:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DictCheckTypeEntity.java           | 21 +++++++++++++++++++
 .../entity/DictCheckTypeEntity.xml            | 20 ++++++++++++++++--
 .../entity/DictCheckTypeEntityVo.java         | 19 +++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java
index e2765afa..632bea5f 100644
--- a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java
+++ b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.java
@@ -22,6 +22,10 @@ public class DictCheckTypeEntity extends BaseEntity {
    private String branch_code;
   /**  院区名称 */
    private String branch_name;
+  /**  会计年度 */
+   private String kjnd;
+  /**  gsdm */
+   private String gsdm;
 
     public String getCheck_type_code() {
         return check_type_code;
@@ -70,5 +74,22 @@ public class DictCheckTypeEntity extends BaseEntity {
     public void setBranch_name(String branch_name) {
         this.branch_name = branch_name;
     }
+
+
+    public String getKjnd() {
+        return kjnd;
+    }
+
+    public void setKjnd(String kjnd) {
+        this.kjnd = kjnd;
+    }
+
+    public String getGsdm() {
+        return gsdm;
+    }
+
+    public void setGsdm(String gsdm) {
+        this.gsdm = gsdm;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml
index 33858244..66368bc4 100644
--- a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml
+++ b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntity.xml
@@ -3,6 +3,8 @@
 <mapper namespace="com.hzya.frame.xsFinance.dictCheckType.dao.impl.DictCheckTypeDaoImpl">
 
     <resultMap id="get-DictCheckTypeEntity-result" type="com.hzya.frame.xsFinance.dictCheckType.entity.DictCheckTypeEntity" >
+           <result property="kjnd" column="kjnd" jdbcType="VARCHAR"/>
+           <result property="gsdm" column="gsdm" jdbcType="VARCHAR"/>
            <result property="check_type_code" column="check_type_code" jdbcType="VARCHAR"/>
            <result property="check_type_name" column="check_type_name" jdbcType="VARCHAR"/>
            <result property="org_code" column="org_code" jdbcType="VARCHAR"/>
@@ -12,8 +14,10 @@
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "DictCheckTypeEntity_Base_Column_List">
-        check_type_code
-        ,check_type_name 
+         kjnd
+        ,gsdm
+        ,check_type_code
+        ,check_type_name
         ,org_code 
         ,org_name 
         ,branch_code 
@@ -25,6 +29,8 @@
     <include refid="DictCheckTypeEntity_Base_Column_List" />
     from dict_check_type
     <trim prefix="where" prefixOverrides="and"> 
+            <if test="kjnd != null and kjnd != ''"> and kjnd = #{kjnd} </if>
+            <if test="gsdm != null and gsdm != ''"> and gsdm = #{gsdm} </if>
             <if test="check_type_code != null and check_type_code != ''"> and check_type_code = #{check_type_code} </if>
             <if test="check_type_name != null and check_type_name != ''"> and check_type_name = #{check_type_name} </if>
             <if test="org_code != null and org_code != ''"> and org_code = #{org_code} </if>
@@ -38,6 +44,8 @@
 <select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.xsFinance.dictCheckType.entity.DictCheckTypeEntity">
         select  count(1)   from dict_check_type
     <trim prefix="where" prefixOverrides="and"> 
+            <if test="kjnd != null and kjnd != ''"> and kjnd = #{kjnd} </if>
+            <if test="gsdm != null and gsdm != ''"> and gsdm = #{gsdm} </if>
             <if test="check_type_code != null and check_type_code != ''"> and check_type_code = #{check_type_code} </if>
             <if test="check_type_name != null and check_type_name != ''"> and check_type_name = #{check_type_name} </if>
             <if test="org_code != null and org_code != ''"> and org_code = #{org_code} </if>
@@ -53,6 +61,8 @@
     <include refid="DictCheckTypeEntity_Base_Column_List" />
     from dict_check_type
     <trim prefix="where" prefixOverrides="and"> 
+            <if test="kjnd != null and kjnd != ''"> and kjnd like concat('%',#{kjnd},'%') </if>
+            <if test="gsdm != null and gsdm != ''"> and gsdm like concat('%',#{gsdm},'%') </if>
             <if test="check_type_code != null and check_type_code != ''"> and check_type_code like concat('%',#{check_type_code},'%') </if>
             <if test="check_type_name != null and check_type_name != ''"> and check_type_name like concat('%',#{check_type_name},'%') </if>
             <if test="org_code != null and org_code != ''"> and org_code like concat('%',#{org_code},'%') </if>
@@ -68,6 +78,8 @@
     <include refid="DictCheckTypeEntity_Base_Column_List" />
     from dict_check_type
     <trim prefix="where" prefixOverrides="and"> 
+             <if test="gsdm != null and gsdm != ''"> or gsdm = #{gsdm} </if>
+             <if test="kjnd != null and kjnd != ''"> or kjnd = #{kjnd} </if>
              <if test="check_type_code != null and check_type_code != ''"> or check_type_code = #{check_type_code} </if>
              <if test="check_type_name != null and check_type_name != ''"> or check_type_name = #{check_type_name} </if>
              <if test="org_code != null and org_code != ''"> or org_code = #{org_code} </if>
@@ -78,6 +90,8 @@
 </select>
 
     <resultMap id="get-DictCheckTypeEntityVo-result" type="com.hzya.frame.xsFinance.dictCheckType.entity.DictCheckTypeEntityVo" >
+        <result property="kjnd" column="kjnd" jdbcType="VARCHAR"/>
+        <result property="gsdm" column="gsdm" jdbcType="VARCHAR"/>
         <result property="check_type_code" column="check_type_code" jdbcType="VARCHAR"/>
         <result property="check_type_name" column="check_type_name" jdbcType="VARCHAR"/>
         <result property="org_code" column="org_code" jdbcType="VARCHAR"/>
@@ -91,6 +105,8 @@
         <include refid="DictCheckTypeEntity_Base_Column_List" />
         from dict_check_type
         <trim prefix="where" prefixOverrides="and">
+            <if test="kjnd != null and kjnd != ''"> and kjnd = '${kjnd}' </if>
+            <if test="gsdm != null and gsdm != ''"> and gsdm = '${gsdm}' </if>
             <if test="check_type_code != null and check_type_code != ''"> and check_type_code like '%${check_type_code}%' </if>
             <if test="check_type_name != null and check_type_name != ''"> and check_type_name like '%${check_type_name}%' </if>
             <if test="org_code != null and org_code != ''"> and org_code like '%${org_code}%' </if>
diff --git a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java
index 3b514e61..ca00e96d 100644
--- a/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java
+++ b/service/src/main/java/com/hzya/frame/xsFinance/dictCheckType/entity/DictCheckTypeEntityVo.java
@@ -23,6 +23,9 @@ public class DictCheckTypeEntityVo   {
   /**  院区名称 */
    private String branch_name;
 
+   private String kjnd;
+   private String gsdm;
+
     public String getCheck_type_code() {
         return check_type_code;
     }
@@ -70,5 +73,21 @@ public class DictCheckTypeEntityVo   {
     public void setBranch_name(String branch_name) {
         this.branch_name = branch_name;
     }
+
+    public String getKjnd() {
+        return kjnd;
+    }
+
+    public void setKjnd(String kjnd) {
+        this.kjnd = kjnd;
+    }
+
+    public String getGsdm() {
+        return gsdm;
+    }
+
+    public void setGsdm(String gsdm) {
+        this.gsdm = gsdm;
+    }
 }