Merge branch 'master' of http://111.61.77.35:9999/gengdidi/zhengyuan-danger-chemistry-manage

danger-manage-admin/src/main/java/com/zehong/web/controller/hiddenDanger/TStaningBookController.java

@@ -100,4 +100,14 @@ public class TStaningBookController extends BaseController
     {
         return toAjax(tStaningBookService.deleteTStaningBookByIds(bookIds));
     }
+
+    /**
+     * 统计，按年、月、日统计发现数量和已处置数量
+     * 日，为当日；月为当前30日内；年为当前365日内
+     * @return
+     */
+    @GetMapping(value = "/statics")
+    public AjaxResult statics(String type){
+        return AjaxResult.success(tStaningBookService.statics(type));
+    }
 }

danger-manage-system/src/main/java/com/zehong/system/mapper/TStaningBookMapper.java

 package com.zehong.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TStaningBook;
 
 /**
@@ -58,4 +60,6 @@ public interface TStaningBookMapper
      * @return 结果
      */
     public int deleteTStaningBookByIds(Long[] bookIds);
+
+    public Map statics(String type);
 }

danger-manage-system/src/main/java/com/zehong/system/service/ITStaningBookService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TStaningBook;
 
 /**
@@ -58,4 +60,11 @@ public interface ITStaningBookService
      * @return 结果
      */
     public int deleteTStaningBookById(Long bookId);
+
+    /**
+     * 统计数量
+     * @param type
+     * @return
+     */
+    public Map statics(String type);
 }

danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaningBookServiceImpl.java

 package com.zehong.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.zehong.common.core.domain.entity.SysDept;
 import com.zehong.common.utils.DateUtils;
@@ -110,4 +111,9 @@ public class TStaningBookServiceImpl implements ITStaningBookService
     {
         return tStaningBookMapper.deleteTStaningBookById(bookId);
     }
+
+    @Override
+    public Map statics(String type) {
+        return tStaningBookMapper.statics(type);
+    }
 }

danger-manage-system/src/main/resources/mapper/system/TStaningBookMapper.xml

@@ -180,4 +180,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{bookId}
         </foreach>
     </delete>
+    <select id="statics" parameterType="String" resultType="Map">
+        select count(1) faxian,sum(case state when '2' then 1 else 0 end )as zhenggai from t_staning_book where is_del=0
+        <if test="type=='day'">
+            and DATE_SUB(now(), INTERVAL 1 DAY) &lt; date(find_time)
+        </if>
+        <if test="type=='month'">
+            and DATE_SUB(now(), INTERVAL 30 DAY) &lt; date(find_time)
+        </if>
+        <if test="type=='year'">
+            and DATE_SUB(now(), INTERVAL 365 DAY) &lt; date(find_time)
+        </if>
+    </select>
 </mapper>
\ No newline at end of file