purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除分页插件

Browse Source
This commit is contained in:
季圣华
2020-04-19 15:26:14 +08:00
parent 60234752f2
commit a4895d955a
15 changed files with 84 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/jsh/erp/service/depot/DepotService.java
View File

@@ -77,8 +77,8 @@ public class DepotService {
return list;
}
public List<Depot> select(String name, Integer type, String remark, int offset, int rows)throws Exception {
List<Depot> list=null;
public List<DepotEx> select(String name, Integer type, String remark, int offset, int rows)throws Exception {
List<DepotEx> 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<DepotEx> getDepotList(Map<String, Object> parameterMap)throws Exception {
List<DepotEx> 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("仓库",

11
src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -596,6 +596,17 @@ public class MaterialService {
}
return list;
}
public Long getMaterialEnableSerialNumberCount(Map<String, Object> 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("商品",

14
src/main/java/com/jsh/erp/service/user/UserService.java
View File

@@ -77,8 +77,8 @@ public class UserService {
return list;
}
public List<User> select(String userName, String loginName, int offset, int rows)throws Exception {
List<User> list=null;
public List<UserEx> select(String userName, String loginName, int offset, int rows)throws Exception {
List<UserEx> 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<UserEx> getUserList(Map<String, Object> parameterMap) throws Exception{
List<UserEx> list=null;
try{
list= userMapperEx.getUserList(parameterMap);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
/**
* 根据用户名查询id
* @param loginName