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

Merge pull request !30 from 乾坤平台/master

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

src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java

@@ -36,7 +36,7 @@ public class MaterialPropertyComponent 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");
         return materialPropertyService.countMaterialProperty(name);

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

src/main/java/com/jsh/erp/service/person/PersonComponent.java

@@ -39,7 +39,7 @@ public class PersonComponent 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 type = StringUtil.getInfo(search, "type");

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

src/main/java/com/jsh/erp/service/role/RoleComponent.java

@@ -37,7 +37,7 @@ public class RoleComponent 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");
         return roleService.countRole(name);

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

src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java

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

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

src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java

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

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

src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java

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

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();
     }
 

src/main/java/com/jsh/erp/service/unit/UnitComponent.java

@@ -37,7 +37,7 @@ public class UnitComponent 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");
         return unitService.countUnit(name);

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

src/main/java/com/jsh/erp/service/user/UserComponent.java

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

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);
     }
     /**

src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java

 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<String, String> map) {
-        return 0;
+    public Long counts(Map<String, String> map) {
+        return BusinessConstants.DEFAULT_LIST_NULL_NUMBER;
     }
 
     @Override

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";

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