Commit 86b9ae90 authored by qiankunpingtai's avatar qiankunpingtai
Browse files

仓库添加负责人字段

parent c6056838
......@@ -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,
......
......@@ -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);
......
......@@ -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,
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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查询序列号复合信息
* */
......
......@@ -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,
......
......@@ -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
......@@ -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
......@@ -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
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<String, String> parameterMap) {
public Long counts(String apiName, Map<String, String> parameterMap) {
if (StringUtil.isNotEmpty(apiName)) {
return container.getCommonQuery(apiName).counts(parameterMap);
}
return 0;
return BusinessConstants.DEFAULT_LIST_NULL_NUMBER;
}
/**
......
......@@ -34,7 +34,7 @@ public interface ICommonQuery {
* @param parameterMap 查询参数
* @return 查询结果
*/
int counts(Map<String, String> parameterMap);
Long counts(Map<String, String> parameterMap);
/**
* 新增数据
......
......@@ -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);
}
......
......@@ -40,7 +40,7 @@ public class AccountComponent implements ICommonQuery {
}
@Override
public int counts(Map<String, String> map) {
public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
String serialNo = StringUtil.getInfo(search, "serialNo");
......
......@@ -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);
}
......
......@@ -39,7 +39,7 @@ public class AccountHeadComponent implements ICommonQuery {
}
@Override
public int counts(Map<String, String> map) {
public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH);
String type = StringUtil.getInfo(search, "type");
String billNo = StringUtil.getInfo(search, "billNo");
......
......@@ -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);
}
......
......@@ -38,7 +38,7 @@ public class AccountItemComponent implements ICommonQuery {
}
@Override
public int counts(Map<String, String> map) {
public Long counts(Map<String, String> map) {
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type"));
......
......@@ -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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment