From dca0dcb298936f9eb1551461f68f1ed0e81ae774 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Tue, 10 Sep 2024 01:10:52 +0800
Subject: [PATCH] update

---
 .../src/main/resources/mapper/DocumentMapper.xml         | 1 +
 .../src/main/resources/mapper/DownloadCountMapper.xml    | 4 ++--
 tool-tech-admin/src/main/resources/mapper/ToolMapper.xml | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml b/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml
index 50d551a..5a9176d 100644
--- a/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/DocumentMapper.xml
@@ -46,6 +46,7 @@
             <if test="docName != null  and docName != ''"> and td.doc_name like concat('%', #{docName}, '%')</if>
             <if test="docType != null  and docType != ''"> and td.doc_type = #{docType}</if>
             <if test="docPrincipals != null  and docPrincipals != ''"> and td.doc_principals like concat('%', #{docPrincipals}, '%')</if>
+            <if test="docPrincipalsName != null  and docPrincipalsName != ''"> and td.doc_principals_name like concat('%', #{docPrincipalsName}, '%')</if>
             <if test="docRespDept != null  and docRespDept != ''"> and td.doc_resp_dept = #{docRespDept}</if>
             <if test="docSource != null  and docSource != ''"> and td.doc_source = #{docSource}</if>
             <if test="docStatus != null  and docStatus != ''"> and td.doc_status = #{docStatus}</if>
diff --git a/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml b/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
index be41d49..7f086ee 100644
--- a/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from t_download_count tdc
         left join t_tool tl on tdc.business_id = tl.tool_id
         <where>
-            and business_type = 'tool'
+            and business_type = 'tool' and tl.record_status != 'cancel'
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from t_download_count tdc
         left join t_document tl on tdc.business_id = tl.doc_id
         <where>
-            and business_type = 'doc'
+            and business_type = 'doc' and tl.is_deleted != 1
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
diff --git a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
index dbf451f..143b10a 100644
--- a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
@@ -160,6 +160,15 @@
         <if test="toolName != null and toolName != ''">
             AND u.tool_name like concat('%', #{toolName}, '%')
         </if>
+        <if test="toolPrincipalsName != null and toolPrincipalsName != ''">
+            AND u.tool_principals_name like concat('%', #{toolPrincipalsName}, '%')
+        </if>
+        <if test="toolType != null and toolType != ''">
+            AND u.tool_type = #{toolType}
+        </if>
+        <if test="recordStatus != null and recordStatus != ''">
+            AND u.record_status = #{recordStatus}
+        </if>
         <if test="status != null and status != ''">
             AND u.status = #{status}
         </if>