diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index 4e245de0..413aae15 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -1065,7 +1065,7 @@ iconCls:'icon-remove', handler:function() { - removeit(); //删除 + batchDel(); //删除 } }, { @@ -2839,6 +2839,31 @@ } } //删除 + function batchDel(){ + /** + * 重写一下删除的逻辑 + * 获取所有选中行,直接从列表中移除 + * 点击保存时，将需要后台删除的数据提交到服务器 + * **/ + var materialData=$('#materialData'); + var row = materialData.datagrid('getChecked'); + if(row.length == 0) + { + $.messager.alert('删除提示','没有记录被选中！','info'); + return; + } + if(row.length > 0) + { + $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单据信息吗？',function(r) + { + if (r) { + for(var i = 0 ;i < row.length;i++) { + materialData.datagrid('deleteRow',materialData.datagrid("getRowIndex",row[i])); + } + } + }); + } + } function removeit(){ if (editIndex == undefined) { return } $('#materialData').datagrid('cancelEdit', editIndex) diff --git a/erp_web/login.html b/erp_web/login.html index 58f66e6c..2000892e 100644 --- a/erp_web/login.html +++ b/erp_web/login.html @@ -3,6 +3,7 @@ ERP系统 + @@ -122,6 +123,7 @@ } //跳转到用户管理界面 else if (loginInfoTip.indexOf("user can login") != -1 || loginInfoTip == "user already login") { + console.log("user can login"); $.ajax({ type: "get", url: "/user/getUserSession", @@ -129,8 +131,10 @@ success: function (res) { if(res && res.code === 200) { if(res.data.user) { + console.log("user"); var user = res.data.user; sessionStorage.setItem("userId", user.id); + console.log("http://" + location.host + "/index.html"); top.location.href = "http://" + location.host + "/index.html"; } } diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html index 30695079..f7027f24 100644 --- a/erp_web/pages/manage/depot.html +++ b/erp_web/pages/manage/depot.html @@ -76,6 +76,14 @@ data-options="min:0,precision:2" style="width: 215px;height: 20px"/> 元 + + 负责人 + + + + + 排序 @@ -145,7 +153,7 @@ formatter: function (value, rec) { var str = ''; var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb' - + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage; + + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+rec.principalName+rec.principal; str += '   '; str += ''; return str; @@ -155,6 +163,7 @@ {title: '仓库地址', field: 'address', width: 200}, {title: '仓储费', field: 'warehousing', width: 60}, {title: '搬运费', field: 'truckage', width: 60}, + {title: '负责人', field: 'principalName', width: 60}, {title: '排序', field: 'sort', width: 60}, {title: '描述', field: 'remark', width: 120} ]], @@ -419,7 +428,7 @@ var remark = $.trim($("#searchRemark").val()); $.ajax({ type: "get", - url: "/depot/list", + url: "/depot/getDepotList", dataType: "json", data: ({ search: JSON.stringify({ diff --git a/pom.xml b/pom.xml index ba21d381..92305fca 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,11 @@ 1.7.25 compile + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.10 + diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index 86562a2a..97e28403 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -1230,13 +1230,26 @@ delete from jsh_functions where id in (213,214,215,216); -- ---------------------------- -- 新增采购订单、销售订单的功能数据 +-- 主键自增长，直接指定主键插入数据的方式可能会和本地数据冲突 -- ---------------------------- -insert into `jsh_functions` values ('242', '050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', ''); -insert into `jsh_functions` values ('243', '060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', ''); +insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', ''); +insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', ''); -- ---------------------------- -- 改管理员的功能权限 -- ---------------------------- update jsh_userbusiness SET Type = 'RoleFunctions', KeyId = '4', Value = '[13][12][16][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][242][33][199][243][41][200][201][202][40][232][233][197][203][204][205][206][212]' -where Id = 5; \ No newline at end of file +where Id = 5; + +-- ---------------------------- +-- 时间：2019年2月25日 +-- version：1.0.4 +-- 此次更新仓库添加负责人信息，负责人信息从用户表获取 +-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新 +-- ---------------------------- +-- ---------------------------- +-- 仓库表添加字段principal，负责人 +-- ---------------------------- +alter table jsh_depot add principal bigint(20) DEFAULT null COMMENT '负责人'; + diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx index baccc110..2a7b3f93 100644 Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java index 8e60d85f..26b3f775 100644 --- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java +++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java @@ -16,11 +16,15 @@ public class BusinessConstants { /** * 默认的分页起始页页码 */ - public static final String DEFAULT_PAGINATION_PAGE_NUMBER = "1"; + public static final Integer DEFAULT_PAGINATION_PAGE_NUMBER = 1; /** - * 默认的分页页数 + * 无数据时列表返回的默认数据条数 */ - public static final String DEFAULT_PAGINATION_PAGE_SIZE = "10"; + public static final Long DEFAULT_LIST_NULL_NUMBER = 0L; + /** + * 默认的分页条数 + */ + public static final Integer DEFAULT_PAGINATION_PAGE_SIZE = 10; /** * 单据主表出入库类型 type 入库 出库 * depothead diff --git a/src/main/java/com/jsh/erp/controller/DepotController.java b/src/main/java/com/jsh/erp/controller/DepotController.java index 028e92ed..1a809e18 100644 --- a/src/main/java/com/jsh/erp/controller/DepotController.java +++ b/src/main/java/com/jsh/erp/controller/DepotController.java @@ -1,11 +1,17 @@ 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.datasource.entities.Depot; +import com.jsh.erp.datasource.entities.DepotEx; import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.userBusiness.UserBusinessService; -import com.jsh.erp.utils.BaseResponseInfo; +import com.jsh.erp.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.dao.DataAccessException; @@ -14,7 +20,9 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import java.util.List; +import java.util.*; + +import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; /** * @author ji sheng hua 752*718*920 @@ -121,4 +129,49 @@ 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) { + 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,false); + 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); + } + } diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index 709db49e..d31b130d 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -2,6 +2,7 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.*; import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.material.MaterialService; @@ -113,7 +114,7 @@ public class DepotItemController { objectMap.put("page", queryInfo); if (list == null) { queryInfo.setRows(new ArrayList()); - queryInfo.setTotal(0); + queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); } queryInfo.setRows(dataArray); @@ -169,7 +170,7 @@ public class DepotItemController { objectMap.put("page", dataArray); if (list == null) { queryInfo.setRows(new ArrayList()); - queryInfo.setTotal(0); + queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); } queryInfo.setRows(list); @@ -223,7 +224,7 @@ public class DepotItemController { objectMap.put("page", dataArray); if (list == null) { queryInfo.setRows(new ArrayList()); - queryInfo.setTotal(0); + queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); } queryInfo.setRows(list); diff --git a/src/main/java/com/jsh/erp/controller/ResourceController.java b/src/main/java/com/jsh/erp/controller/ResourceController.java index a1394ae6..fca3ab3e 100644 --- a/src/main/java/com/jsh/erp/controller/ResourceController.java +++ b/src/main/java/com/jsh/erp/controller/ResourceController.java @@ -1,6 +1,7 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.service.CommonQueryManager; import com.jsh.erp.utils.*; @@ -49,7 +50,7 @@ public class ResourceController { objectMap.put("page", queryInfo); if (list == null) { queryInfo.setRows(new ArrayList()); - queryInfo.setTotal(0); + queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); } queryInfo.setRows(list); diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java index 46260d9c..117a7765 100644 --- a/src/main/java/com/jsh/erp/controller/UserController.java +++ b/src/main/java/com/jsh/erp/controller/UserController.java @@ -36,6 +36,7 @@ public class UserController { HttpServletRequest request) { logger.info("============用户登录 login 方法调用开始=============="); String msgTip = ""; + User user=null; BaseResponseInfo res = new BaseResponseInfo(); try { String username = loginame.trim(); @@ -81,7 +82,7 @@ public class UserController { default: try { //验证通过 ，可以登录，放入session，记录登录日志 - User user = userService.getUserByUserName(username); + user = userService.getUserByUserName(username); // logService.create(new Logdetails(user, "登录系统", model.getClientIp(), // new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统")); msgTip = "user can login"; @@ -93,6 +94,13 @@ public class UserController { } Map data = new HashMap(); data.put("msgTip", msgTip); + /** + * 在IE模式下，无法获取到user数据， + * 在此处明确添加上user信息 + * */ + if(user!=null){ + data.put("user",user); + } res.code = 200; res.data = data; logger.info("===============用户登录 login 方法调用结束==============="); diff --git a/src/main/java/com/jsh/erp/datasource/entities/Depot.java b/src/main/java/com/jsh/erp/datasource/entities/Depot.java index 5b249299..8c355638 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Depot.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Depot.java @@ -67,6 +67,14 @@ public class Depot { */ private String remark; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_depot.principal + * + * @mbggenerated + */ + private Long principal; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_depot.id @@ -258,4 +266,28 @@ public class Depot { public void setRemark(String remark) { this.remark = remark == null ? null : remark.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_depot.principal + * + * @return the value of jsh_depot.principal + * + * @mbggenerated + */ + public Long getPrincipal() { + return principal; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_depot.principal + * + * @param principal the value for jsh_depot.principal + * + * @mbggenerated + */ + public void setPrincipal(Long principal) { + this.principal = principal; + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java b/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java new file mode 100644 index 00000000..cd3b842a --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java @@ -0,0 +1,20 @@ +package com.jsh.erp.datasource.entities; + +/** + * Description + * + * @Author: cjl + * @Date: 2019/2/25 11:40 + */ +public class DepotEx extends Depot{ + //负责人名字 + private String principalName; + + public String getPrincipalName() { + return principalName; + } + + public void setPrincipalName(String principalName) { + this.principalName = principalName; + } +} diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java index 4e2501c7..ef4f4b10 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java @@ -714,6 +714,66 @@ public class DepotExample { addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } + + public Criteria andPrincipalIsNull() { + addCriterion("principal is null"); + return (Criteria) this; + } + + public Criteria andPrincipalIsNotNull() { + addCriterion("principal is not null"); + return (Criteria) this; + } + + public Criteria andPrincipalEqualTo(Long value) { + addCriterion("principal =", value, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalNotEqualTo(Long value) { + addCriterion("principal <>", value, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalGreaterThan(Long value) { + addCriterion("principal >", value, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalGreaterThanOrEqualTo(Long value) { + addCriterion("principal >=", value, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalLessThan(Long value) { + addCriterion("principal <", value, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalLessThanOrEqualTo(Long value) { + addCriterion("principal <=", value, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalIn(List values) { + addCriterion("principal in", values, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalNotIn(List values) { + addCriterion("principal not in", values, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalBetween(Long value1, Long value2) { + addCriterion("principal between", value1, value2, "principal"); + return (Criteria) this; + } + + public Criteria andPrincipalNotBetween(Long value1, Long value2) { + addCriterion("principal not between", value1, value2, "principal"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java index c7cfe816..993a55e3 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java @@ -18,7 +18,7 @@ public interface AccountHeadMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByAccountHead( + Long countsByAccountHead( @Param("type") String type, @Param("billNo") String billNo, @Param("beginTime") String beginTime, diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java index f3794b0f..8f290c08 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java @@ -16,7 +16,7 @@ public interface AccountItemMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByAccountItem( + Long countsByAccountItem( @Param("name") String name, @Param("type") Integer type, @Param("remark") String remark); diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java index 777d6f12..630de121 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java @@ -17,7 +17,7 @@ public interface AccountMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByAccount( + Long countsByAccount( @Param("name") String name, @Param("serialNo") String serialNo, @Param("remark") String remark); diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java index 6492449c..3bffd10e 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java @@ -14,7 +14,7 @@ public interface AppMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByApp( + Long countsByApp( @Param("name") String name, @Param("type") String type); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 28c56e78..ef7cd3f9 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -27,7 +27,7 @@ public interface DepotHeadMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByDepotHead( + Long countsByDepotHead( @Param("type") String type, @Param("subType") String subType, @Param("number") String number, diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 4c71049d..50ff8cc8 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -20,7 +20,7 @@ public interface DepotItemMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByDepotItem( + Long countsByDepotItem( @Param("name") String name, @Param("type") Integer type, @Param("remark") String remark); @@ -34,7 +34,7 @@ public interface DepotItemMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int findDetailByTypeAndMaterialIdCounts( + Long findDetailByTypeAndMaterialIdCounts( @Param("mId") Long mId); List findStockNumByMaterialIdList( @@ -43,7 +43,7 @@ public interface DepotItemMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int findStockNumByMaterialIdCounts( + Long findStockNumByMaterialIdCounts( @Param("mId") Long mId, @Param("monthTime") String monthTime); 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 618c10fc..75d84934 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java @@ -1,10 +1,12 @@ package com.jsh.erp.datasource.mappers; import com.jsh.erp.datasource.entities.Depot; +import com.jsh.erp.datasource.entities.DepotEx; import com.jsh.erp.datasource.entities.DepotExample; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface DepotMapperEx { @@ -15,8 +17,11 @@ public interface DepotMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByDepot( + Long countsByDepot( @Param("name") String name, @Param("type") Integer type, @Param("remark") String remark); + + List getDepotList(Map params); + Long getDepotListCount(Map params); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java index 12279d07..d1fb761a 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java @@ -14,7 +14,7 @@ public interface FunctionsMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByFunctions( + Long countsByFunctions( @Param("name") String name, @Param("type") String type); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java index 110b1cd9..a8d92819 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java @@ -15,7 +15,7 @@ public interface InOutItemMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByInOutItem( + Long countsByInOutItem( @Param("name") String name, @Param("type") String type, @Param("remark") String remark); diff --git a/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java index b2046462..9047323e 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java @@ -20,7 +20,7 @@ public interface LogMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByLog( + Long countsByLog( @Param("operation") String operation, @Param("usernameID") Integer usernameID, @Param("clientIp") String clientIp, diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java index d82ff230..dbe7f6d7 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java @@ -20,7 +20,7 @@ public interface MaterialCategoryMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByMaterialCategory( + Long countsByMaterialCategory( @Param("name") String name, @Param("parentId") Integer parentId); 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 eae6bf8d..c5649193 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java @@ -23,7 +23,7 @@ public interface MaterialMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByMaterial( + Long countsByMaterial( @Param("name") String name, @Param("model") String model, @Param("categoryId") Long categoryId, diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java index 46480159..080b79e7 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java @@ -13,5 +13,5 @@ public interface MaterialPropertyMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByMaterialProperty(@Param("name") String name); + Long countsByMaterialProperty(@Param("name") String name); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java index d13dd65b..e4cb00a8 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java @@ -14,7 +14,7 @@ public interface PersonMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByPerson( + Long countsByPerson( @Param("name") String name, @Param("type") String type); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java index 91b3d43b..a3737326 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java @@ -13,6 +13,6 @@ public interface RoleMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByRole( + Long countsByRole( @Param("name") String name); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java index d45532a4..7bd5906d 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java @@ -20,7 +20,7 @@ public interface SerialNumberMapperEx { /** * 根据条件查询序列号数量 * */ - int countSerialNumber(@Param("serialNumber")String serialNumber,@Param("materialName")String materialName); + Long countSerialNumber(@Param("serialNumber")String serialNumber,@Param("materialName")String materialName); /** * 通过id查询序列号复合信息 * */ diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java index 27155142..1bee2015 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java @@ -17,7 +17,7 @@ public interface SupplierMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsBySupplier( + Long countsBySupplier( @Param("supplier") String supplier, @Param("type") String type, @Param("phonenum") String phonenum, diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java index 5a897055..041b697f 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java @@ -12,5 +12,5 @@ public interface SystemConfigMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsBySystemConfig(); + Long countsBySystemConfig(); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java index 21fb0303..045a7025 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java @@ -13,6 +13,6 @@ public interface UnitMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByUnit( + Long countsByUnit( @Param("name") String name); } \ No newline at end of file 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 cc99a9ab..167c098e 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java @@ -14,7 +14,7 @@ public interface UserMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int countsByUser( + Long countsByUser( @Param("userName") String userName, @Param("loginName") String loginName); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/CommonQueryManager.java b/src/main/java/com/jsh/erp/service/CommonQueryManager.java index a5c0b177..76cd0b48 100644 --- a/src/main/java/com/jsh/erp/service/CommonQueryManager.java +++ b/src/main/java/com/jsh/erp/service/CommonQueryManager.java @@ -1,5 +1,6 @@ package com.jsh.erp.service; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Log; import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.mappers.LogMapper; @@ -60,11 +61,11 @@ public class CommonQueryManager { * @param parameterMap * @return */ - public int counts(String apiName, Map parameterMap) { + public Long counts(String apiName, Map parameterMap) { if (StringUtil.isNotEmpty(apiName)) { return container.getCommonQuery(apiName).counts(parameterMap); } - return 0; + return BusinessConstants.DEFAULT_LIST_NULL_NUMBER; } /** diff --git a/src/main/java/com/jsh/erp/service/ICommonQuery.java b/src/main/java/com/jsh/erp/service/ICommonQuery.java index 62f635c0..dc078636 100644 --- a/src/main/java/com/jsh/erp/service/ICommonQuery.java +++ b/src/main/java/com/jsh/erp/service/ICommonQuery.java @@ -34,7 +34,7 @@ public interface ICommonQuery { * @param parameterMap 查询参数 * @return 查询结果 */ - int counts(Map parameterMap); + Long counts(Map parameterMap); /** * 新增数据 diff --git a/src/main/java/com/jsh/erp/service/InterfaceContainer.java b/src/main/java/com/jsh/erp/service/InterfaceContainer.java index 5102bf38..9b2116ed 100644 --- a/src/main/java/com/jsh/erp/service/InterfaceContainer.java +++ b/src/main/java/com/jsh/erp/service/InterfaceContainer.java @@ -34,8 +34,9 @@ public class InterfaceContainer { } public int getResourceType(String apiName) { - if (!nameTypeMap.containsKey(apiName)) + if (!nameTypeMap.containsKey(apiName)) { throw new RuntimeException("资源:" + apiName + "的组件不存在"); + } return nameTypeMap.get(apiName); } diff --git a/src/main/java/com/jsh/erp/service/account/AccountComponent.java b/src/main/java/com/jsh/erp/service/account/AccountComponent.java index 63704589..ffd0e032 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountComponent.java +++ b/src/main/java/com/jsh/erp/service/account/AccountComponent.java @@ -40,7 +40,7 @@ public class AccountComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String serialNo = StringUtil.getInfo(search, "serialNo"); diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index 4cab9d4e..57a59048 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -70,7 +70,7 @@ public class AccountService { return resList; } - public int countAccount(String name, String serialNo, String remark) { + public Long countAccount(String name, String serialNo, String remark) { return accountMapperEx.countsByAccount(name, serialNo, remark); } diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java index 5d03d19d..d07e3e27 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java @@ -39,7 +39,7 @@ public class AccountHeadComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String type = StringUtil.getInfo(search, "type"); String billNo = StringUtil.getInfo(search, "billNo"); diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java index 41300b60..4775564c 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java +++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java @@ -55,7 +55,7 @@ public class AccountHeadService { return resList; } - public int countAccountHead(String type, String billNo, String beginTime, String endTime) { + public Long countAccountHead(String type, String billNo, String beginTime, String endTime) { return accountHeadMapperEx.countsByAccountHead(type, billNo, beginTime, endTime); } diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java index c6f5345a..2258be84 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java +++ b/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java @@ -38,7 +38,7 @@ public class AccountItemComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java index d0e8912e..cf6a3bf6 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java +++ b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java @@ -45,7 +45,7 @@ public class AccountItemService { return accountItemMapperEx.selectByConditionAccountItem(name, type, remark, offset, rows); } - public int countAccountItem(String name, Integer type, String remark) { + public Long countAccountItem(String name, Integer type, String remark) { return accountItemMapperEx.countsByAccountItem(name, type, remark); } diff --git a/src/main/java/com/jsh/erp/service/app/AppComponent.java b/src/main/java/com/jsh/erp/service/app/AppComponent.java index f264b565..d7d5f7f6 100644 --- a/src/main/java/com/jsh/erp/service/app/AppComponent.java +++ b/src/main/java/com/jsh/erp/service/app/AppComponent.java @@ -37,7 +37,7 @@ public class AppComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String type = StringUtil.getInfo(search, "type"); diff --git a/src/main/java/com/jsh/erp/service/app/AppService.java b/src/main/java/com/jsh/erp/service/app/AppService.java index 7c000f3b..eee6e857 100644 --- a/src/main/java/com/jsh/erp/service/app/AppService.java +++ b/src/main/java/com/jsh/erp/service/app/AppService.java @@ -60,7 +60,7 @@ public class AppService { return appMapperEx.selectByConditionApp(name, type, offset, rows); } - public int countApp(String name, String type) { + public Long countApp(String name, String type) { return appMapperEx.countsByApp(name, type); } diff --git a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java index 56a0516c..f267fe68 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java @@ -39,7 +39,7 @@ public class DepotComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); 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 d7e6611c..e6371684 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -2,6 +2,7 @@ package com.jsh.erp.service.depot; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.Depot; +import com.jsh.erp.datasource.entities.DepotEx; import com.jsh.erp.datasource.entities.DepotExample; import com.jsh.erp.datasource.mappers.DepotMapper; import com.jsh.erp.datasource.mappers.DepotMapperEx; @@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; @Service public class DepotService { @@ -44,7 +46,7 @@ public class DepotService { return depotMapperEx.selectByConditionDepot(name, type, remark, offset, rows); } - public int countDepot(String name, Integer type, String remark) { + public Long countDepot(String name, Integer type, String remark) { return depotMapperEx.countsByDepot(name, type, remark); } @@ -97,4 +99,8 @@ public class DepotService { return list; } + public List getDepotList(Map parameterMap) { + return depotMapperEx.getDepotList(parameterMap); + } + } diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java index eec25de3..5f91eb1c 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java @@ -41,7 +41,7 @@ public class DepotHeadComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String type = StringUtil.getInfo(search, "type"); String subType = StringUtil.getInfo(search, "subType"); diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index c7bacd9c..7fef6fcf 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -95,7 +95,7 @@ public class DepotHeadService { - public int countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) { + public Long countDepotHead(String type, String subType, String number, String beginTime, String endTime, String dhIds) { return depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds); } diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java index 78309adc..15748e82 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java @@ -38,7 +38,7 @@ public class DepotItemComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 93b0f1fa..66d7341c 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -68,7 +68,7 @@ public class DepotItemService { return depotItemMapperEx.selectByConditionDepotItem(name, type, remark, offset, rows); } - public int countDepotItem(String name, Integer type, String remark) { + public Long countDepotItem(String name, Integer type, String remark) { return depotItemMapperEx.countsByDepotItem(name, type, remark); } @@ -118,7 +118,7 @@ public class DepotItemService { return depotItemMapperEx.findDetailByTypeAndMaterialIdList(mId, QueryUtils.offset(map), QueryUtils.rows(map)); } - public int findDetailByTypeAndMaterialIdCounts(Map map) { + public Long findDetailByTypeAndMaterialIdCounts(Map map) { String mIdStr = map.get("mId"); Long mId = null; if(!StringUtil.isEmpty(mIdStr)) { @@ -137,7 +137,7 @@ public class DepotItemService { return depotItemMapperEx.findStockNumByMaterialIdList(mId, monthTime, QueryUtils.offset(map), QueryUtils.rows(map)); } - public int findStockNumByMaterialIdCounts(Map map) { + public Long findStockNumByMaterialIdCounts(Map map) { String mIdStr = map.get("mId"); Long mId = null; if(!StringUtil.isEmpty(mIdStr)) { diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java index 3e5d0504..7ec2c311 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java +++ b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java @@ -39,7 +39,7 @@ public class FunctionsComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String type = StringUtil.getInfo(search, "type"); diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsService.java b/src/main/java/com/jsh/erp/service/functions/FunctionsService.java index b92c45af..34ae5e74 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsService.java +++ b/src/main/java/com/jsh/erp/service/functions/FunctionsService.java @@ -38,7 +38,7 @@ public class FunctionsService { return functionsMapperEx.selectByConditionFunctions(name, type, offset, rows); } - public int countFunctions(String name, String type) { + public Long countFunctions(String name, String type) { return functionsMapperEx.countsByFunctions(name, type); } diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java index 90705a98..f5f41b97 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java +++ b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java @@ -38,7 +38,7 @@ public class InOutItemComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String type = StringUtil.getInfo(search, "type"); diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java index c02c51f5..236e74af 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java +++ b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java @@ -38,7 +38,7 @@ public class InOutItemService { return inOutItemMapperEx.selectByConditionInOutItem(name, type, remark, offset, rows); } - public int countInOutItem(String name, String type, String remark) { + public Long countInOutItem(String name, String type, String remark) { return inOutItemMapperEx.countsByInOutItem(name, type, remark); } diff --git a/src/main/java/com/jsh/erp/service/log/LogComponent.java b/src/main/java/com/jsh/erp/service/log/LogComponent.java index aaf3680c..2a04bd71 100644 --- a/src/main/java/com/jsh/erp/service/log/LogComponent.java +++ b/src/main/java/com/jsh/erp/service/log/LogComponent.java @@ -43,7 +43,7 @@ public class LogComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String operation = StringUtil.getInfo(search, "operation"); Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID")); diff --git a/src/main/java/com/jsh/erp/service/log/LogService.java b/src/main/java/com/jsh/erp/service/log/LogService.java index 9b306630..a8fcb349 100644 --- a/src/main/java/com/jsh/erp/service/log/LogService.java +++ b/src/main/java/com/jsh/erp/service/log/LogService.java @@ -44,7 +44,7 @@ public class LogService { contentdetails, offset, rows); } - public int countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, + public Long countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, String contentdetails) { return logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails); } diff --git a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java index 6e5a3b6e..9e0021c5 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java @@ -42,7 +42,7 @@ public class MaterialComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String model = StringUtil.getInfo(search, "model"); 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 ab9e44a3..c0c65c52 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -73,7 +73,7 @@ public class MaterialService { return resList; } - public int countMaterial(String name, String model,Long categoryId, String categoryIds,String mpList) { + public Long countMaterial(String name, String model,Long categoryId, String categoryIds,String mpList) { return materialMapperEx.countsByMaterial(name, model,categoryId,categoryIds,mpList); } diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java index 2e3f15b2..18395669 100644 --- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java +++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java @@ -39,7 +39,7 @@ public class MaterialCategoryComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); Integer parentId = StringUtil.parseInteger(StringUtil.getInfo(search, "parentId")); diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java index 55b4f55f..694cc20e 100644 --- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java +++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java @@ -53,7 +53,7 @@ public class MaterialCategoryService { return materialCategoryMapperEx.selectByConditionMaterialCategory(name, parentId, offset, rows); } - public int countMaterialCategory(String name, Integer parentId) { + public Long countMaterialCategory(String name, Integer parentId) { return materialCategoryMapperEx.countsByMaterialCategory(name, parentId); } diff --git a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java index f562a798..8ff03082 100644 --- a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java +++ b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java @@ -36,7 +36,7 @@ public class MaterialPropertyComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); return materialPropertyService.countMaterialProperty(name); diff --git a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java index 5c954d92..bb51a37b 100644 --- a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java +++ b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java @@ -37,7 +37,7 @@ public class MaterialPropertyService { return materialPropertyMapperEx.selectByConditionMaterialProperty(name, offset, rows); } - public int countMaterialProperty(String name) { + public Long countMaterialProperty(String name) { return materialPropertyMapperEx.countsByMaterialProperty(name); } diff --git a/src/main/java/com/jsh/erp/service/person/PersonComponent.java b/src/main/java/com/jsh/erp/service/person/PersonComponent.java index 3b1dd7ef..7e9a6e44 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonComponent.java +++ b/src/main/java/com/jsh/erp/service/person/PersonComponent.java @@ -39,7 +39,7 @@ public class PersonComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); String type = StringUtil.getInfo(search, "type"); diff --git a/src/main/java/com/jsh/erp/service/person/PersonService.java b/src/main/java/com/jsh/erp/service/person/PersonService.java index 735f9fae..60401dbc 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -38,7 +38,7 @@ public class PersonService { return personMapperEx.selectByConditionPerson(name, type, offset, rows); } - public int countPerson(String name, String type) { + public Long countPerson(String name, String type) { return personMapperEx.countsByPerson(name, type); } diff --git a/src/main/java/com/jsh/erp/service/role/RoleComponent.java b/src/main/java/com/jsh/erp/service/role/RoleComponent.java index 0e5e1728..dfbd0bf6 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleComponent.java +++ b/src/main/java/com/jsh/erp/service/role/RoleComponent.java @@ -37,7 +37,7 @@ public class RoleComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); return roleService.countRole(name); diff --git a/src/main/java/com/jsh/erp/service/role/RoleService.java b/src/main/java/com/jsh/erp/service/role/RoleService.java index a5d5b8f4..215950fc 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -40,7 +40,7 @@ public class RoleService { return roleMapperEx.selectByConditionRole(name, offset, rows); } - public int countRole(String name) { + public Long countRole(String name) { return roleMapperEx.countsByRole(name); } diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java index a3176e0e..84c6d1f7 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java @@ -43,7 +43,7 @@ public class SerialNumberComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String serialNumber = StringUtil.getInfo(search, "serialNumber"); String materialName = StringUtil.getInfo(search, "materialName"); diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index d83897fc..418092b6 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -61,7 +61,7 @@ public class SerialNumberService { } - public int countSerialNumber(String serialNumber,String materialName) { + public Long countSerialNumber(String serialNumber,String materialName) { return serialNumberMapperEx.countSerialNumber(serialNumber, materialName); } diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java b/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java index 9b032df8..ec881237 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java @@ -42,7 +42,7 @@ public class SupplierComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String supplier = StringUtil.getInfo(search, "supplier"); String type = StringUtil.getInfo(search, "type"); diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index aa22de56..2eca954b 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -42,7 +42,7 @@ public class SupplierService { return supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, description, offset, rows); } - public int countSupplier(String supplier, String type, String phonenum, String telephone, String description) { + public Long countSupplier(String supplier, String type, String phonenum, String telephone, String description) { return supplierMapperEx.countsBySupplier(supplier, type, phonenum, telephone, description); } diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java index 5f822761..e0becafd 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java @@ -36,7 +36,7 @@ public class SystemConfigComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { return systemConfigService.countSystemConfig(); } diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index 2876c7fa..ae492731 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -37,7 +37,7 @@ public class SystemConfigService { return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows); } - public int countSystemConfig() { + public Long countSystemConfig() { return systemConfigMapperEx.countsBySystemConfig(); } diff --git a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java index b1cfdbd7..9241190e 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java @@ -37,7 +37,7 @@ public class UnitComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String name = StringUtil.getInfo(search, "name"); return unitService.countUnit(name); diff --git a/src/main/java/com/jsh/erp/service/unit/UnitService.java b/src/main/java/com/jsh/erp/service/unit/UnitService.java index 59595f16..0fbc0a02 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitService.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitService.java @@ -38,7 +38,7 @@ public class UnitService { return unitMapperEx.selectByConditionUnit(name, offset, rows); } - public int countUnit(String name) { + public Long countUnit(String name) { return unitMapperEx.countsByUnit(name); } diff --git a/src/main/java/com/jsh/erp/service/user/UserComponent.java b/src/main/java/com/jsh/erp/service/user/UserComponent.java index aecd0300..7a4b3b73 100644 --- a/src/main/java/com/jsh/erp/service/user/UserComponent.java +++ b/src/main/java/com/jsh/erp/service/user/UserComponent.java @@ -37,7 +37,7 @@ public class UserComponent implements ICommonQuery { } @Override - public int counts(Map map) { + public Long counts(Map map) { String search = map.get(Constants.SEARCH); String userName = StringUtil.getInfo(search, "userName"); String loginName = StringUtil.getInfo(search, "loginName"); 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 5951b593..a2a3855b 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -43,7 +43,7 @@ public class UserService { return userMapperEx.selectByConditionUser(userName, loginName, offset, rows); } - public int countUser(String userName, String loginName) { + public Long countUser(String userName, String loginName) { return userMapperEx.countsByUser(userName, loginName); } /** diff --git a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java index dedbccf9..26d962a7 100644 --- a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java +++ b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java @@ -1,5 +1,6 @@ package com.jsh.erp.service.userBusiness; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.service.ICommonQuery; import com.jsh.erp.service.depot.DepotResource; import com.jsh.erp.service.depot.DepotService; @@ -35,8 +36,8 @@ public class UserBusinessComponent implements ICommonQuery { } @Override - public int counts(Map map) { - return 0; + public Long counts(Map map) { + return BusinessConstants.DEFAULT_LIST_NULL_NUMBER; } @Override diff --git a/src/main/java/com/jsh/erp/utils/Constants.java b/src/main/java/com/jsh/erp/utils/Constants.java index f3a40266..28a8455c 100644 --- a/src/main/java/com/jsh/erp/utils/Constants.java +++ b/src/main/java/com/jsh/erp/utils/Constants.java @@ -16,6 +16,7 @@ public class Constants { public final static String SEARCH = "search"; public final static String DEVICE_ID = "deviceId"; public final static String OFFSET = "offset"; + public final static String ROWS = "rows"; public final static String IS_RECURSION = "isRecursion"; public final static String IS_RECURSION_VALUE = "1"; public final static String IS_QUERYBYNODEID = "isquerybyid"; diff --git a/src/main/java/com/jsh/erp/utils/PageQueryInfo.java b/src/main/java/com/jsh/erp/utils/PageQueryInfo.java index 8cb143ac..7747e009 100644 --- a/src/main/java/com/jsh/erp/utils/PageQueryInfo.java +++ b/src/main/java/com/jsh/erp/utils/PageQueryInfo.java @@ -9,14 +9,14 @@ import java.util.List; */ public class PageQueryInfo { - private Integer total; + private Long total; private List rows; - public Integer getTotal() { + public Long getTotal() { return total; } - public void setTotal(Integer total) { + public void setTotal(Long total) { this.total = total; } diff --git a/src/main/java/com/jsh/erp/utils/ParamUtils.java b/src/main/java/com/jsh/erp/utils/ParamUtils.java index 9e38f4cd..33ba21e4 100644 --- a/src/main/java/com/jsh/erp/utils/ParamUtils.java +++ b/src/main/java/com/jsh/erp/utils/ParamUtils.java @@ -12,10 +12,32 @@ public class ParamUtils { public static String getPageOffset(Integer currentPage, Integer pageSize) { if (currentPage != null && pageSize != null) { int offset = (currentPage - 1) * pageSize; - if (offset < 0) { - return 0 + ""; + if (offset <= 0) { + return "0"; } else { - return offset + ""; + return new StringBuffer().append(offset).toString(); + } + } + return null; + } + public static Integer getNumberPageOffset(Integer currentPage, Integer pageSize) { + if (currentPage != null && pageSize != null) { + int offset = (currentPage - 1) * pageSize; + if (offset <= 0) { + return 0; + } else { + return offset; + } + } + return null; + } + public static Integer getNumberPageRows(Integer currentPage, Integer pageSize) { + if (currentPage != null && pageSize != null) { + int rows = (currentPage) * pageSize; + if (rows <= 0) { + return 0; + } else { + return rows; } } return null; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b1d0eac9..03004ad4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,6 +15,14 @@ logging.level.com.jsh.erp.datasource.mappers=DEBUG #日志 logging.config=classpath:logback-spring.xml logging.level.com.didispace=DEBUG +#pagehelper配置 +pagehelper.helperDialect=mysql +pagehelper.offsetAsPageNum=true +pagehelper.rowBoundsWithCount=true +pagehelper.pageSizeZero=true +pagehelper.reasonable=false +pagehelper.params=pageNum=pageHelperStart;pageSize=pageHelperRows; +pagehelper.supportMethodsArguments=false diff --git a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index 94d6882c..6d386574 100644 --- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -34,7 +34,7 @@ - SELECT COUNT(id) FROM jsh_accounthead diff --git a/src/main/resources/mapper_xml/AccountItemMapperEx.xml b/src/main/resources/mapper_xml/AccountItemMapperEx.xml index 04d709ca..857c92d0 100644 --- a/src/main/resources/mapper_xml/AccountItemMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountItemMapperEx.xml @@ -24,7 +24,7 @@ limit #{offset},#{rows} - SELECT COUNT(id) FROM jsh_accountitem diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml index e548785b..32aae43b 100644 --- a/src/main/resources/mapper_xml/AccountMapperEx.xml +++ b/src/main/resources/mapper_xml/AccountMapperEx.xml @@ -33,7 +33,7 @@ - SELECT COUNT(id) FROM jsh_account diff --git a/src/main/resources/mapper_xml/AppMapperEx.xml b/src/main/resources/mapper_xml/AppMapperEx.xml index d8c0f4a1..e05a0c20 100644 --- a/src/main/resources/mapper_xml/AppMapperEx.xml +++ b/src/main/resources/mapper_xml/AppMapperEx.xml @@ -16,7 +16,7 @@ limit #{offset},#{rows} - SELECT COUNT(id) FROM jsh_app diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 9173b9cb..2968af3f 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -73,7 +73,7 @@ limit #{offset},#{rows} - SELECT COUNT(id) FROM jsh_depothead diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 0eba3e05..0cf8f0b2 100644 --- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -59,7 +59,7 @@ limit #{offset},#{rows} - SELECT COUNT(id) FROM jsh_depotitem @@ -93,7 +93,7 @@ limit #{offset},#{rows} - select count(1) from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它' and SubType!='调拨' @@ -110,7 +110,7 @@ limit #{offset},#{rows} - select count(*) from jsh_depotitem where 1=1 and MaterialId=${mId} diff --git a/src/main/resources/mapper_xml/DepotMapper.xml b/src/main/resources/mapper_xml/DepotMapper.xml index 905fd5b8..5f386f3a 100644 --- a/src/main/resources/mapper_xml/DepotMapper.xml +++ b/src/main/resources/mapper_xml/DepotMapper.xml @@ -14,6 +14,7 @@ + - id, name, address, warehousing, truckage, type, sort, remark + id, name, address, warehousing, truckage, type, sort, remark, principal