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

!30 修改新增采购订单、销售订单的功能数据插入方式

Browse Source 
Merge pull request !30 from 乾坤平台/master
This commit is contained in:
乾坤平台
2019-02-28 22:28:07 +08:00
committed by 季圣华
parent 01feda9300 92b3d21d2b
commit a07c71fd4c
104 changed files with 444 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
erp_web/js/pages/materials/in_out.js
View File

@@ -1065,7 +1065,7 @@
iconCls:'icon-remove', iconCls:'icon-remove',
handler:function() 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(){ function removeit(){
if (editIndex == undefined) { return } if (editIndex == undefined) { return }
$('#materialData').datagrid('cancelEdit', editIndex) $('#materialData').datagrid('cancelEdit', editIndex)

4
erp_web/login.html
View File

@@ -3,6 +3,7 @@
<head> <head>
<title>ERP系统</title> <title>ERP系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=8" >
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link type="text/css" rel="stylesheet" href="/css/css.css"/> <link type="text/css" rel="stylesheet" href="/css/css.css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script> <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
@@ -122,6 +123,7 @@
} }
//跳转到用户管理界面 //跳转到用户管理界面
else if (loginInfoTip.indexOf("user can login") != -1 || loginInfoTip == "user already login") { else if (loginInfoTip.indexOf("user can login") != -1 || loginInfoTip == "user already login") {
console.log("user can login");
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/user/getUserSession", url: "/user/getUserSession",
@@ -129,8 +131,10 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
if(res.data.user) { if(res.data.user) {
console.log("user");
var user = res.data.user; var user = res.data.user;
sessionStorage.setItem("userId", user.id); sessionStorage.setItem("userId", user.id);
console.log("http://" + location.host + "/index.html");
top.location.href = "http://" + location.host + "/index.html"; top.location.href = "http://" + location.host + "/index.html";
} }
} }

13
erp_web/pages/manage/depot.html
View File

