仓库添加负责人字段

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

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

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

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,

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

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

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

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,

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

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<DepotEx> getDepotList(Map<String, Object> params);
+    Long getDepotListCount(Map<String, Object> params);
 }

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

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

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,

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

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,

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

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

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

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

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,

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

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

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