From 1189ff65138c13601e82ac66158d7fc1acf76da8 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 10 Jul 2025 09:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E8=81=8C=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LeaderCockpitServiceImpl.java   | 16 ----------------
 .../resources/mapper/LeaderCockpitMapper.xml     |  3 +++
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java
index 860fa6a..025a75d 100644
--- a/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java
+++ b/src/main/java/com/weaver/seconddev/portal/service/impl/LeaderCockpitServiceImpl.java
@@ -220,22 +220,6 @@ public class LeaderCockpitServiceImpl implements LeaderCockpitService {
         return WeaResult.success(returnMap);
     }
 
-    //public static void main(String[] args) {
-    //    //Map<String, String> params = new HashMap<>();
-    //    //params.put("searchDate", "2025-07-18");
-    //    //SearchConditionParam searchConditionParam = new SearchConditionParam();
-    //    //initSearchConditionParam(searchConditionParam, params, 0);
-    //    //List<SearchConditionParam> list = new ArrayList<>();
-    //    //list.add(searchConditionParam);
-    //    //
-    //    //params.put("searchDate",searchConditionParam.getEndDate());
-    //    //System.out.println(JSON.toJSONString(searchConditionParam));
-    //    String dateStr = "2025-07-05";
-    //    String lastDayOfPreviousMonthStr = DateUtil.getLastDayOfPreviousMonthStr(dateStr, 2);
-    //    System.out.println(lastDayOfPreviousMonthStr);
-    //    String firstDayOfPreviousMonthStr = DateUtil.getFirstDayOfPreviousMonthStr(dateStr, 2);
-    //    System.out.println(firstDayOfPreviousMonthStr);
-    //}
 
     /**
      * 构建查询对象
diff --git a/src/main/resources/mapper/LeaderCockpitMapper.xml b/src/main/resources/mapper/LeaderCockpitMapper.xml
index 3cf3391..3180eff 100644
--- a/src/main/resources/mapper/LeaderCockpitMapper.xml
+++ b/src/main/resources/mapper/LeaderCockpitMapper.xml
@@ -38,6 +38,7 @@
     <select id="getResignCount" resultType="java.lang.Integer">
         select count(id) as value from e10_common.uf_jcl_lzxxjl t
         where t.delete_type = 0 and t.tenant_key = #{tenantKey}
+        and t.lzzt = 1
         <if test="departmentIdList != null and departmentIdList.size() > 0">
             AND t.lzqbm IN
             <foreach collection="departmentIdList" item="departmentId" open="(" close=")" separator=",">
@@ -51,6 +52,7 @@
     <select id="getKeyResignCount" resultType="java.lang.Integer">
         select count(id) as value from e10_common.uf_jcl_lzxxjl t
         where t.delete_type = 0 and t.tenant_key = #{tenantKey}
+        and t.lzzt = 1
         <if test="departmentIdList != null and departmentIdList.size() > 0">
             AND t.lzqbm IN
             <foreach collection="departmentIdList" item="departmentId" open="(" close=")" separator=",">
@@ -115,6 +117,7 @@
     <select id="getResignListByPosition" resultType="com.weaver.seconddev.portal.entity.po.PortalPO">
         select count(id) as name,lzqgw as value from e10_common.uf_jcl_lzxxjl t
         where t.delete_type = 0 and t.tenant_key = #{tenantKey}
+        and t.lzzt = 1
         <if test="departmentIdList != null and departmentIdList.size() > 0">
             AND t.lzqbm IN
             <foreach collection="departmentIdList" item="departmentId" open="(" close=")" separator=",">