From be5c2ff02c78cb5ce52b0ae866e852b425829f00 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 17 May 2023 15:37:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/vo/TtReportManageActPageVO.java | 1 + .../com/adc/da/sys/dao/mysql/UserEODao.java | 7 ++-- .../adc/da/sys/service/UserEOServiceImpl.java | 9 +++-- .../mybatis/mapper/sys/mysql/OrgEOMapper.xml | 2 +- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 34 ++++++++++++++----- .../task/TaskController.java | 22 ++++++------ 6 files changed, 51 insertions(+), 24 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java index 6b63355..2583b3b 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TtReportManageActPageVO.java @@ -32,6 +32,7 @@ public class TtReportManageActPageVO extends BasePageVO { */ private String dataId; + private String reportId; /** * */ diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java index 4429887..fc74d38 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java @@ -4,7 +4,6 @@ import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.vo.UserVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,7 +21,9 @@ import java.util.Map; */ public interface UserEODao extends BaseMapper { - IPage> list(IPage page, @Param("account") String account, @Param("roleName") String roleName); + List> list(@Param("current")int current ,@Param("size") int size , + @Param("account") String account, + @Param("roleName") String roleName); /** * 查询用户及用户所对应的角色 @@ -47,4 +48,6 @@ public interface UserEODao extends BaseMapper { UserVO selectUserByIdNodel(String userId); List getOwnLeader(@Param("Vo") List orgEOList); + + long listCount(@Param("account") String account, @Param("roleName") String roleName); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 9aac281..e616a1a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -203,10 +203,15 @@ public class UserEOServiceImpl implements IUserEoService { @Override public IPage> list(int pageNo, int pageSize, String account, String roleName) { IPage page = new Page(); + int i = pageNo - 1 ; + int current = i == 0 ? 0 : i * pageSize; page.setCurrent(pageNo); page.setSize(pageSize); - IPage> list = dao.list(page, account, roleName); - return list; + List> list = dao.list(current, pageSize, account, roleName); + long count = dao.listCount(account,roleName); + page.setTotal(count); + page.setRecords(list); + return page; } @Override diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml index 6f1d967..1093a10 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml @@ -5,7 +5,7 @@ - and DEPARTMENT_CODE = #{pageVO.departmentCode} + and DEPARTMENT_CODE LIKE CONCAT(CONCAT('%',#{pageVO.departmentCode}),'%') and LONG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.longName}) ,'%') diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 4de06e6..68a3a34 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -7,25 +7,40 @@ date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE, GROUP_CONCAT( DISTINCT org.ID ) as ORGID, GROUP_CONCAT( DISTINCT org.LONG_NAME )as ORGNAME - from TS_USER t1 + from + ( + select * from TS_USER + where del_flag = 0 + + and ACCOUNT like CONCAT('%',CONCAT(#{account},'%')) + + + and NAME like CONCAT('%',CONCAT(#{roleName},'%')) + + ORDER BY UPDATE_TIME DESC + LIMIT #{current},#{size} + ) t1 left join TR_USER_ROLE t2 on t1.USID=t2.USER_ID left JOIN TS_ROLE t3 on t2.ROLE_ID=t3.ID left JOIN tr_user_org uo on t1.usid= uo.user_id left JOIN ts_org org on uo.org_id = org.id - where t1.del_flag='0' - - and t1.ACCOUNT like "%"#{account}"%" - - - - and t3.NAME like "%"#{roleName}"%" - GROUP BY t1.USID ORDER BY t1.UPDATE_TIME DESC )tt + +