@@ -76,6 +76,14 @@
data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元 data-options="min:0,precision:2" style="width: 215px;height: 20px"/>&nbsp;元
</td> </td>
</tr> </tr>
<tr>
<td>负责人</td>
<td style="padding:5px">
<input name="principalName" id="principalName"
style="width: 230px;height: 20px" readonly="readonly"/>
<input name="principal" id="principal" type="hidden"/>
</td>
</tr>
<tr> <tr>
<td>排序</td> <td>排序</td>
<td style="padding:5px"> <td style="padding:5px">
@@ -145,7 +153,7 @@
formatter: function (value, rec) { formatter: function (value, rec) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb' 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 += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>'; str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
return str; return str;
@@ -155,6 +163,7 @@
{title: '仓库地址', field: 'address', width: 200}, {title: '仓库地址', field: 'address', width: 200},
{title: '仓储费', field: 'warehousing', width: 60}, {title: '仓储费', field: 'warehousing', width: 60},
{title: '搬运费', field: 'truckage', width: 60}, {title: '搬运费', field: 'truckage', width: 60},
{title: '负责人', field: 'principalName', width: 60},
{title: '排序', field: 'sort', width: 60}, {title: '排序', field: 'sort', width: 60},
{title: '描述', field: 'remark', width: 120} {title: '描述', field: 'remark', width: 120}
]], ]],
@@ -419,7 +428,7 @@
var remark = $.trim($("#searchRemark").val()); var remark = $.trim($("#searchRemark").val());
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/depot/list", url: "/depot/getDepotList",
dataType: "json", dataType: "json",
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({

5
pom.xml
View File

@@ -98,6 +98,11 @@
<version>1.7.25</version> <version>1.7.25</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.10</version>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>

19
sql/jsh_erp.sql
View File

@@ -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`(`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` 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 ('060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', '');
-- ---------------------------- -- ----------------------------
-- 改管理员的功能权限 -- 改管理员的功能权限
-- ---------------------------- -- ----------------------------
update jsh_userbusiness SET Type = 'RoleFunctions', KeyId = '4', 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]' 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; where Id = 5;
-- ----------------------------
-- 时间：2019年2月25日
-- version：1.0.4
-- 此次更新仓库添加负责人信息，负责人信息从用户表获取
-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
-- ----------------------------
-- ----------------------------
-- 仓库表添加字段principal，负责人
-- ----------------------------
alter table jsh_depot add principal bigint(20) DEFAULT null COMMENT '负责人';

BIN
sql/华夏ERP数据库设计汇总.xlsx
View File

Binary file not shown.

10
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View File

@@ -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 入库 出库 * 单据主表出入库类型 type 入库 出库
* depothead * depothead

57
src/main/java/com/jsh/erp/controller/DepotController.java
View File

@@ -1,11 +1,17 @@
package com.jsh.erp.controller; package com.jsh.erp.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; 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.Depot;
import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.depot.DepotService;
import com.jsh.erp.service.userBusiness.UserBusinessService; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
@@ -14,7 +20,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException; 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 * @author ji sheng hua 752*718*920
@@ -121,4 +129,49 @@ public class DepotController {
} }
return arr; 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<String, Object> parameterMap = new HashMap<String, Object>();
//查询参数
JSONObject obj=JSON.parseObject(search);
Set<String> key= obj.keySet();
for(String keyEach: key){
parameterMap.put(keyEach,obj.getString(keyEach));
}
PageQueryInfo queryInfo = new PageQueryInfo();
Map<String, Object> objectMap = new HashMap<String, Object>();
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<DepotEx> list = depotService.getDepotList(parameterMap);
//获取分页查询后的数据
PageInfo<DepotEx> pageInfo = new PageInfo<>(list);
objectMap.put("page", queryInfo);
if (list == null) {
queryInfo.setRows(new ArrayList<Object>());
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);
}
} }

7
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -2,6 +2,7 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.material.MaterialService; import com.jsh.erp.service.material.MaterialService;
@@ -113,7 +114,7 @@ public class DepotItemController {
objectMap.put("page", queryInfo); objectMap.put("page", queryInfo);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(dataArray); queryInfo.setRows(dataArray);
@@ -169,7 +170,7 @@ public class DepotItemController {
objectMap.put("page", dataArray); objectMap.put("page", dataArray);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(list); queryInfo.setRows(list);
@@ -223,7 +224,7 @@ public class DepotItemController {
objectMap.put("page", dataArray); objectMap.put("page", dataArray);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(list); queryInfo.setRows(list);

3
src/main/java/com/jsh/erp/controller/ResourceController.java
View File

@@ -1,6 +1,7 @@
package com.jsh.erp.controller; package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.service.CommonQueryManager; import com.jsh.erp.service.CommonQueryManager;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
@@ -49,7 +50,7 @@ public class ResourceController {
objectMap.put("page", queryInfo); objectMap.put("page", queryInfo);
if (list == null) { if (list == null) {
queryInfo.setRows(new ArrayList<Object>()); queryInfo.setRows(new ArrayList<Object>());
queryInfo.setTotal(0); queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
} }
queryInfo.setRows(list); queryInfo.setRows(list);

10
src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -36,6 +36,7 @@ public class UserController {
HttpServletRequest request) { HttpServletRequest request) {
logger.info("============用户登录 login 方法调用开始=============="); logger.info("============用户登录 login 方法调用开始==============");
String msgTip = ""; String msgTip = "";
User user=null;
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
try { try {
String username = loginame.trim(); String username = loginame.trim();
@@ -81,7 +82,7 @@ public class UserController {
default: default:
try { try {
//验证通过 ，可以登录，放入session，记录登录日志 //验证通过 ，可以登录，放入session，记录登录日志
User user = userService.getUserByUserName(username); user = userService.getUserByUserName(username);
// logService.create(new Logdetails(user, "登录系统", model.getClientIp(), // logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
// new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统")); // new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
msgTip = "user can login"; msgTip = "user can login";
@@ -93,6 +94,13 @@ public class UserController {
} }
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("msgTip", msgTip); data.put("msgTip", msgTip);
/**
* 在IE模式下，无法获取到user数据，
* 在此处明确添加上user信息
* */
if(user!=null){
data.put("user",user);
}
res.code = 200; res.code = 200;
res.data = data; res.data = data;
logger.info("===============用户登录 login 方法调用结束==============="); logger.info("===============用户登录 login 方法调用结束===============");

32
src/main/java/com/jsh/erp/datasource/entities/Depot.java
View File

@@ -67,6 +67,14 @@ public class Depot {
*/ */
private String remark; 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 was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id * This method returns the value of the database column jsh_depot.id
@@ -258,4 +266,28 @@ public class Depot {
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); 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;
}
} }

20
src/main/java/com/jsh/erp/datasource/entities/DepotEx.java Normal file
View File

@@ -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;
}
}

60
src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View File

@@ -714,6 +714,66 @@ public class DepotExample {
addCriterion("remark not between", value1, value2, "remark"); addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this; 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<Long> values) {
addCriterion("principal in", values, "principal");
return (Criteria) this;
}
public Criteria andPrincipalNotIn(List<Long> 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;
}
} }
/** /**

2
src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java
View File

@@ -18,7 +18,7 @@ public interface AccountHeadMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByAccountHead( Long countsByAccountHead(
@Param("type") String type, @Param("type") String type,
@Param("billNo") String billNo, @Param("billNo") String billNo,
@Param("beginTime") String beginTime, @Param("beginTime") String beginTime,

2
src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java
View File

@@ -16,7 +16,7 @@ public interface AccountItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByAccountItem( Long countsByAccountItem(
@Param("name") String name, @Param("name") String name,
@Param("type") Integer type, @Param("type") Integer type,
@Param("remark") String remark); @Param("remark") String remark);

2
src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java
View File

@@ -17,7 +17,7 @@ public interface AccountMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByAccount( Long countsByAccount(
@Param("name") String name, @Param("name") String name,
@Param("serialNo") String serialNo, @Param("serialNo") String serialNo,
@Param("remark") String remark); @Param("remark") String remark);

2
src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java
View File

@@ -14,7 +14,7 @@ public interface AppMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByApp( Long countsByApp(
@Param("name") String name, @Param("name") String name,
@Param("type") String type); @Param("type") String type);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -27,7 +27,7 @@ public interface DepotHeadMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByDepotHead( Long countsByDepotHead(
@Param("type") String type, @Param("type") String type,
@Param("subType") String subType, @Param("subType") String subType,
@Param("number") String number, @Param("number") String number,

6
src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
View File

@@ -20,7 +20,7 @@ public interface DepotItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByDepotItem( Long countsByDepotItem(
@Param("name") String name, @Param("name") String name,
@Param("type") Integer type, @Param("type") Integer type,
@Param("remark") String remark); @Param("remark") String remark);
@@ -34,7 +34,7 @@ public interface DepotItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int findDetailByTypeAndMaterialIdCounts( Long findDetailByTypeAndMaterialIdCounts(
@Param("mId") Long mId); @Param("mId") Long mId);
List<DepotItemVo4Material> findStockNumByMaterialIdList( List<DepotItemVo4Material> findStockNumByMaterialIdList(
@@ -43,7 +43,7 @@ public interface DepotItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int findStockNumByMaterialIdCounts( Long findStockNumByMaterialIdCounts(
@Param("mId") Long mId, @Param("mId") Long mId,
@Param("monthTime") String monthTime); @Param("monthTime") String monthTime);

7
src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java
View File

@@ -1,10 +1,12 @@
package com.jsh.erp.datasource.mappers; package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Depot; 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.entities.DepotExample;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map;
public interface DepotMapperEx { public interface DepotMapperEx {
@@ -15,8 +17,11 @@ public interface DepotMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByDepot( Long countsByDepot(
@Param("name") String name, @Param("name") String name,
@Param("type") Integer type, @Param("type") Integer type,
@Param("remark") String remark); @Param("remark") String remark);
List<DepotEx> getDepotList(Map<String, Object> params);
Long getDepotListCount(Map<String, Object> params);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java
View File

@@ -14,7 +14,7 @@ public interface FunctionsMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByFunctions( Long countsByFunctions(
@Param("name") String name, @Param("name") String name,
@Param("type") String type); @Param("type") String type);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java
View File

@@ -15,7 +15,7 @@ public interface InOutItemMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByInOutItem( Long countsByInOutItem(
@Param("name") String name, @Param("name") String name,
@Param("type") String type, @Param("type") String type,
@Param("remark") String remark); @Param("remark") String remark);

2
src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
View File

@@ -20,7 +20,7 @@ public interface LogMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByLog( Long countsByLog(
@Param("operation") String operation, @Param("operation") String operation,
@Param("usernameID") Integer usernameID, @Param("usernameID") Integer usernameID,
@Param("clientIp") String clientIp, @Param("clientIp") String clientIp,

2
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
View File

@@ -20,7 +20,7 @@ public interface MaterialCategoryMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByMaterialCategory( Long countsByMaterialCategory(
@Param("name") String name, @Param("name") String name,
@Param("parentId") Integer parentId); @Param("parentId") Integer parentId);

2
src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
View File

@@ -23,7 +23,7 @@ public interface MaterialMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByMaterial( Long countsByMaterial(
@Param("name") String name, @Param("name") String name,
@Param("model") String model, @Param("model") String model,
@Param("categoryId") Long categoryId, @Param("categoryId") Long categoryId,

2
src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java
View File

@@ -13,5 +13,5 @@ public interface MaterialPropertyMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByMaterialProperty(@Param("name") String name); Long countsByMaterialProperty(@Param("name") String name);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java
View File

@@ -14,7 +14,7 @@ public interface PersonMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByPerson( Long countsByPerson(
@Param("name") String name, @Param("name") String name,
@Param("type") String type); @Param("type") String type);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java
View File

@@ -13,6 +13,6 @@ public interface RoleMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByRole( Long countsByRole(
@Param("name") String name); @Param("name") String name);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java
View File

@@ -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查询序列号复合信息 * 通过id查询序列号复合信息
* */ * */

2
src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java
View File

@@ -17,7 +17,7 @@ public interface SupplierMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsBySupplier( Long countsBySupplier(
@Param("supplier") String supplier, @Param("supplier") String supplier,
@Param("type") String type, @Param("type") String type,
@Param("phonenum") String phonenum, @Param("phonenum") String phonenum,

2
src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java
View File

@@ -12,5 +12,5 @@ public interface SystemConfigMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsBySystemConfig(); Long countsBySystemConfig();
} }

2
src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java
View File

@@ -13,6 +13,6 @@ public interface UnitMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByUnit( Long countsByUnit(
@Param("name") String name); @Param("name") String name);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
View File

@@ -14,7 +14,7 @@ public interface UserMapperEx {
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
int countsByUser( Long countsByUser(
@Param("userName") String userName, @Param("userName") String userName,
@Param("loginName") String loginName); @Param("loginName") String loginName);
} }

5
src/main/java/com/jsh/erp/service/CommonQueryManager.java
View File

@@ -1,5 +1,6 @@
package com.jsh.erp.service; package com.jsh.erp.service;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.datasource.entities.Log; import com.jsh.erp.datasource.entities.Log;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.LogMapper; import com.jsh.erp.datasource.mappers.LogMapper;
@@ -60,11 +61,11 @@ public class CommonQueryManager {
* @param parameterMap * @param parameterMap
* @return * @return
*/ */
public int counts(String apiName, Map<String, String> parameterMap) { public Long counts(String apiName, Map<String, String> parameterMap) {
if (StringUtil.isNotEmpty(apiName)) { if (StringUtil.isNotEmpty(apiName)) {
return container.getCommonQuery(apiName).counts(parameterMap); return container.getCommonQuery(apiName).counts(parameterMap);
} }
return 0; return BusinessConstants.DEFAULT_LIST_NULL_NUMBER;
} }
/** /**

2
src/main/java/com/jsh/erp/service/ICommonQuery.java
View File

@@ -34,7 +34,7 @@ public interface ICommonQuery {
* @param parameterMap 查询参数 * @param parameterMap 查询参数
* @return 查询结果 * @return 查询结果
*/ */
int counts(Map<String, String> parameterMap); Long counts(Map<String, String> parameterMap);
/** /**
* 新增数据 * 新增数据

3
src/main/java/com/jsh/erp/service/InterfaceContainer.java
View File

@@ -34,8 +34,9 @@ public class InterfaceContainer {
} }
public int getResourceType(String apiName) { public int getResourceType(String apiName) {
if (!nameTypeMap.containsKey(apiName)) if (!nameTypeMap.containsKey(apiName)) {
throw new RuntimeException("资源:" + apiName + "的组件不存在"); throw new RuntimeException("资源:" + apiName + "的组件不存在");
}
return nameTypeMap.get(apiName); return nameTypeMap.get(apiName);
} }

2
src/main/java/com/jsh/erp/service/account/AccountComponent.java
View File

@@ -40,7 +40,7 @@ public class AccountComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String serialNo = StringUtil.getInfo(search, "serialNo"); String serialNo = StringUtil.getInfo(search, "serialNo");

2
src/main/java/com/jsh/erp/service/account/AccountService.java
View File

@@ -70,7 +70,7 @@ public class AccountService {
return resList; 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); return accountMapperEx.countsByAccount(name, serialNo, remark);
} }

2
src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java
View File

@@ -39,7 +39,7 @@ public class AccountHeadComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");
String billNo = StringUtil.getInfo(search, "billNo"); String billNo = StringUtil.getInfo(search, "billNo");

2
src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
View File

@@ -55,7 +55,7 @@ public class AccountHeadService {
return resList; 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); return accountHeadMapperEx.countsByAccountHead(type, billNo, beginTime, endTime);
} }

2
src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java
View File

@@ -38,7 +38,7 @@ public class AccountItemComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));

2
src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java
View File

@@ -45,7 +45,7 @@ public class AccountItemService {
return accountItemMapperEx.selectByConditionAccountItem(name, type, remark, offset, rows); 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); return accountItemMapperEx.countsByAccountItem(name, type, remark);
} }

2
src/main/java/com/jsh/erp/service/app/AppComponent.java
View File

@@ -37,7 +37,7 @@ public class AppComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");

2
src/main/java/com/jsh/erp/service/app/AppService.java
View File

@@ -60,7 +60,7 @@ public class AppService {
return appMapperEx.selectByConditionApp(name, type, offset, rows); 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); return appMapperEx.countsByApp(name, type);
} }

2
src/main/java/com/jsh/erp/service/depot/DepotComponent.java
View File

@@ -39,7 +39,7 @@ public class DepotComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));

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

@@ -2,6 +2,7 @@ package com.jsh.erp.service.depot;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.Depot; 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.entities.DepotExample;
import com.jsh.erp.datasource.mappers.DepotMapper; import com.jsh.erp.datasource.mappers.DepotMapper;
import com.jsh.erp.datasource.mappers.DepotMapperEx; import com.jsh.erp.datasource.mappers.DepotMapperEx;
@@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
public class DepotService { public class DepotService {
@@ -44,7 +46,7 @@ public class DepotService {
return depotMapperEx.selectByConditionDepot(name, type, remark, offset, rows); 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); return depotMapperEx.countsByDepot(name, type, remark);
} }
@@ -97,4 +99,8 @@ public class DepotService {
return list; return list;
} }
public List<DepotEx> getDepotList(Map<String, Object> parameterMap) {
return depotMapperEx.getDepotList(parameterMap);
}
} }

2
src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java
View File

@@ -41,7 +41,7 @@ public class DepotHeadComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");
String subType = StringUtil.getInfo(search, "subType"); String subType = StringUtil.getInfo(search, "subType");

2
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -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); return depotHeadMapperEx.countsByDepotHead(type, subType, number, beginTime, endTime, dhIds);
} }

2
src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java
View File

@@ -38,7 +38,7 @@ public class DepotItemComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));

6
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -68,7 +68,7 @@ public class DepotItemService {
return depotItemMapperEx.selectByConditionDepotItem(name, type, remark, offset, rows); 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); return depotItemMapperEx.countsByDepotItem(name, type, remark);
} }
@@ -118,7 +118,7 @@ public class DepotItemService {
return depotItemMapperEx.findDetailByTypeAndMaterialIdList(mId, QueryUtils.offset(map), QueryUtils.rows(map)); return depotItemMapperEx.findDetailByTypeAndMaterialIdList(mId, QueryUtils.offset(map), QueryUtils.rows(map));
} }
public int findDetailByTypeAndMaterialIdCounts(Map<String, String> map) { public Long findDetailByTypeAndMaterialIdCounts(Map<String, String> map) {
String mIdStr = map.get("mId"); String mIdStr = map.get("mId");
Long mId = null; Long mId = null;
if(!StringUtil.isEmpty(mIdStr)) { if(!StringUtil.isEmpty(mIdStr)) {
@@ -137,7 +137,7 @@ public class DepotItemService {
return depotItemMapperEx.findStockNumByMaterialIdList(mId, monthTime, QueryUtils.offset(map), QueryUtils.rows(map)); return depotItemMapperEx.findStockNumByMaterialIdList(mId, monthTime, QueryUtils.offset(map), QueryUtils.rows(map));
} }
public int findStockNumByMaterialIdCounts(Map<String, String> map) { public Long findStockNumByMaterialIdCounts(Map<String, String> map) {
String mIdStr = map.get("mId"); String mIdStr = map.get("mId");
Long mId = null; Long mId = null;
if(!StringUtil.isEmpty(mIdStr)) { if(!StringUtil.isEmpty(mIdStr)) {

2
src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java
View File

@@ -39,7 +39,7 @@ public class FunctionsComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");

2
src/main/java/com/jsh/erp/service/functions/FunctionsService.java
View File

@@ -38,7 +38,7 @@ public class FunctionsService {
return functionsMapperEx.selectByConditionFunctions(name, type, offset, rows); 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); return functionsMapperEx.countsByFunctions(name, type);
} }

2
src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java
View File

@@ -38,7 +38,7 @@ public class InOutItemComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");

2
src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java
View File

@@ -38,7 +38,7 @@ public class InOutItemService {
return inOutItemMapperEx.selectByConditionInOutItem(name, type, remark, offset, rows); 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); return inOutItemMapperEx.countsByInOutItem(name, type, remark);
} }

2
src/main/java/com/jsh/erp/service/log/LogComponent.java
View File

@@ -43,7 +43,7 @@ public class LogComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String operation = StringUtil.getInfo(search, "operation"); String operation = StringUtil.getInfo(search, "operation");
Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID")); Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID"));

2
src/main/java/com/jsh/erp/service/log/LogService.java
View File

@@ -44,7 +44,7 @@ public class LogService {
contentdetails, offset, rows); 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) { String contentdetails) {
return logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails); return logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails);
} }

2
src/main/java/com/jsh/erp/service/material/MaterialComponent.java
View File

@@ -42,7 +42,7 @@ public class MaterialComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String model = StringUtil.getInfo(search, "model"); String model = StringUtil.getInfo(search, "model");

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

@@ -73,7 +73,7 @@ public class MaterialService {
return resList; 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); return materialMapperEx.countsByMaterial(name, model,categoryId,categoryIds,mpList);
} }

2
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java
View File

@@ -39,7 +39,7 @@ public class MaterialCategoryComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
Integer parentId = StringUtil.parseInteger(StringUtil.getInfo(search, "parentId")); Integer parentId = StringUtil.parseInteger(StringUtil.getInfo(search, "parentId"));

2
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
View File

@@ -53,7 +53,7 @@ public class MaterialCategoryService {
return materialCategoryMapperEx.selectByConditionMaterialCategory(name, parentId, offset, rows); 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); return materialCategoryMapperEx.countsByMaterialCategory(name, parentId);
} }

2
src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java
View File

@@ -36,7 +36,7 @@ public class MaterialPropertyComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
return materialPropertyService.countMaterialProperty(name); return materialPropertyService.countMaterialProperty(name);

2
src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java
View File

@@ -37,7 +37,7 @@ public class MaterialPropertyService {
return materialPropertyMapperEx.selectByConditionMaterialProperty(name, offset, rows); return materialPropertyMapperEx.selectByConditionMaterialProperty(name, offset, rows);
} }
public int countMaterialProperty(String name) { public Long countMaterialProperty(String name) {
return materialPropertyMapperEx.countsByMaterialProperty(name); return materialPropertyMapperEx.countsByMaterialProperty(name);
} }

2
src/main/java/com/jsh/erp/service/person/PersonComponent.java
View File

@@ -39,7 +39,7 @@ public class PersonComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");

2
src/main/java/com/jsh/erp/service/person/PersonService.java
View File

@@ -38,7 +38,7 @@ public class PersonService {
return personMapperEx.selectByConditionPerson(name, type, offset, rows); 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); return personMapperEx.countsByPerson(name, type);
} }

2
src/main/java/com/jsh/erp/service/role/RoleComponent.java
View File

@@ -37,7 +37,7 @@ public class RoleComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
return roleService.countRole(name); return roleService.countRole(name);

2
src/main/java/com/jsh/erp/service/role/RoleService.java
View File

@@ -40,7 +40,7 @@ public class RoleService {
return roleMapperEx.selectByConditionRole(name, offset, rows); return roleMapperEx.selectByConditionRole(name, offset, rows);
} }
public int countRole(String name) { public Long countRole(String name) {
return roleMapperEx.countsByRole(name); return roleMapperEx.countsByRole(name);
} }

2
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java
View File

@@ -43,7 +43,7 @@ public class SerialNumberComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String serialNumber = StringUtil.getInfo(search, "serialNumber"); String serialNumber = StringUtil.getInfo(search, "serialNumber");
String materialName = StringUtil.getInfo(search, "materialName"); String materialName = StringUtil.getInfo(search, "materialName");

2
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View File

@@ -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); return serialNumberMapperEx.countSerialNumber(serialNumber, materialName);
} }

2
src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java
View File

@@ -42,7 +42,7 @@ public class SupplierComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String supplier = StringUtil.getInfo(search, "supplier"); String supplier = StringUtil.getInfo(search, "supplier");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");

2
src/main/java/com/jsh/erp/service/supplier/SupplierService.java
View File

@@ -42,7 +42,7 @@ public class SupplierService {
return supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, description, offset, rows); 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); return supplierMapperEx.countsBySupplier(supplier, type, phonenum, telephone, description);
} }

2
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java
View File

@@ -36,7 +36,7 @@ public class SystemConfigComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
return systemConfigService.countSystemConfig(); return systemConfigService.countSystemConfig();
} }

2
src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
View File

@@ -37,7 +37,7 @@ public class SystemConfigService {
return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows); return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows);
} }
public int countSystemConfig() { public Long countSystemConfig() {
return systemConfigMapperEx.countsBySystemConfig(); return systemConfigMapperEx.countsBySystemConfig();
} }

2
src/main/java/com/jsh/erp/service/unit/UnitComponent.java
View File

@@ -37,7 +37,7 @@ public class UnitComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
return unitService.countUnit(name); return unitService.countUnit(name);

2
src/main/java/com/jsh/erp/service/unit/UnitService.java
View File

@@ -38,7 +38,7 @@ public class UnitService {
return unitMapperEx.selectByConditionUnit(name, offset, rows); return unitMapperEx.selectByConditionUnit(name, offset, rows);
} }
public int countUnit(String name) { public Long countUnit(String name) {
return unitMapperEx.countsByUnit(name); return unitMapperEx.countsByUnit(name);
} }

2
src/main/java/com/jsh/erp/service/user/UserComponent.java
View File

@@ -37,7 +37,7 @@ public class UserComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String userName = StringUtil.getInfo(search, "userName"); String userName = StringUtil.getInfo(search, "userName");
String loginName = StringUtil.getInfo(search, "loginName"); String loginName = StringUtil.getInfo(search, "loginName");

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

@@ -43,7 +43,7 @@ public class UserService {
return userMapperEx.selectByConditionUser(userName, loginName, offset, rows); 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); return userMapperEx.countsByUser(userName, loginName);
} }
/** /**

5
src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java
View File

@@ -1,5 +1,6 @@
package com.jsh.erp.service.userBusiness; package com.jsh.erp.service.userBusiness;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.service.ICommonQuery; import com.jsh.erp.service.ICommonQuery;
import com.jsh.erp.service.depot.DepotResource; import com.jsh.erp.service.depot.DepotResource;
import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.depot.DepotService;
@@ -35,8 +36,8 @@ public class UserBusinessComponent implements ICommonQuery {
} }
@Override @Override
public int counts(Map<String, String> map) { public Long counts(Map<String, String> map) {
return 0; return BusinessConstants.DEFAULT_LIST_NULL_NUMBER;
} }
@Override @Override

1
src/main/java/com/jsh/erp/utils/Constants.java
View File

@@ -16,6 +16,7 @@ public class Constants {
public final static String SEARCH = "search"; public final static String SEARCH = "search";
public final static String DEVICE_ID = "deviceId"; public final static String DEVICE_ID = "deviceId";
public final static String OFFSET = "offset"; 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 = "isRecursion";
public final static String IS_RECURSION_VALUE = "1"; public final static String IS_RECURSION_VALUE = "1";
public final static String IS_QUERYBYNODEID = "isquerybyid"; public final static String IS_QUERYBYNODEID = "isquerybyid";

6
src/main/java/com/jsh/erp/utils/PageQueryInfo.java
View File

@@ -9,14 +9,14 @@ import java.util.List;
*/ */
public class PageQueryInfo { public class PageQueryInfo {
private Integer total; private Long total;
private List<?> rows; private List<?> rows;
public Integer getTotal() { public Long getTotal() {
return total; return total;
} }
public void setTotal(Integer total) { public void setTotal(Long total) {
this.total = total; this.total = total;
} }

28
src/main/java/com/jsh/erp/utils/ParamUtils.java
View File

@@ -12,10 +12,32 @@ public class ParamUtils {
public static String getPageOffset(Integer currentPage, Integer pageSize) { public static String getPageOffset(Integer currentPage, Integer pageSize) {
if (currentPage != null && pageSize != null) { if (currentPage != null && pageSize != null) {
int offset = (currentPage - 1) * pageSize; int offset = (currentPage - 1) * pageSize;
if (offset < 0) { if (offset <= 0) {
return 0 + ""; return "0";
} else { } 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; return null;

8
src/main/resources/application.properties
View File

@@ -15,6 +15,14 @@ logging.level.com.jsh.erp.datasource.mappers=DEBUG
#日志 #日志
logging.config=classpath:logback-spring.xml logging.config=classpath:logback-spring.xml
logging.level.com.didispace=DEBUG 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

2
src/main/resources/mapper_xml/AccountHeadMapperEx.xml
View File

@@ -34,7 +34,7 @@
</select> </select>
<select id="countsByAccountHead" resultType="java.lang.Integer"> <select id="countsByAccountHead" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_accounthead FROM jsh_accounthead

2
src/main/resources/mapper_xml/AccountItemMapperEx.xml
View File

@@ -24,7 +24,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByAccountItem" resultType="java.lang.Integer"> <select id="countsByAccountItem" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_accountitem FROM jsh_accountitem

2
src/main/resources/mapper_xml/AccountMapperEx.xml
View File

@@ -33,7 +33,7 @@
</if> </if>
</select> </select>
<select id="countsByAccount" resultType="java.lang.Integer"> <select id="countsByAccount" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_account FROM jsh_account

2
src/main/resources/mapper_xml/AppMapperEx.xml
View File

@@ -16,7 +16,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByApp" resultType="java.lang.Integer"> <select id="countsByApp" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_app FROM jsh_app

2
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -73,7 +73,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByDepotHead" resultType="java.lang.Integer"> <select id="countsByDepotHead" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_depothead FROM jsh_depothead

6
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -59,7 +59,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByDepotItem" resultType="java.lang.Integer"> <select id="countsByDepotItem" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_depotitem FROM jsh_depotitem
@@ -93,7 +93,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="findDetailByTypeAndMaterialIdCounts" resultType="java.lang.Integer"> <select id="findDetailByTypeAndMaterialIdCounts" resultType="java.lang.Long">
select count(1) select count(1)
from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它' from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId where type!='其它'
and SubType!='调拨' and SubType!='调拨'
@@ -110,7 +110,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="findStockNumByMaterialIdCounts" resultType="java.lang.Integer"> <select id="findStockNumByMaterialIdCounts" resultType="java.lang.Long">
select count(*) from jsh_depotitem where 1=1 select count(*) from jsh_depotitem where 1=1
<if test="mId != null"> <if test="mId != null">
and MaterialId=${mId} and MaterialId=${mId}

27
src/main/resources/mapper_xml/DepotMapper.xml
View File

@@ -14,6 +14,7 @@
<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="sort" jdbcType="VARCHAR" property="sort" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="principal" jdbcType="BIGINT" property="principal" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
@@ -86,7 +87,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, name, address, warehousing, truckage, type, sort, remark id, name, address, warehousing, truckage, type, sort, remark, principal
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap">
<!-- <!--
@@ -141,10 +142,12 @@
--> -->
insert into jsh_depot (id, name, address, insert into jsh_depot (id, name, address,
warehousing, truckage, type, warehousing, truckage, type,
sort, remark) sort, remark, principal
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, #{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER},
#{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}) #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
<!-- <!--
@@ -177,6 +180,9 @@
<if test="remark != null"> <if test="remark != null">
remark, remark,
</if> </if>
<if test="principal != null">
principal,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@@ -203,6 +209,9 @@
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="principal != null">
#{principal,jdbcType=BIGINT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultType="java.lang.Integer">
@@ -246,6 +255,9 @@
<if test="record.remark != null"> <if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.principal != null">
principal = #{record.principal,jdbcType=BIGINT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@@ -264,7 +276,8 @@
truckage = #{record.truckage,jdbcType=DECIMAL}, truckage = #{record.truckage,jdbcType=DECIMAL},
type = #{record.type,jdbcType=INTEGER}, type = #{record.type,jdbcType=INTEGER},
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR} remark = #{record.remark,jdbcType=VARCHAR},
principal = #{record.principal,jdbcType=BIGINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@@ -297,6 +310,9 @@
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="principal != null">
principal = #{principal,jdbcType=BIGINT},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
@@ -312,7 +328,8 @@
truckage = #{truckage,jdbcType=DECIMAL}, truckage = #{truckage,jdbcType=DECIMAL},
type = #{type,jdbcType=INTEGER}, type = #{type,jdbcType=INTEGER},
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR} remark = #{remark,jdbcType=VARCHAR},
principal = #{principal,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

27
src/main/resources/mapper_xml/DepotMapperEx.xml
View File

@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.DepotMapperEx">
<resultMap extends="com.jsh.erp.datasource.mappers.DepotMapper.BaseResultMap" id="ResultMapEx" type="com.jsh.erp.datasource.entities.DepotEx">
<result column="principalName" jdbcType="VARCHAR" property="principalName" />
</resultMap>
<select id="selectByConditionDepot" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="com.jsh.erp.datasource.mappers.DepotMapper.BaseResultMap"> <select id="selectByConditionDepot" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="com.jsh.erp.datasource.mappers.DepotMapper.BaseResultMap">
select * select *
FROM jsh_depot FROM jsh_depot
@@ -19,7 +23,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByDepot" resultType="java.lang.Integer"> <select id="countsByDepot" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_depot FROM jsh_depot
@@ -34,4 +38,25 @@
and remark like '%${remark}%' and remark like '%${remark}%'
</if> </if>
</select> </select>
<select id="getDepotList" parameterType="java.util.Map" resultMap="ResultMapEx">
select dep.*,usr.username as principalName
FROM jsh_depot dep
left join jsh_user usr on usr.id=dep.principal
where 1=1
<if test="name != null and name != ''">
<bind name="name" value="'%' + _parameter.name + '%'" />
and dep.name like #{name}
</if>
<if test="type != null and type != ''">
and dep.type=#{type}
</if>
<if test="remark != null and remark != ''">
<bind name="remark" value="'%' + _parameter.remark + '%'" />
and dep.remark like #{remark}
</if>
order by dep.sort asc
</select>
</mapper> </mapper>

2
src/main/resources/mapper_xml/FunctionsMapperEx.xml
View File

@@ -16,7 +16,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByFunctions" resultType="java.lang.Integer"> <select id="countsByFunctions" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_functions FROM jsh_functions

2
src/main/resources/mapper_xml/InOutItemMapperEx.xml
View File

@@ -18,7 +18,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByInOutItem" resultType="java.lang.Integer"> <select id="countsByInOutItem" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_inoutitem FROM jsh_inoutitem

2
src/main/resources/mapper_xml/LogMapperEx.xml
View File

@@ -36,7 +36,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByLog" resultType="java.lang.Integer"> <select id="countsByLog" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_log FROM jsh_log

2
src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
View File

@@ -16,7 +16,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByMaterialCategory" resultType="java.lang.Integer"> <select id="countsByMaterialCategory" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_materialcategory FROM jsh_materialcategory

2
src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -31,7 +31,7 @@
</if> </if>
</select> </select>
<select id="countsByMaterial" resultType="java.lang.Integer"> <select id="countsByMaterial" resultType="java.lang.Long">
SELECT SELECT
COUNT(m.id) COUNT(m.id)
FROM jsh_material m FROM jsh_material m

2
src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml
View File

@@ -12,7 +12,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByMaterialProperty" resultType="java.lang.Integer"> <select id="countsByMaterialProperty" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_materialproperty FROM jsh_materialproperty

2
src/main/resources/mapper_xml/PersonMapperEx.xml
View File

@@ -15,7 +15,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByPerson" resultType="java.lang.Integer"> <select id="countsByPerson" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_person FROM jsh_person

2
src/main/resources/mapper_xml/RoleMapperEx.xml
View File

@@ -12,7 +12,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if>; </if>;
</select> </select>
<select id="countsByRole" resultType="java.lang.Integer"> <select id="countsByRole" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_role FROM jsh_role

2
src/main/resources/mapper_xml/SerialNumberMapperEx.xml
View File

@@ -31,7 +31,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countSerialNumber" resultType="java.lang.Integer"> <select id="countSerialNumber" resultType="java.lang.Long">
SELECT SELECT
COUNT(ser.id) COUNT(ser.id)
FROM jsh_serial_number ser FROM jsh_serial_number ser

2
src/main/resources/mapper_xml/SupplierMapperEx.xml
View File

@@ -24,7 +24,7 @@
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsBySupplier" resultType="java.lang.Integer"> <select id="countsBySupplier" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_supplier FROM jsh_supplier

Some files were not shown because too many files have changed in this diff Show More