From c27a2281f369ad99d475d184acfacea2d1eefc18 Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Thu, 5 Dec 2024 17:34:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=9B=AE=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/da/common/core/domain/entity/DaCatalog.java    | 4 ++++
 .../src/main/resources/mapper/dangan/DaCatalogMapper.xml    | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java b/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java
index 02517b6..398028b 100644
--- a/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java
+++ b/dangan-common/src/main/java/com/da/common/core/domain/entity/DaCatalog.java
@@ -41,6 +41,10 @@ public class DaCatalog extends BaseEntity
     @Excel(name = "业务类型",dictType = "yw_type")
     private String ywType;
 
+    /** 该目录及子目录下档案统计 */
+    @Excel(name = "该目录及子目录下档案统计")
+    private Long countNum;
+
     /** 业务类型(字典) */
    // @Excel(name = "图片模板")
     private String picPath;
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
index 9757ea6..5f419be 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
@@ -11,6 +11,7 @@
         <result property="ancestors" column="ancestors"/>
         <result property="orderNum" column="order_num"/>
         <result property="ywType" column="yw_type"/>
+        <result property="countNum"    column="count_num"    />
         <result property="picPath" column="pic_path"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
@@ -21,7 +22,7 @@
     </resultMap>
 
     <sql id="selectDaCatalogVo">
-        select id, mu_name, pid, ancestors, order_num, yw_type, pic_path, status, remark, create_by, create_time, update_by, update_time from da_catalog
+        select id, mu_name, pid, ancestors, order_num, yw_type,count_num, pic_path, status, remark, create_by, create_time, update_by, update_time from da_catalog
     </sql>
 
     <select id="selectDaCatalogList" parameterType="DaCatalog" resultMap="DaCatalogResult">
@@ -154,6 +155,7 @@
             <if test="ancestors != null">ancestors,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="ywType != null">yw_type,</if>
+            <if test="countNum != null">count_num,</if>
             <if test="picPath != null">pic_path,</if>
             <if test="status != null">status,</if>
             <if test="remark != null">remark,</if>
@@ -168,6 +170,7 @@
             <if test="ancestors != null">#{ancestors},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="ywType != null">#{ywType},</if>
+            <if test="countNum != null">#{countNum},</if>
             <if test="picPath != null">#{picPath},</if>
             <if test="status != null">#{status},</if>
             <if test="remark != null">#{remark},</if>
@@ -186,6 +189,7 @@
             <if test="ancestors != null">ancestors = #{ancestors},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
+            <if test="countNum != null">count_num = #{countNum},</if>
             <if test="picPath != null">pic_path = #{picPath},</if>
             <if test="status != null">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>