From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index a262230..b0bf07e 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.ManageAccountRole;
-import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
import com.moral.api.mapper.ManageAccountRoleMapper;
import com.moral.api.mapper.ManageRoleMapper;
@@ -52,7 +51,6 @@
private ManageAccountRoleMapper manageAccountRoleMapper;
@Override
- @Transactional
public Map<String,Object> getAllWithPagingQuery(Map map) {
Map<String,Object> resultMap = new HashMap<>();
int current = Integer.parseInt(map.get("current").toString());
@@ -71,6 +69,7 @@
String updateTime = SDF.format(manageRole.getUpdateTime());
manageRoleMap.put("createTime",createTime);
manageRoleMap.put("updateTime",updateTime);
+ manageRoleMap.put("key",manageRole.getId());
manageRolesList.add(manageRoleMap);
}
resultMap.put("manageRoles",manageRolesList);
@@ -139,15 +138,36 @@
}
@Override
- @Transactional
- public List<ManageRole> getManageRoleByNameFuzzy(Map map) {
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(Integer.parseInt(map.get("current").toString()), Integer.parseInt(map.get("size").toString()));
+ public Map<String,Object> getManageRoleByNameFuzzy(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
wrapper.like("name",map.get("name"));
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
- return manageRoles;
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> manageRolesList = new ArrayList<>();
+ for (ManageRole manageRole:manageRoles) {
+ Map manageRoleMap = JSON.parseObject(JSON.toJSONString(manageRole),Map.class);
+ String createTime = SDF.format(manageRole.getCreateTime());
+ String updateTime = SDF.format(manageRole.getUpdateTime());
+ manageRoleMap.put("createTime",createTime);
+ manageRoleMap.put("updateTime",updateTime);
+ manageRolesList.add(manageRoleMap);
+ }
+ resultMap.put("manageRoles",manageRolesList);
+ int totalNumber = manageRoleMapper.selectCount(wrapper);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
}
@Override
--
Gitblit v1.8.0