fix:近6个月统计涉密网络统计

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;
             }

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);
 }

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);
 }

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);
+    }
 }

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>