月度期刊统计分页

easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml

@@ -131,13 +131,16 @@
         from sys_user t
         <where>
             <if test="request.nickname!=null and request.nickname!=''">
-                and nickname =  #{request.nickname}
+                <bind name="tempStr1" value="'%' + request.nickname + '%'" />
+                and t.nickname like  #{tempStr1}
             </if>
             <if test="request.phoneNumber!=null and request.phoneNumber!=''">
-                and phone_number =  #{request.phoneNumber}
+                <bind name="tempStr2" value="'%' + request.phoneNumber + '%'" />
+                and t.phone_number like  #{tempStr2}
             </if>
             <if test="request.workplace!=null and request.workplace!=''">
-                and workplace =  #{request.workplace}
+                <bind name="tempStr3" value="'%' + request.workplace + '%'" />
+                and t.workplace like  #{tempStr3}
             </if>
             <if test="request.role!=null and request.role!=''">
                 and id in (select ur.user_id from sys_user_role ur where ur.role_id=#{request.role})
@@ -150,8 +153,25 @@
             left join sys_user_role ur on t.id=ur.user_id
             left join sys_role r on ur.role_id=r.id
         <where>
+            <if test="condition!=null and condition!=''">
             <bind name="tempStr" value="'%' + condition + '%'" />
             and r.name like  #{tempStr}
+            </if>
+            <if test="request.nickname!=null and request.nickname!=''">
+            <bind name="tempStr1" value="'%' + request.nickname + '%'" />
+                and t.nickname like  #{tempStr1}
+            </if>
+            <if test="request.phoneNumber!=null and request.phoneNumber!=''">
+            <bind name="tempStr2" value="'%' + request.phoneNumber + '%'" />
+                and t.phone_number like  #{tempStr2}
+            </if>
+            <if test="request.workplace!=null and request.workplace!=''">
+            <bind name="tempStr3" value="'%' + request.workplace + '%'" />
+                and t.workplace like  #{tempStr3}
+            </if>
+            <if test="request.role!=null and request.role!=''">
+                and t.id in (select ur.user_id from sys_user_role ur where ur.role_id=#{request.role})
+            </if>
         </where>
     </select>
     <select id="getUserPageByConditions" resultMap="UserInfoResponse" parameterType="com.easy.admin.auth.model.UserInfoRequest">
@@ -168,6 +188,21 @@
                 <bind name="tempStr1" value="'%' + condition1 + '%'" />
                 or r.name like #{tempStr1}
             </if>
+            <if test="request.nickname!=null and request.nickname!=''">
+                <bind name="tempStr2" value="'%' + request.nickname + '%'" />
+                and t.nickname like  #{tempStr2}
+            </if>
+            <if test="request.phoneNumber!=null and request.phoneNumber!=''">
+                <bind name="tempStr3" value="'%' + request.phoneNumber + '%'" />
+                and t.phone_number like  #{tempStr3}
+            </if>
+            <if test="request.workplace!=null and request.workplace!=''">
+                <bind name="tempStr4" value="'%' + request.workplace + '%'" />
+                and t.workplace like  #{tempStr4}
+            </if>
+            <if test="request.role!=null and request.role!=''">
+                and t.id in (select ur.user_id from sys_user_role ur where ur.role_id=#{request.role})
+            </if>
         </where>
     </select>
 </mapper>

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java

@@ -1,10 +1,12 @@
 package com.easy.admin.modules.huzhou.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.easy.admin.common.api.vo.Result;
 import com.easy.admin.common.core.exception.EasyException;
 import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab;
 import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabService;
+import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -19,7 +21,7 @@ public class HuzhouPeriodicallabController {
     private IHuzhouPeriodicallabService periodicallabService;
 
     /**
-     * 查询政策法规分页
+     * 查询月度期刊分页
      * @param periodicallab 条件
      * @param pageNo 分页
      * @param pageSize 页码
@@ -35,7 +37,7 @@ public class HuzhouPeriodicallabController {
     }
 
     /**
-     * 根据id获取详情政策法规
+     * 根据id获取详情月度期刊
      * @param id
      * @return
      */
@@ -46,7 +48,7 @@ public class HuzhouPeriodicallabController {
     }
 
     /**
-     * 添加政策法规
+     * 添加月度期刊
      * @param file
      * @param periodicallab
      * @return
@@ -59,7 +61,7 @@ public class HuzhouPeriodicallabController {
     }
 
     /**
-     * 修改政策法规
+     * 修改阅读期刊
      * @param file
      * @param periodicallab
      * @return
@@ -75,7 +77,7 @@ public class HuzhouPeriodicallabController {
     }
 
     /**
-     * 删除政策法规
+     * 删除阅读期刊
      * @param periodicallab
      * @return
      * @throws IOException
@@ -98,4 +100,13 @@ public class HuzhouPeriodicallabController {
     public void batchdownloadPeriodicallabFiles(HuzhouPeriodicallab periodicallab, HttpServletResponse response){
         periodicallabService.batchdownloadPeriodicallabFiles(periodicallab,response);
     }
+    //统计分页
+    @GetMapping("/countPeriodicallabPage")
+    public Result<?> countPeriodicallabPage(PeriodicallabCountPage periodicallab,
+                                       @RequestParam(name="sortOrder", defaultValue="desc") String sortOrder,
+                                       @RequestParam(name="current", defaultValue="1") Integer pageNo,
+                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){
+        IPage<PeriodicallabCountPage> pageList = periodicallabService.countPeriodicallabPage(periodicallab,sortOrder, pageNo, pageSize);
+        return Result.ok(pageList);
+    }
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java

@@ -1,7 +1,15 @@
 package com.easy.admin.modules.huzhou.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab;
+import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
+import com.easy.admin.modules.huzhou.vo.DimensionPageOV;
+import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage;
+import org.apache.ibatis.annotations.Param;
 
 public interface HuzhouPeriodicallabMapper extends BaseMapper<HuzhouPeriodicallab> {
+
+    IPage<PeriodicallabCountPage> getPeriodicalCountPage(Page page, @Param("info") PeriodicallabCountPage info, @Param("orderBy") String orderBy);
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.easy.admin.modules.huzhou.dao.HuzhouPeriodicallabMapper">
+    <resultMap id="countPageMap" type="com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage">
+        <result property="workplace" column="workplace" jdbcType="VARCHAR"/>
+        <result property="adminDivision" column="adminDivision" jdbcType="VARCHAR"/>
+        <result property="number" column="number" jdbcType="NUMERIC"/>
+    </resultMap>
+
+    <select id="getPeriodicalCountPage"  resultMap="countPageMap">
+        select COUNT(*) as number,duty_workplace as workplace,admin_division as adminDivision from huzhou_periodicallab
+        <where>
+        <if test="info.adminDivision!=null and info.adminDivision!=''">
+            <bind name="tempStr" value="'%' + info.adminDivision + '%'" />
+            and u.admin_division like  #{tempStr}
+        </if>
+        <if test="info.workplace!=null and info.workplace!=''">
+            <bind name="tempStr1" value="'%' + info.workplace + '%'" />
+            and u.duty_workplace like  #{tempStr1}
+        </if>
+        </where>
+        group by duty_workplace,adminDivision
+    </select>
+</mapper>

huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java

@@ -58,6 +58,10 @@ public class HuzhouPeriodicallab extends BaseEntity implements Serializable {
      */
     private String status;
 
+    private String workplace;
+
+    private String adminDivision;
+
 
 
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab;
 import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab;
+import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -19,4 +20,6 @@ public interface IHuzhouPeriodicallabService extends IService<HuzhouPeriodicalla
     Boolean deletePeriodicallab(HuzhouPeriodicallab periodicallab);
 
     void batchdownloadPeriodicallabFiles(HuzhouPeriodicallab periodicallab,HttpServletResponse response);
+
+    IPage<PeriodicallabCountPage> countPeriodicallabPage(PeriodicallabCountPage periodicallab, String sortOrder, Integer pageNo, Integer pageSize);
     }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java

@@ -9,8 +9,10 @@ import com.easy.admin.common.util.CommonUtils;
 import com.easy.admin.modules.huzhou.dao.HuzhouPeriodicallabMapper;
 import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab;
 import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabService;
+import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage;
 import com.easy.admin.util.ShiroUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FileCopyUtils;
@@ -31,6 +33,9 @@ import java.util.zip.ZipOutputStream;
 public class HuzhouPeriodicallabServiceImpl extends ServiceImpl<HuzhouPeriodicallabMapper, HuzhouPeriodicallab> implements IHuzhouPeriodicallabService {
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
+
+    @Autowired
+    HuzhouPeriodicallabMapper periodicallabMapper;
     @Override
     public Page<HuzhouPeriodicallab> getPeriodicallabPageList(HuzhouPeriodicallab periodicallab,
                                                                Integer pageNo,
@@ -114,6 +119,13 @@ public class HuzhouPeriodicallabServiceImpl extends ServiceImpl<HuzhouPeriodical
         }
     }
 
+    @Override
+    public IPage<PeriodicallabCountPage> countPeriodicallabPage(PeriodicallabCountPage periodicallab, String sortOrder, Integer pageNo, Integer pageSize) {
+        Page<HuzhouPeriodicallab> page = new Page<>(pageNo, pageSize);
+        IPage<PeriodicallabCountPage> result = periodicallabMapper.getPeriodicalCountPage(page, periodicallab, sortOrder);
+        return result;
+    }
+
     private void addFile(MultipartFile file,HuzhouPeriodicallab periodicallab) throws IOException {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
         String currentDay = dateFormat.format(new Date());

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountPage.java

@@ -0,0 +1,10 @@
+package com.easy.admin.modules.huzhou.vo;
+
+public class PeriodicallabCountPage {
+
+    private String workplace;
+
+    private String adminDivision;
+
+    private String number;
+}