添加过滤条件

src/main/java/com/unissoft/mapper/StatisticsWorkCompletionMapper.java

@@ -19,5 +19,7 @@ public interface StatisticsWorkCompletionMapper extends BaseMapper<StatisticsWor
 
     IPage<StatisticsWorkCompletion> getPage(IPage<StatisticsWorkCompletion> page, @Param("depots") List<Integer> depots, @Param("sTime") String sTime);
 
+    IPage<StatisticsWorkCompletion> getGroupPage(IPage<StatisticsWorkCompletion> page, @Param("depots") List<Integer> depots, @Param("sTime") String sTime);
+
     List<StatisticsWorkCompletion> getGroupByDepotId(@Param("depots") List<Integer> depots, @Param("sTime") String sTime);
 }

src/main/java/com/unissoft/mapper/StatisticsWorkCompletionMapper.xml

@@ -33,6 +33,7 @@
         FROM
         statistics_work_completion
         <where>
+            and depot_id != 1
             <if test="sTime != null and sTime != ''">
                 and DATE_FORMAT(`s_time`, '%Y%m') = DATE_FORMAT(#{sTime}, '%Y%m')
             </if>
@@ -45,12 +46,44 @@
         s_score DESC
     </select>
 
+    <select id="getGroupPage" resultMap="BaseResultMap">
+        SELECT
+        id,
+        personnel_id,
+        personnel_name,
+        s_position,
+        depot_id,
+        depot_name,
+        s_time,
+        round(AVG(monthly_work_quantity),0) monthly_work_quantity,
+        round(AVG(finish_on_time),0) finish_on_time,
+        round(AVG(late_completion),0) late_completion ,
+        round(AVG(s_overdue),0) s_overdue,
+        round(AVG(s_score),0) s_score
+        FROM
+        statistics_work_completion
+        <where>
+            and depot_id != 1
+            <if test="sTime != null and sTime != ''">
+                and DATE_FORMAT(`s_time`, '%Y%m') = DATE_FORMAT(#{sTime}, '%Y%m')
+            </if>
+            <if test="depots != null">
+                AND depot_id IN
+                <foreach item="item" collection="depots" index="index" open="(" separator="," close=")">#{item}</foreach>
+            </if>
+        </where>
+        GROUP BY depot_id
+        ORDER BY
+        s_score DESC
+    </select>
+
     <select id="getGroupByDepotId" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
         FROM
         statistics_work_completion
         <where>
+            and depot_id != 1
             <if test="sTime != null and sTime != ''">
                 and DATE_FORMAT(`s_time`, '%Y%m') = DATE_FORMAT(#{sTime}, '%Y%m')
             </if>

src/main/java/com/unissoft/mapper/SysUserActivityMapper.java

@@ -19,5 +19,7 @@ public interface SysUserActivityMapper extends BaseMapper<SysUserActivity> {
 
     IPage<SysUserActivity> getPage(IPage<SysUserActivity> page, @Param("depots") List<Integer> depots, @Param("sTime") String sTime);
 
+    IPage<SysUserActivity> getGroupPage(IPage<SysUserActivity> page, @Param("depots") List<Integer> depots, @Param("sTime") String sTime);
+
     List<SysUserActivity> getGroupByDepotId(@Param("depots") List<Integer> depots, @Param("sTime") String sTime);
 }

src/main/java/com/unissoft/mapper/SysUserActivityMapper.xml

@@ -30,6 +30,36 @@
         FROM
         sys_user_activity
         <where>
+            and depot_id != 1
+            <if test="sTime != null and sTime != ''">
+                and DATE_FORMAT(`act_time`, '%Y%m') = DATE_FORMAT(#{sTime}, '%Y%m')
+            </if>
+            <if test="depots != null">
+                AND depot_id IN
+                <foreach item="item" collection="depots" index="index" open="(" separator="," close=")">#{item}</foreach>
+            </if>
+        </where>
+        ORDER BY
+        us_activity DESC
+    </select>
+
+    <select id="getGroupPage" resultMap="BaseResultMap">
+        SELECT
+        id,
+        user_id,
+        personnel_name,
+        depot_id,
+        depot_name,
+        round(AVG(province_ranking), 0) province_ranking,
+        depot_ranking,
+        s_position,
+        completion_id,
+        act_time,
+        round(AVG(us_activity), 0) us_activity
+        FROM
+        sys_user_activity
+        <where>
+            and depot_id != 1
             <if test="sTime != null and sTime != ''">
                 and DATE_FORMAT(`act_time`, '%Y%m') = DATE_FORMAT(#{sTime}, '%Y%m')
             </if>
@@ -38,6 +68,8 @@
                 <foreach item="item" collection="depots" index="index" open="(" separator="," close=")">#{item}</foreach>
             </if>
         </where>
+        GROUP BY
+        depot_id
         ORDER BY
         us_activity DESC
     </select>

src/main/java/com/unissoft/ventilation/controller/StatisticsWorkCompletionController.java

@@ -31,8 +31,8 @@ public class StatisticsWorkCompletionController {
     @Autowired
     private StatisticsWorkCompletionService workCompletionService;
 
-    @ApiOperation(value = "统计列表分页查询,其中type属性代表是否查询单个库下面的数据（1代表单个库，空代表所有）", notes = "{\n" +
-            "  \"condition\": \"{'depotId':'2','sTime':'2021-03','type':'1'}\",\n" +
+    @ApiOperation(value = "统计列表分页查询,其中type属性代表是否查询单个库下面的数据（1代表单个库，空代表所有）；groupBy=1代表查询首页跳转到分页列表，groupBy=2代表查看库内工作情况排名分页列表", notes = "{\n" +
+            "  \"condition\": \"{'depotId':'2','sTime':'2021-03','type':'1','groupBy':'1'}\",\n" +
             "  \"pageIndex\": 1,\n" +
             "  \"pageSize\": 10\n" +
             "}")

src/main/java/com/unissoft/ventilation/controller/SysUserActivityController.java

@@ -29,7 +29,7 @@ public class SysUserActivityController {
     @Autowired
     private SysUserActivityService activityService;
 
-    @ApiOperation(value = "统计列表分页查询,其中type属性代表是否查询单个库下面的数据（1代表单个库，空代表所有）", notes = "{\n" +
+    @ApiOperation(value = "统计列表分页查询,其中type属性代表是否查询单个库下面的数据（1代表单个库，空代表所有）；groupBy=1代表查询首页跳转到分页列表，groupBy=2代表查看库内活跃排名分页列表", notes = "{\n" +
             "  \"condition\": \"{'depotId':'2','sTime':'2021-03','type':'1'}\",\n" +
             "  \"pageIndex\": 1,\n" +
             "  \"pageSize\": 10\n" +

src/main/java/com/unissoft/ventilation/service/impl/StatisticsWorkCompletionServiceImpl.java

@@ -44,12 +44,13 @@ public class StatisticsWorkCompletionServiceImpl extends ServiceImpl<StatisticsW
     public IPage<StatisticsWorkCompletion> getByPage(PageParam pageParam) {
         Integer pageIndex = pageParam.getPageIndex();
         Integer pageSize = pageParam.getPageSize();
-        String depotId = null, sTime = null, type = null;
+        String depotId = null, sTime = null, type = null, groupBy = null;
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
             JSONObject object = new JSONObject(pageParam.getCondition());
             depotId = object.optString("depotId").trim();
             sTime = object.optString("sTime").trim();
             type = object.optString("type").trim();
+            groupBy = object.optString("groupBy").trim();
         }
 
         Page page = null;
@@ -72,7 +73,14 @@ public class StatisticsWorkCompletionServiceImpl extends ServiceImpl<StatisticsW
         } else {
             sTime += MyConstant.BURDEN_ZERO;
         }
-        IPage<StatisticsWorkCompletion> pageResult = workCompletionMapper.getPage(page, allDepotChild, sTime);
+        IPage<StatisticsWorkCompletion> pageResult = null;
+        if (groupBy.equals(MyConstant.ONE_STR)) {
+            //分组列表
+            pageResult = workCompletionMapper.getGroupPage(page, allDepotChild, sTime);
+        } else {
+            //单个库列表
+            pageResult = workCompletionMapper.getPage(page, allDepotChild, sTime);
+        }
         return pageResult;
     }
 

src/main/java/com/unissoft/ventilation/service/impl/SysUserActivityServiceImpl.java

@@ -44,12 +44,13 @@ public class SysUserActivityServiceImpl extends ServiceImpl<SysUserActivityMappe
     public IPage<SysUserActivity> getByPage(PageParam pageParam) {
         Integer pageIndex = pageParam.getPageIndex();
         Integer pageSize = pageParam.getPageSize();
-        String depotId = null, sTime = null, type = null;
+        String depotId = null, sTime = null, type = null,groupBy=null;
         if (!StringUtils.isEmpty(pageParam.getCondition())) {
             JSONObject object = new JSONObject(pageParam.getCondition());
             depotId = object.optString("depotId").trim();
             sTime = object.optString("sTime").trim();
             type = object.optString("type").trim();
+            groupBy = object.optString("groupBy").trim();
         }
 
         Page page = null;
@@ -72,7 +73,14 @@ public class SysUserActivityServiceImpl extends ServiceImpl<SysUserActivityMappe
         } else {
             sTime += MyConstant.BURDEN_ZERO;
         }
-        IPage<SysUserActivity> pageResult = activityMapper.getPage(page, allDepotChild, sTime);
+        IPage<SysUserActivity> pageResult =null;
+        if (groupBy.equals(MyConstant.ONE_STR)){
+            //分组列表
+            pageResult = activityMapper.getGroupPage(page, allDepotChild, sTime);
+        }else {
+            //单个库列表
+            pageResult = activityMapper.getPage(page, allDepotChild, sTime);
+        }
         return pageResult;
     }