更新Mapper的文件结构

src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.MaterialProperty;
+import com.jsh.erp.datasource.entities.MaterialPropertyExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MaterialPropertyMapperEx {
+
+    List<MaterialProperty> selectByConditionMaterialProperty(
+            @Param("name") String name,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByMaterialProperty(@Param("name") String name);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/PersonMapper.java

@@ -93,14 +93,4 @@ public interface PersonMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(Person record);
-
-    List<Person> selectByConditionPerson(
-            @Param("name") String name,
-            @Param("type") String type,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int countsByPerson(
-            @Param("name") String name,
-            @Param("type") String type);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Person;
+import com.jsh.erp.datasource.entities.PersonExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PersonMapperEx {
+
+    List<Person> selectByConditionPerson(
+            @Param("name") String name,
+            @Param("type") String type,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByPerson(
+            @Param("name") String name,
+            @Param("type") String type);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/RoleMapper.java

@@ -93,12 +93,4 @@ public interface RoleMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(Role record);
-
-    List<Role> selectByConditionRole(
-            @Param("name") String name,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int countsByRole(
-            @Param("name") String name);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Role;
+import com.jsh.erp.datasource.entities.RoleExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface RoleMapperEx {
+
+    List<Role> selectByConditionRole(
+            @Param("name") String name,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByRole(
+            @Param("name") String name);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java

@@ -93,27 +93,4 @@ public interface SupplierMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(Supplier record);
-
-    List<Supplier> selectByConditionSupplier(
-            @Param("supplier") String supplier,
-            @Param("type") String type,
-            @Param("phonenum") String phonenum,
-            @Param("telephone") String telephone,
-            @Param("description") String description,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int countsBySupplier(
-            @Param("supplier") String supplier,
-            @Param("type") String type,
-            @Param("phonenum") String phonenum,
-            @Param("telephone") String telephone,
-            @Param("description") String description);
-
-    List<Supplier> findByAll(
-            @Param("supplier") String supplier,
-            @Param("type") String type,
-            @Param("phonenum") String phonenum,
-            @Param("telephone") String telephone,
-            @Param("description") String description);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Supplier;
+import com.jsh.erp.datasource.entities.SupplierExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface SupplierMapperEx {
+
+    List<Supplier> selectByConditionSupplier(
+            @Param("supplier") String supplier,
+            @Param("type") String type,
+            @Param("phonenum") String phonenum,
+            @Param("telephone") String telephone,
+            @Param("description") String description,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsBySupplier(
+            @Param("supplier") String supplier,
+            @Param("type") String type,
+            @Param("phonenum") String phonenum,
+            @Param("telephone") String telephone,
+            @Param("description") String description);
+
+    List<Supplier> findByAll(
+            @Param("supplier") String supplier,
+            @Param("type") String type,
+            @Param("phonenum") String phonenum,
+            @Param("telephone") String telephone,
+            @Param("description") String description);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapper.java

@@ -93,10 +93,4 @@ public interface SystemConfigMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(SystemConfig record);
-
-    List<SystemConfig> selectByConditionSystemConfig(
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int countsBySystemConfig();
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.SystemConfig;
+import com.jsh.erp.datasource.entities.SystemConfigExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface SystemConfigMapperEx {
+
+    List<SystemConfig> selectByConditionSystemConfig(
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsBySystemConfig();
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/UnitMapper.java

@@ -93,12 +93,4 @@ public interface UnitMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(Unit record);
-
-    List<Unit> selectByConditionUnit(
-            @Param("name") String name,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int countsByUnit(
-            @Param("name") String name);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Unit;
+import com.jsh.erp.datasource.entities.UnitExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UnitMapperEx {
+
+    List<Unit> selectByConditionUnit(
+            @Param("name") String name,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByUnit(
+            @Param("name") String name);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java

@@ -93,14 +93,4 @@ public interface UserMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(User record);
-
-    List<User> selectByConditionUser(
-            @Param("userName") String userName,
-            @Param("loginName") String loginName,
-            @Param("offset") Integer offset,
-            @Param("rows") Integer rows);
-
-    int countsByUser(
-            @Param("userName") String userName,
-            @Param("loginName") String loginName);
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.User;
+import com.jsh.erp.datasource.entities.UserExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UserMapperEx {
+
+    List<User> selectByConditionUser(
+            @Param("userName") String userName,
+            @Param("loginName") String loginName,
+            @Param("offset") Integer offset,
+            @Param("rows") Integer rows);
+
+    int countsByUser(
+            @Param("userName") String userName,
+            @Param("loginName") String loginName);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/service/account/AccountService.java

@@ -2,10 +2,7 @@ package com.jsh.erp.service.account;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.*;
-import com.jsh.erp.datasource.mappers.AccountHeadMapper;
-import com.jsh.erp.datasource.mappers.AccountItemMapper;
-import com.jsh.erp.datasource.mappers.AccountMapper;
-import com.jsh.erp.datasource.mappers.DepotHeadMapper;
+import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.datasource.vo.AccountVo4InOutList;
 import com.jsh.erp.datasource.vo.AccountVo4List;
 import com.jsh.erp.utils.StringUtil;
@@ -31,6 +28,9 @@ public class AccountService {
     @Resource
     private AccountMapper accountMapper;
 
+    @Resource
+    private AccountMapperEx accountMapperEx;
+
     @Resource
     private DepotHeadMapper depotHeadMapper;
 
@@ -51,7 +51,7 @@ public class AccountService {
 
     public List<AccountVo4List> select(String name, String serialNo, String remark, int offset, int rows) {
         List<AccountVo4List> resList = new ArrayList<AccountVo4List>();
-        List<AccountVo4List> list = accountMapper.selectByConditionAccount(name, serialNo, remark, offset, rows);
+        List<AccountVo4List> list = accountMapperEx.selectByConditionAccount(name, serialNo, remark, offset, rows);
         String timeStr = Tools.getCurrentMonth();
         if (null != list && null !=timeStr) {
             for (AccountVo4List al : list) {
@@ -71,7 +71,7 @@ public class AccountService {
     }
 
     public int countAccount(String name, String serialNo, String remark) {
-        return accountMapper.countsByAccount(name, serialNo, remark);
+        return accountMapperEx.countsByAccount(name, serialNo, remark);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -294,11 +294,11 @@ public class AccountService {
     }
 
     public List<AccountVo4InOutList> findAccountInOutList(Long accountId, Integer offset, Integer rows) {
-        return accountMapper.findAccountInOutList(accountId, offset, rows);
+        return accountMapperEx.findAccountInOutList(accountId, offset, rows);
     }
 
     public int findAccountInOutListCount(Long accountId) {
-        return accountMapper.findAccountInOutListCount(accountId);
+        return accountMapperEx.findAccountInOutListCount(accountId);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)

src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java

@@ -5,6 +5,7 @@ import com.jsh.erp.datasource.entities.AccountHead;
 import com.jsh.erp.datasource.entities.AccountHeadExample;
 import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
 import com.jsh.erp.datasource.mappers.AccountHeadMapper;
+import com.jsh.erp.datasource.mappers.AccountHeadMapperEx;
 import com.jsh.erp.utils.StringUtil;
 import com.jsh.erp.utils.Tools;
 import org.slf4j.Logger;
@@ -25,6 +26,9 @@ public class AccountHeadService {
     @Resource
     private AccountHeadMapper accountHeadMapper;
 
+    @Resource
+    private AccountHeadMapperEx accountHeadMapperEx;
+
     public AccountHead getAccountHead(long id) {
         return accountHeadMapper.selectByPrimaryKey(id);
     }
@@ -36,7 +40,7 @@ public class AccountHeadService {
 
     public List<AccountHeadVo4ListEx> select(String type, String billNo, String beginTime, String endTime, int offset, int rows) {
         List<AccountHeadVo4ListEx> resList = new ArrayList<AccountHeadVo4ListEx>();
-        List<AccountHeadVo4ListEx> list = accountHeadMapper.selectByConditionAccountHead(type, billNo, beginTime, endTime, offset, rows);
+        List<AccountHeadVo4ListEx> list = accountHeadMapperEx.selectByConditionAccountHead(type, billNo, beginTime, endTime, offset, rows);
         if (null != list) {
             for (AccountHeadVo4ListEx ah : list) {
                 if(ah.getChangeamount() != null) {
@@ -52,7 +56,7 @@ public class AccountHeadService {
     }
 
     public int countAccountHead(String type, String billNo, String beginTime, String endTime) {
-        return accountHeadMapper.countsByAccountHead(type, billNo, beginTime, endTime);
+        return accountHeadMapperEx.countsByAccountHead(type, billNo, beginTime, endTime);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -89,7 +93,7 @@ public class AccountHeadService {
     }
 
     public Long getMaxId() {
-        return accountHeadMapper.getMaxId();
+        return accountHeadMapperEx.getMaxId();
     }
 
     public BigDecimal findAllMoney(Integer supplierId, String type, String mode, String endTime) {
@@ -99,12 +103,12 @@ public class AccountHeadService {
         } else if (mode.equals("合计")) {
             modeName = "TotalPrice";
         }
-        return accountHeadMapper.findAllMoney(supplierId, type, modeName, endTime);
+        return accountHeadMapperEx.findAllMoney(supplierId, type, modeName, endTime);
     }
 
     public List<AccountHeadVo4ListEx> getDetailByNumber(String billNo) {
         List<AccountHeadVo4ListEx> resList = new ArrayList<AccountHeadVo4ListEx>();
-        List<AccountHeadVo4ListEx> list = accountHeadMapper.getDetailByNumber(billNo);
+        List<AccountHeadVo4ListEx> list = accountHeadMapperEx.getDetailByNumber(billNo);
         if (null != list) {
             for (AccountHeadVo4ListEx ah : list) {
                 if(ah.getChangeamount() != null) {

src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.AccountItem;
 import com.jsh.erp.datasource.entities.AccountItemExample;
 import com.jsh.erp.datasource.mappers.AccountItemMapper;
+import com.jsh.erp.datasource.mappers.AccountItemMapperEx;
 import com.jsh.erp.datasource.vo.AccountItemVo4List;
 import com.jsh.erp.utils.ErpInfo;
 import com.jsh.erp.utils.StringUtil;
@@ -28,6 +29,9 @@ public class AccountItemService {
     @Resource
     private AccountItemMapper accountItemMapper;
 
+    @Resource
+    private AccountItemMapperEx accountItemMapperEx;
+
     public AccountItem getAccountItem(long id) {
         return accountItemMapper.selectByPrimaryKey(id);
     }
@@ -38,11 +42,11 @@ public class AccountItemService {
     }
 
     public List<AccountItem> select(String name, Integer type, String remark, int offset, int rows) {
-        return accountItemMapper.selectByConditionAccountItem(name, type, remark, offset, rows);
+        return accountItemMapperEx.selectByConditionAccountItem(name, type, remark, offset, rows);
     }
 
     public int countAccountItem(String name, Integer type, String remark) {
-        return accountItemMapper.countsByAccountItem(name, type, remark);
+        return accountItemMapperEx.countsByAccountItem(name, type, remark);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
@@ -89,7 +93,7 @@ public class AccountItemService {
     }
 
     public List<AccountItemVo4List> getDetailList(Long headerId) {
-        return accountItemMapper.getDetailList(headerId);
+        return accountItemMapperEx.getDetailList(headerId);
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public String saveDetials(String inserted, String deleted, String updated, Long headerId, String listType) throws DataAccessException {

src/main/java/com/jsh/erp/service/app/AppService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.App;
 import com.jsh.erp.datasource.entities.AppExample;
 import com.jsh.erp.datasource.mappers.AppMapper;
+import com.jsh.erp.datasource.mappers.AppMapperEx;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,6 +21,8 @@ public class AppService {
 
     @Resource
     private AppMapper appMapper;
+    @Resource
+    private AppMapperEx appMapperEx;
 
     public List<App> findDock(){
         AppExample example = new AppExample();
@@ -54,11 +57,11 @@ public class AppService {
     }
 
     public List<App> select(String name, String type, int offset, int rows) {
-        return appMapper.selectByConditionApp(name, type, offset, rows);
+        return appMapperEx.selectByConditionApp(name, type, offset, rows);
     }
 
     public int countApp(String name, String type) {
-        return appMapper.countsByApp(name, type);
+        return appMapperEx.countsByApp(name, type);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)

src/main/java/com/jsh/erp/service/depot/DepotService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.Depot;
 import com.jsh.erp.datasource.entities.DepotExample;
 import com.jsh.erp.datasource.mappers.DepotMapper;
+import com.jsh.erp.datasource.mappers.DepotMapperEx;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +22,9 @@ public class DepotService {
     @Resource
     private DepotMapper depotMapper;
 
+    @Resource
+    private DepotMapperEx depotMapperEx;
+
     public Depot getDepot(long id) {
         return depotMapper.selectByPrimaryKey(id);
     }
@@ -37,11 +41,11 @@ public class DepotService {
     }
 
     public List<Depot> select(String name, Integer type, String remark, int offset, int rows) {
-        return depotMapper.selectByConditionDepot(name, type, remark, offset, rows);
+        return depotMapperEx.selectByConditionDepot(name, type, remark, offset, rows);
     }
 
     public int countDepot(String name, Integer type, String remark) {
-        return depotMapper.countsByDepot(name, type, remark);
+        return depotMapperEx.countsByDepot(name, type, remark);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)

src/main/java/com/jsh/erp/service/functions/FunctionsService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.Functions;
 import com.jsh.erp.datasource.entities.FunctionsExample;
 import com.jsh.erp.datasource.mappers.FunctionsMapper;
+import com.jsh.erp.datasource.mappers.FunctionsMapperEx;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +22,9 @@ public class FunctionsService {
     @Resource
     private FunctionsMapper functionsMapper;
 
+    @Resource
+    private FunctionsMapperEx functionsMapperEx;
+
     public Functions getFunctions(long id) {
         return functionsMapper.selectByPrimaryKey(id);
     }
@@ -31,11 +35,11 @@ public class FunctionsService {
     }
 
     public List<Functions> select(String name, String type, int offset, int rows) {
-        return functionsMapper.selectByConditionFunctions(name, type, offset, rows);
+        return functionsMapperEx.selectByConditionFunctions(name, type, offset, rows);
     }
 
     public int countFunctions(String name, String type) {
-        return functionsMapper.countsByFunctions(name, type);
+        return functionsMapperEx.countsByFunctions(name, type);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)

src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.InOutItem;
 import com.jsh.erp.datasource.entities.InOutItemExample;
 import com.jsh.erp.datasource.mappers.InOutItemMapper;
+import com.jsh.erp.datasource.mappers.InOutItemMapperEx;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +22,9 @@ public class InOutItemService {
     @Resource
     private InOutItemMapper inOutItemMapper;
 
+    @Resource
+    private InOutItemMapperEx inOutItemMapperEx;
+
     public InOutItem getInOutItem(long id) {
         return inOutItemMapper.selectByPrimaryKey(id);
     }
@@ -31,11 +35,11 @@ public class InOutItemService {
     }
 
     public List<InOutItem> select(String name, String type, String remark, int offset, int rows) {
-        return inOutItemMapper.selectByConditionInOutItem(name, type, remark, offset, rows);
+        return inOutItemMapperEx.selectByConditionInOutItem(name, type, remark, offset, rows);
     }
 
     public int countInOutItem(String name, String type, String remark) {
-        return inOutItemMapper.countsByInOutItem(name, type, remark);
+        return inOutItemMapperEx.countsByInOutItem(name, type, remark);
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)