From 45fb7d941c8c19b9e514d0174310cd225403a9e7 Mon Sep 17 00:00:00 2001
From: uu <1197651512@qq.com>
Date: Thu, 20 Jun 2024 21:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=9C=9F=E5=88=8A=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/auth/dao/mapping/SysUserMapper.xml | 41 +++++++++++++++++--
.../HuzhouPeriodicallabController.java | 21 +++++++---
.../huzhou/dao/HuzhouPeriodicallabMapper.java | 8 ++++
.../dao/mapping/HuzhouPeriodicallabMapper.xml | 24 +++++++++++
.../huzhou/entity/HuzhouPeriodicallab.java | 4 ++
.../service/IHuzhouPeriodicallabService.java | 3 ++
.../impl/HuzhouPeriodicallabServiceImpl.java | 12 ++++++
.../huzhou/vo/PeriodicallabCountPage.java | 10 +++++
8 files changed, 115 insertions(+), 8 deletions(-)
create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml
create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountPage.java
diff --git a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml
index fb82cac..ac19274 100644
--- a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml
+++ b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml
@@ -131,13 +131,16 @@
from sys_user t
- and nickname = #{request.nickname}
+
+ and t.nickname like #{tempStr1}
- and phone_number = #{request.phoneNumber}
+
+ and t.phone_number like #{tempStr2}
- and workplace = #{request.workplace}
+
+ and t.workplace like #{tempStr3}
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
+
and r.name like #{tempStr}
+
+
+
+ and t.nickname like #{tempStr1}
+
+
+
+ and t.phone_number like #{tempStr2}
+
+
+
+ and t.workplace like #{tempStr3}
+
+
+ and t.id in (select ur.user_id from sys_user_role ur where ur.role_id=#{request.role})
+
+
+
+ and t.nickname like #{tempStr2}
+
+
+
+ and t.phone_number like #{tempStr3}
+
+
+
+ and t.workplace like #{tempStr4}
+
+
+ and t.id in (select ur.user_id from sys_user_role ur where ur.role_id=#{request.role})
+
\ No newline at end of file
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java
index b621250..8a332f7 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java
+++ b/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 pageList = periodicallabService.countPeriodicallabPage(periodicallab,sortOrder, pageNo, pageSize);
+ return Result.ok(pageList);
+ }
}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java
index e294363..6dd3c8b 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java
+++ b/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 {
+
+ IPage getPeriodicalCountPage(Page page, @Param("info") PeriodicallabCountPage info, @Param("orderBy") String orderBy);
}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml
new file mode 100644
index 0000000..2f6bf30
--- /dev/null
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java
index 1afef21..b628982 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java
+++ b/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;
+
}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java
index 19cc287..cb5aa27 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java
+++ b/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 countPeriodicallabPage(PeriodicallabCountPage periodicallab, String sortOrder, Integer pageNo, Integer pageSize);
}
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java
index 1b6479f..8d91ebf 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java
+++ b/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 implements IHuzhouPeriodicallabService {
@Value(value = "${jeecg.path.upload}")
private String uploadpath;
+
+ @Autowired
+ HuzhouPeriodicallabMapper periodicallabMapper;
@Override
public Page getPeriodicallabPageList(HuzhouPeriodicallab periodicallab,
Integer pageNo,
@@ -114,6 +119,13 @@ public class HuzhouPeriodicallabServiceImpl extends ServiceImpl countPeriodicallabPage(PeriodicallabCountPage periodicallab, String sortOrder, Integer pageNo, Integer pageSize) {
+ Page page = new Page<>(pageNo, pageSize);
+ IPage 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());
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountPage.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountPage.java
new file mode 100644
index 0000000..0ad0764
--- /dev/null
+++ b/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;
+}