diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html index 8fc36903..9e2e3212 100644 --- a/erp_web/pages/manage/depot.html +++ b/erp_web/pages/manage/depot.html @@ -563,7 +563,7 @@ var remark = $.trim($("#searchRemark").val()); $.ajax({ type: "get", - url: "/depot/getDepotList", + url: "/depot/list", dataType: "json", data: ({ search: JSON.stringify({ diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html index 386e844b..c99087a5 100644 --- a/erp_web/pages/manage/user.html +++ b/erp_web/pages/manage/user.html @@ -488,7 +488,7 @@ var loginName = $.trim($("#searchLoginName").val()); $.ajax({ type: "get", - url: "/user/getUserList", + url: "/user/list", dataType: "json", data: ({ search: JSON.stringify({ diff --git a/pom.xml b/pom.xml index c0347124..71c6782f 100644 --- a/pom.xml +++ b/pom.xml @@ -108,11 +108,6 @@ 1.7.25 compile - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.2.10 - com.baomidou mybatis-plus-boot-starter diff --git a/src/main/java/com/jsh/erp/controller/DepotController.java b/src/main/java/com/jsh/erp/controller/DepotController.java index 2bd429ec..ca0f4771 100644 --- a/src/main/java/com/jsh/erp/controller/DepotController.java +++ b/src/main/java/com/jsh/erp/controller/DepotController.java @@ -1,11 +1,7 @@ package com.jsh.erp.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.Depot; @@ -149,54 +145,8 @@ public class DepotController { } return arr; } + /** - * create by: cjl - * description: - * 查询仓库列表信息 - * create time: 2019/2/25 14:32 - * @Param: pageSize -  * @Param: currentPage -  * @Param: search - * @return java.lang.String - */ - @RequestMapping(value = "/getDepotList") - public String getDepotList( - @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, - @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, - @RequestParam(value = Constants.SEARCH, required = false) String search) throws Exception{ - Map parameterMap = new HashMap(); - //查询参数 - JSONObject obj=JSON.parseObject(search); - Set key= obj.keySet(); - for(String keyEach: key){ - parameterMap.put(keyEach,obj.getString(keyEach)); - } - PageQueryInfo queryInfo = new PageQueryInfo(); - Map objectMap = new HashMap(); - if (pageSize == null || pageSize <= 0) { - pageSize = BusinessConstants.DEFAULT_PAGINATION_PAGE_SIZE; - } - if (currentPage == null || currentPage <= 0) { - currentPage = BusinessConstants.DEFAULT_PAGINATION_PAGE_NUMBER; - } - PageHelper.startPage(currentPage,pageSize,true); - List list = depotService.getDepotList(parameterMap); - //获取分页查询后的数据 - PageInfo pageInfo = new PageInfo<>(list); - objectMap.put("page", queryInfo); - if (list == null) { - queryInfo.setRows(new ArrayList()); - queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); - return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); - } - queryInfo.setRows(list); - queryInfo.setTotal(pageInfo.getTotal()); - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } - /** - * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 批量删除仓库信息 * create time: 2019/3/29 11:15 * @Param: ids diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java index ef47813d..e9713af9 100644 --- a/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -3,8 +3,6 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.DepotEx; @@ -403,16 +401,8 @@ public class MaterialController { } PageQueryInfo queryInfo = new PageQueryInfo(); Map objectMap = new HashMap(); - if (pageSize == null || pageSize <= 0) { - pageSize = BusinessConstants.DEFAULT_PAGINATION_PAGE_SIZE; - } - if (currentPage == null || currentPage <= 0) { - currentPage = BusinessConstants.DEFAULT_PAGINATION_PAGE_NUMBER; - } - PageHelper.startPage(currentPage,pageSize,true); List list = materialService.getMaterialEnableSerialNumberList(parameterMap); - //获取分页查询后的数据 - PageInfo pageInfo = new PageInfo<>(list); + Long count = materialService.getMaterialEnableSerialNumberCount(parameterMap); objectMap.put("page", queryInfo); if (list == null) { queryInfo.setRows(new ArrayList()); @@ -420,7 +410,7 @@ public class MaterialController { return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); } queryInfo.setRows(list); - queryInfo.setTotal(pageInfo.getTotal()); + queryInfo.setTotal(count); return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); } /** diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java index 72a01ef5..a682366d 100644 --- a/src/main/java/com/jsh/erp/controller/UserController.java +++ b/src/main/java/com/jsh/erp/controller/UserController.java @@ -3,8 +3,6 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.Tenant; @@ -258,50 +256,6 @@ public class UserController { } return res; } - /** - * create by: cjl - * description: - * 查询分页用户列表 - * create time: 2019/3/8 15:08 - * @Param: pageSize -  * @Param: currentPage -  * @Param: search - * @return java.lang.String - */ - @GetMapping(value = "/getUserList") - public String getUserList(@RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, - @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, - @RequestParam(value = Constants.SEARCH, required = false) String search)throws Exception { - - Map parameterMap = new HashMap(); - //查询参数 - JSONObject obj= JSON.parseObject(search); - Set key= obj.keySet(); - for(String keyEach: key){ - parameterMap.put(keyEach,obj.getString(keyEach)); - } - PageQueryInfo queryInfo = new PageQueryInfo(); - Map objectMap = new HashMap(); - if (pageSize == null || pageSize <= 0) { - pageSize = BusinessConstants.DEFAULT_PAGINATION_PAGE_SIZE; - } - if (currentPage == null || currentPage <= 0) { - currentPage = BusinessConstants.DEFAULT_PAGINATION_PAGE_NUMBER; - } - PageHelper.startPage(currentPage,pageSize,true); - List list = userService.getUserList(parameterMap); - //获取分页查询后的数据 - PageInfo pageInfo = new PageInfo<>(list); - objectMap.put("page", queryInfo); - if (list == null) { - queryInfo.setRows(new ArrayList()); - queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); - return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); - } - queryInfo.setRows(list); - queryInfo.setTotal(pageInfo.getTotal()); - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } /** * create by: cjl diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java index 917dc453..42f58c39 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java @@ -11,7 +11,7 @@ import java.util.Map; public interface DepotMapperEx { - List selectByConditionDepot( + List selectByConditionDepot( @Param("name") String name, @Param("type") Integer type, @Param("remark") String remark, @@ -23,7 +23,5 @@ public interface DepotMapperEx { @Param("type") Integer type, @Param("remark") String remark); - List getDepotList(Map params); - int batchDeleteDepotByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java index 484cfabe..80bbef9f 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java @@ -64,6 +64,8 @@ public interface MaterialMapperEx { * */ List getMaterialEnableSerialNumberList(Map parameterMap); + Long getMaterialEnableSerialNumberCount(Map parameterMap); + int batchDeleteMaterialByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); List getMaterialListByCategoryIds(@Param("categoryIds") String[] categoryIds); diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java index 94db77be..eff461d8 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java @@ -13,7 +13,7 @@ import java.util.Map; public interface UserMapperEx { - List selectByConditionUser( + List selectByConditionUser( @Param("userName") String userName, @Param("loginName") String loginName, @Param("offset") Integer offset, @@ -23,8 +23,6 @@ public interface UserMapperEx { @Param("userName") String userName, @Param("loginName") String loginName); - List getUserList(Map parameterMap); - List getUserListByUserNameOrLoginName(@Param("userName") String userName, @Param("loginName") String loginName); diff --git a/src/main/java/com/jsh/erp/service/depot/DepotService.java b/src/main/java/com/jsh/erp/service/depot/DepotService.java index 39a1e8d7..f7ab0c01 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -77,8 +77,8 @@ public class DepotService { return list; } - public List select(String name, Integer type, String remark, int offset, int rows)throws Exception { - List list=null; + public List select(String name, Integer type, String remark, int offset, int rows)throws Exception { + List list=null; try{ list=depotMapperEx.selectByConditionDepot(name, type, remark, offset, rows); }catch(Exception e){ @@ -191,15 +191,6 @@ public class DepotService { return list; } - public List getDepotList(Map parameterMap)throws Exception { - List list=null; - try{ - list= depotMapperEx.getDepotList(parameterMap); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchDeleteDepotByIds(String ids)throws Exception { logService.insertLog("仓库", diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java index 1d6849e5..71eff052 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -596,6 +596,17 @@ public class MaterialService { } return list; } + + public Long getMaterialEnableSerialNumberCount(Map parameterMap)throws Exception { + Long count =null; + try{ + count= materialMapperEx.getMaterialEnableSerialNumberCount(parameterMap); + }catch(Exception e){ + JshException.readFail(logger, e); + } + return count; + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchDeleteMaterialByIds(String ids) throws Exception{ logService.insertLog("商品", diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index c287e54d..2cc8d1b3 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -77,8 +77,8 @@ public class UserService { return list; } - public List select(String userName, String loginName, int offset, int rows)throws Exception { - List list=null; + public List select(String userName, String loginName, int offset, int rows)throws Exception { + List list=null; try{ list=userMapperEx.selectByConditionUser(userName, loginName, offset, rows); }catch(Exception e){ @@ -299,16 +299,6 @@ public class UserService { return (User)request.getSession().getAttribute("user"); } - public List getUserList(Map parameterMap) throws Exception{ - List list=null; - try{ - list= userMapperEx.getUserList(parameterMap); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list; - } - /** * 根据用户名查询id * @param loginName diff --git a/src/main/resources/mapper_xml/DepotMapperEx.xml b/src/main/resources/mapper_xml/DepotMapperEx.xml index 5ce8de63..e928ab4b 100644 --- a/src/main/resources/mapper_xml/DepotMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotMapperEx.xml @@ -5,60 +5,44 @@ - + select dep.*,usr.username as principalName + FROM jsh_depot dep + left join jsh_user usr on usr.id=dep.principal and ifnull(usr.status,'0') not in('1','2') where 1=1 - and name like '%${name}%' + and dep.name like '%${name}%' - and type=${type} + and dep.type=${type} - and remark like '%${remark}%' + and dep.remark like '%${remark}%' - and ifnull(delete_Flag,'0') !='1' - order by sort asc + and ifnull(dep.delete_Flag,'0') !='1' + order by dep.sort asc limit #{offset},#{rows} - + update jsh_depot set delete_Flag='1' diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml index a5722dee..9f0e667d 100644 --- a/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -161,6 +161,7 @@ and ifnull(m.delete_Flag,'0') !='1' + + + + update jsh_material set delete_Flag='1' diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml index 9ce92383..650ae258 100644 --- a/src/main/resources/mapper_xml/UserMapperEx.xml +++ b/src/main/resources/mapper_xml/UserMapperEx.xml @@ -7,52 +7,39 @@ - - - select user.id, user.username, user.login_name, user.position, user.email, user.phonenum, - user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq, + user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq, rel.id as orgaUserRelId FROM jsh_user user left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1' left join jsh_organization org on rel.orga_id=org.id and ifnull(org.org_stcd,'0') !='5' where 1=1 and ifnull(user.status,'0') not in('1','2') - - - and user.username like #{userName} + + and user.username like '%${userName}%' - - - and user.login_name like #{loginName} + + and user.login_name like '%${loginName}%' order by user.id desc + + limit #{offset},#{rows} + + +