From dc213af076dffaf8a959e463947320c8ccb7ed9e Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Fri, 11 Oct 2024 10:51:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=916=E4=B8=AA=E6=9C=88=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=B6=89=E5=AF=86=E7=BD=91=E7=BB=9C=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/count/SysPropertynumController.java | 2 +-
 .../com/ruoyi/system/mapper/TdPropertyManagerMapper.java  | 2 ++
 .../ruoyi/system/service/ITdPropertyManagerService.java   | 3 +++
 .../system/service/impl/TdPropertyManagerServiceImpl.java | 5 +++++
 .../resources/mapper/system/TdPropertyManagerMapper.xml   | 8 ++++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
index 23d8610..c74f50a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
@@ -276,7 +276,7 @@ public class SysPropertynumController extends BaseController {
             tdPropertManager.setMinDayTime(minDayTime);
             tdPropertManager.setMaxDayTime(maxDayTime);
             tdPropertManager.setSecretsType("1");
-            Integer countWx = tdPropertyManagerService.countMessageMonth(tdPropertManager);
+            Integer countWx = tdPropertyManagerService.countMessageWxMonth(tdPropertManager);
             if(Objects.isNull(countWx)){
                 countWx = 0;
             }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
index aff396f..fdf8272 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
@@ -71,4 +71,6 @@ public interface TdPropertyManagerMapper extends BaseMapper<TdPropertyManager>
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO);
 
     public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO);
+
+    public Integer countMessageWxMonth(PropertyManagerDTO propertyManagerDTO);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
index cc47f2b..af82df3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
@@ -73,4 +73,7 @@ public interface ITdPropertyManagerService extends IService<TdPropertyManager>
 
 
     public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO);
+
+
+    public Integer countMessageWxMonth(PropertyManagerDTO propertyManagerDTO);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
index 2d76f81..9fddfe8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
@@ -113,4 +113,9 @@ public class TdPropertyManagerServiceImpl extends ServiceImpl<TdPropertyManagerM
     public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO) {
         return tdPropertyManagerMapper.countDestoryMonth(propertyManagerDTO);
     }
+
+    @Override
+    public Integer countMessageWxMonth(PropertyManagerDTO propertyManagerDTO) {
+        return tdPropertyManagerMapper.countMessageWxMonth(propertyManagerDTO);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
index 6278ea0..a396115 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
@@ -133,4 +133,12 @@
           and d.destory_state =#{destoryState}
     </select>
 
+    <select id="countMessageWxMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
+        SELECT COUNT(t.*) from td_property_manager  t  RIGHT  JOIN  td_property_info  d
+            on t.use_id = d.use_id  where t.secrets_type=#{secretsType}
+                  AND t.recover_date &gt;= #{minDayTime}
+                  AND t.recover_date &lt;= #{maxDayTime}
+             and d.destory_state is null
+    </select>
+
 </mapper>
\ No newline at end of file