diff --git a/src/main/java/com/jsh/erp/ErpApplication.java b/src/main/java/com/jsh/erp/ErpApplication.java index 6e92d3fb..cb1997a2 100644 --- a/src/main/java/com/jsh/erp/ErpApplication.java +++ b/src/main/java/com/jsh/erp/ErpApplication.java @@ -16,8 +16,4 @@ public class ErpApplication{ public static void main(String[] args) { SpringApplication.run(ErpApplication.class, args); } - - - - } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java index 5afecc16..98a09cd6 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapper.java @@ -97,29 +97,4 @@ public interface AccountHeadMapper { * @mbggenerated */ int updateByPrimaryKey(AccountHead record); - - List selectByConditionAccountHead( - @Param("type") String type, - @Param("billNo") String billNo, - @Param("beginTime") String beginTime, - @Param("endTime") String endTime, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByAccountHead( - @Param("type") String type, - @Param("billNo") String billNo, - @Param("beginTime") String beginTime, - @Param("endTime") String endTime); - - Long getMaxId(); - - BigDecimal findAllMoney( - @Param("supplierId") Integer supplierId, - @Param("type") String type, - @Param("modeName") String modeName, - @Param("endTime") String endTime); - - List getDetailByNumber( - @Param("billNo") String billNo); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java new file mode 100644 index 00000000..c7cfe816 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java @@ -0,0 +1,37 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.AccountHead; +import com.jsh.erp.datasource.entities.AccountHeadExample; +import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx; +import org.apache.ibatis.annotations.Param; + +import java.math.BigDecimal; +import java.util.List; + +public interface AccountHeadMapperEx { + + List selectByConditionAccountHead( + @Param("type") String type, + @Param("billNo") String billNo, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByAccountHead( + @Param("type") String type, + @Param("billNo") String billNo, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime); + + Long getMaxId(); + + BigDecimal findAllMoney( + @Param("supplierId") Integer supplierId, + @Param("type") String type, + @Param("modeName") String modeName, + @Param("endTime") String endTime); + + List getDetailByNumber( + @Param("billNo") String billNo); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java index 8ac893be..475c85ed 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java @@ -95,20 +95,4 @@ public interface AccountItemMapper { * @mbggenerated */ int updateByPrimaryKey(AccountItem record); - - List selectByConditionAccountItem( - @Param("name") String name, - @Param("type") Integer type, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByAccountItem( - @Param("name") String name, - @Param("type") Integer type, - @Param("remark") String remark); - - List getDetailList( - @Param("headerId") Long headerId); - } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java new file mode 100644 index 00000000..f3794b0f --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapperEx.java @@ -0,0 +1,27 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.AccountItem; +import com.jsh.erp.datasource.entities.AccountItemExample; +import com.jsh.erp.datasource.vo.AccountItemVo4List; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface AccountItemMapperEx { + + List selectByConditionAccountItem( + @Param("name") String name, + @Param("type") Integer type, + @Param("remark") String remark, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByAccountItem( + @Param("name") String name, + @Param("type") Integer type, + @Param("remark") String remark); + + List getDetailList( + @Param("headerId") Long headerId); + +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java index 2df74bde..d84b5c29 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java @@ -96,24 +96,4 @@ public interface AccountMapper { * @mbggenerated */ int updateByPrimaryKey(Account record); - - List selectByConditionAccount( - @Param("name") String name, - @Param("serialNo") String serialNo, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByAccount( - @Param("name") String name, - @Param("serialNo") String serialNo, - @Param("remark") String remark); - - List findAccountInOutList( - @Param("accountId") Long accountId, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int findAccountInOutListCount( - @Param("accountId") Long accountId); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java new file mode 100644 index 00000000..777d6f12 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java @@ -0,0 +1,32 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.Account; +import com.jsh.erp.datasource.entities.AccountExample; +import com.jsh.erp.datasource.vo.AccountVo4InOutList; +import com.jsh.erp.datasource.vo.AccountVo4List; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface AccountMapperEx { + + List selectByConditionAccount( + @Param("name") String name, + @Param("serialNo") String serialNo, + @Param("remark") String remark, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByAccount( + @Param("name") String name, + @Param("serialNo") String serialNo, + @Param("remark") String remark); + + List findAccountInOutList( + @Param("accountId") Long accountId, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int findAccountInOutListCount( + @Param("accountId") Long accountId); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java index d0abdd90..4c28acc4 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/AppMapper.java @@ -94,13 +94,4 @@ public interface AppMapper { */ int updateByPrimaryKey(App record); - List selectByConditionApp( - @Param("name") String name, - @Param("type") String type, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByApp( - @Param("name") String name, - @Param("type") String type); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java new file mode 100644 index 00000000..6492449c --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/AppMapperEx.java @@ -0,0 +1,20 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.App; +import com.jsh.erp.datasource.entities.AppExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface AppMapperEx { + + List selectByConditionApp( + @Param("name") String name, + @Param("type") String type, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByApp( + @Param("name") String name, + @Param("type") String type); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java index 73f99835..2cdef7b9 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java @@ -100,7 +100,4 @@ public interface DepotHeadMapper { * @mbggenerated */ int updateByPrimaryKey(DepotHead record); - - - } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java index 484f0293..85e843fa 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapper.java @@ -95,7 +95,4 @@ public interface DepotItemMapper { * @mbggenerated */ int updateByPrimaryKey(DepotItem record); - - - } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java index 6c754c20..f42e0049 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java @@ -93,16 +93,4 @@ public interface DepotMapper { * @mbggenerated */ int updateByPrimaryKey(Depot record); - - List selectByConditionDepot( - @Param("name") String name, - @Param("type") Integer type, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByDepot( - @Param("name") String name, - @Param("type") Integer type, - @Param("remark") String remark); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java new file mode 100644 index 00000000..618c10fc --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java @@ -0,0 +1,22 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.Depot; +import com.jsh.erp.datasource.entities.DepotExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface DepotMapperEx { + + List selectByConditionDepot( + @Param("name") String name, + @Param("type") Integer type, + @Param("remark") String remark, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByDepot( + @Param("name") String name, + @Param("type") Integer type, + @Param("remark") String remark); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapper.java index f80c6a2b..c3995b78 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapper.java @@ -93,14 +93,4 @@ public interface FunctionsMapper { * @mbggenerated */ int updateByPrimaryKey(Functions record); - - List selectByConditionFunctions( - @Param("name") String name, - @Param("type") String type, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByFunctions( - @Param("name") String name, - @Param("type") String type); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java new file mode 100644 index 00000000..12279d07 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java @@ -0,0 +1,20 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.Functions; +import com.jsh.erp.datasource.entities.FunctionsExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface FunctionsMapperEx { + + List selectByConditionFunctions( + @Param("name") String name, + @Param("type") String type, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByFunctions( + @Param("name") String name, + @Param("type") String type); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapper.java index b5300995..086013a0 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapper.java @@ -93,16 +93,4 @@ public interface InOutItemMapper { * @mbggenerated */ int updateByPrimaryKey(InOutItem record); - - List selectByConditionInOutItem( - @Param("name") String name, - @Param("type") String type, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByInOutItem( - @Param("name") String name, - @Param("type") String type, - @Param("remark") String remark); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java new file mode 100644 index 00000000..110b1cd9 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapperEx.java @@ -0,0 +1,22 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.InOutItem; +import com.jsh.erp.datasource.entities.InOutItemExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InOutItemMapperEx { + + List selectByConditionInOutItem( + @Param("name") String name, + @Param("type") String type, + @Param("remark") String remark, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByInOutItem( + @Param("name") String name, + @Param("type") String type, + @Param("remark") String remark); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java index 6de21f7a..2f84db33 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java @@ -95,24 +95,4 @@ public interface LogMapper { * @mbggenerated */ int updateByPrimaryKey(Log record); - - List selectByConditionLog( - @Param("operation") String operation, - @Param("usernameID") Integer usernameID, - @Param("clientIp") String clientIp, - @Param("status") Integer status, - @Param("beginTime") String beginTime, - @Param("endTime") String endTime, - @Param("contentdetails") String contentdetails, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsByLog( - @Param("operation") String operation, - @Param("usernameID") Integer usernameID, - @Param("clientIp") String clientIp, - @Param("status") Integer status, - @Param("beginTime") String beginTime, - @Param("endTime") String endTime, - @Param("contentdetails") String contentdetails); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java new file mode 100644 index 00000000..b2046462 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java @@ -0,0 +1,31 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.Log; +import com.jsh.erp.datasource.entities.LogExample; +import com.jsh.erp.datasource.vo.LogVo4List; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface LogMapperEx { + + List selectByConditionLog( + @Param("operation") String operation, + @Param("usernameID") Integer usernameID, + @Param("clientIp") String clientIp, + @Param("status") Integer status, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime, + @Param("contentdetails") String contentdetails, + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsByLog( + @Param("operation") String operation, + @Param("usernameID") Integer usernameID, + @Param("clientIp") String clientIp, + @Param("status") Integer status, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime, + @Param("contentdetails") String contentdetails); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapper.java index 4fff13f9..baf2a45c 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapper.java @@ -93,11 +93,4 @@ public interface MaterialPropertyMapper { * @mbggenerated */ int updateByPrimaryKey(MaterialProperty record); - - List 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java new file mode 100644 index 00000000..46480159 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapperEx.java @@ -0,0 +1,17 @@ +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 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/PersonMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/PersonMapper.java index c6111b6c..75df967d 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/PersonMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/PersonMapper.java @@ -93,14 +93,4 @@ public interface PersonMapper { * @mbggenerated */ int updateByPrimaryKey(Person record); - - List 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java new file mode 100644 index 00000000..d13dd65b --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java @@ -0,0 +1,20 @@ +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 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/RoleMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/RoleMapper.java index f5805ee0..e5abffe6 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/RoleMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/RoleMapper.java @@ -93,12 +93,4 @@ public interface RoleMapper { * @mbggenerated */ int updateByPrimaryKey(Role record); - - List 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java new file mode 100644 index 00000000..91b3d43b --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java @@ -0,0 +1,18 @@ +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 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java index 5d0f2fb5..51213ec8 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapper.java @@ -93,27 +93,4 @@ public interface SupplierMapper { * @mbggenerated */ int updateByPrimaryKey(Supplier record); - - List 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 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java new file mode 100644 index 00000000..27155142 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java @@ -0,0 +1,33 @@ +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 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 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapper.java index 12edffb0..561ad187 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapper.java @@ -93,10 +93,4 @@ public interface SystemConfigMapper { * @mbggenerated */ int updateByPrimaryKey(SystemConfig record); - - List selectByConditionSystemConfig( - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - int countsBySystemConfig(); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java new file mode 100644 index 00000000..5a897055 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java @@ -0,0 +1,16 @@ +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 selectByConditionSystemConfig( + @Param("offset") Integer offset, + @Param("rows") Integer rows); + + int countsBySystemConfig(); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UnitMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/UnitMapper.java index 4983727a..c75fa61a 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UnitMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UnitMapper.java @@ -93,12 +93,4 @@ public interface UnitMapper { * @mbggenerated */ int updateByPrimaryKey(Unit record); - - List 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java new file mode 100644 index 00000000..21fb0303 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java @@ -0,0 +1,18 @@ +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 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java index 4671e309..6ea2ec35 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java @@ -93,14 +93,4 @@ public interface UserMapper { * @mbggenerated */ int updateByPrimaryKey(User record); - - List 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 diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java new file mode 100644 index 00000000..cc99a9ab --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java @@ -0,0 +1,20 @@ +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 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 diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index 23ca0bb3..4cab9d4e 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/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 select(String name, String serialNo, String remark, int offset, int rows) { List resList = new ArrayList(); - List list = accountMapper.selectByConditionAccount(name, serialNo, remark, offset, rows); + List 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 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) diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java index 99317f94..41300b60 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java +++ b/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 select(String type, String billNo, String beginTime, String endTime, int offset, int rows) { List resList = new ArrayList(); - List list = accountHeadMapper.selectByConditionAccountHead(type, billNo, beginTime, endTime, offset, rows); + List 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 getDetailByNumber(String billNo) { List resList = new ArrayList(); - List list = accountHeadMapper.getDetailByNumber(billNo); + List list = accountHeadMapperEx.getDetailByNumber(billNo); if (null != list) { for (AccountHeadVo4ListEx ah : list) { if(ah.getChangeamount() != null) { diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java index 99ced018..d0e8912e 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java +++ b/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 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 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 { diff --git a/src/main/java/com/jsh/erp/service/app/AppService.java b/src/main/java/com/jsh/erp/service/app/AppService.java index d287cf81..7c000f3b 100644 --- a/src/main/java/com/jsh/erp/service/app/AppService.java +++ b/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 findDock(){ AppExample example = new AppExample(); @@ -54,11 +57,11 @@ public class AppService { } public List 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) diff --git a/src/main/java/com/jsh/erp/service/depot/DepotService.java b/src/main/java/com/jsh/erp/service/depot/DepotService.java index da443715..d7e6611c 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/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 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) diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsService.java b/src/main/java/com/jsh/erp/service/functions/FunctionsService.java index 05173c13..b92c45af 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsService.java +++ b/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 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) diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java index 41917d62..c02c51f5 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java +++ b/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 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) diff --git a/src/main/java/com/jsh/erp/service/log/LogService.java b/src/main/java/com/jsh/erp/service/log/LogService.java index 911b4e68..9b306630 100644 --- a/src/main/java/com/jsh/erp/service/log/LogService.java +++ b/src/main/java/com/jsh/erp/service/log/LogService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.Log; import com.jsh.erp.datasource.entities.LogExample; import com.jsh.erp.datasource.mappers.LogMapper; +import com.jsh.erp.datasource.mappers.LogMapperEx; import com.jsh.erp.datasource.vo.LogVo4List; import com.jsh.erp.utils.ExceptionCodeConstants; import com.jsh.erp.utils.JshException; @@ -25,6 +26,9 @@ public class LogService { @Resource private LogMapper logMapper; + @Resource + private LogMapperEx logMapperEx; + public Log getLog(long id) { return logMapper.selectByPrimaryKey(id); } @@ -36,13 +40,13 @@ public class LogService { public List select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, String contentdetails, int offset, int rows) { - return logMapper.selectByConditionLog(operation, usernameID, clientIp, status, beginTime, endTime, + return logMapperEx.selectByConditionLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails, offset, rows); } public int countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, String contentdetails) { - return logMapper.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails); + return logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java index 1523fc23..5c954d92 100644 --- a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java +++ b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.MaterialProperty; import com.jsh.erp.datasource.entities.MaterialPropertyExample; import com.jsh.erp.datasource.mappers.MaterialPropertyMapper; +import com.jsh.erp.datasource.mappers.MaterialPropertyMapperEx; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +22,9 @@ public class MaterialPropertyService { @Resource private MaterialPropertyMapper materialPropertyMapper; + @Resource + private MaterialPropertyMapperEx materialPropertyMapperEx; + public MaterialProperty getMaterialProperty(long id) { return materialPropertyMapper.selectByPrimaryKey(id); } @@ -30,11 +34,11 @@ public class MaterialPropertyService { return materialPropertyMapper.selectByExample(example); } public List select(String name, int offset, int rows) { - return materialPropertyMapper.selectByConditionMaterialProperty(name, offset, rows); + return materialPropertyMapperEx.selectByConditionMaterialProperty(name, offset, rows); } public int countMaterialProperty(String name) { - return materialPropertyMapper.countsByMaterialProperty(name); + return materialPropertyMapperEx.countsByMaterialProperty(name); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/src/main/java/com/jsh/erp/service/person/PersonService.java b/src/main/java/com/jsh/erp/service/person/PersonService.java index 57526989..735f9fae 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.Person; import com.jsh.erp.datasource.entities.PersonExample; import com.jsh.erp.datasource.mappers.PersonMapper; +import com.jsh.erp.datasource.mappers.PersonMapperEx; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +22,9 @@ public class PersonService { @Resource private PersonMapper personMapper; + @Resource + private PersonMapperEx personMapperEx; + public Person getPerson(long id) { return personMapper.selectByPrimaryKey(id); } @@ -31,11 +35,11 @@ public class PersonService { } public List select(String name, String type, int offset, int rows) { - return personMapper.selectByConditionPerson(name, type, offset, rows); + return personMapperEx.selectByConditionPerson(name, type, offset, rows); } public int countPerson(String name, String type) { - return personMapper.countsByPerson(name, type); + return personMapperEx.countsByPerson(name, type); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/src/main/java/com/jsh/erp/service/role/RoleService.java b/src/main/java/com/jsh/erp/service/role/RoleService.java index 96e92293..a5d5b8f4 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -6,6 +6,7 @@ import com.jsh.erp.datasource.entities.RoleExample; import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.UserExample; import com.jsh.erp.datasource.mappers.RoleMapper; +import com.jsh.erp.datasource.mappers.RoleMapperEx; import com.jsh.erp.datasource.mappers.UserMapper; import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.RegExpTools; @@ -23,6 +24,9 @@ public class RoleService { @Resource private RoleMapper roleMapper; + @Resource + private RoleMapperEx roleMapperEx; + public Role getRole(long id) { return roleMapper.selectByPrimaryKey(id); } @@ -33,11 +37,11 @@ public class RoleService { } public List select(String name, int offset, int rows) { - return roleMapper.selectByConditionRole(name, offset, rows); + return roleMapperEx.selectByConditionRole(name, offset, rows); } public int countRole(String name) { - return roleMapper.countsByRole(name); + return roleMapperEx.countsByRole(name); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index 72d97945..aa22de56 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.Supplier; import com.jsh.erp.datasource.entities.SupplierExample; import com.jsh.erp.datasource.mappers.SupplierMapper; +import com.jsh.erp.datasource.mappers.SupplierMapperEx; import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; @@ -25,6 +26,9 @@ public class SupplierService { @Resource private SupplierMapper supplierMapper; + @Resource + private SupplierMapperEx supplierMapperEx; + public Supplier getSupplier(long id) { return supplierMapper.selectByPrimaryKey(id); } @@ -35,11 +39,11 @@ public class SupplierService { } public List select(String supplier, String type, String phonenum, String telephone, String description, int offset, int rows) { - return supplierMapper.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) { - return supplierMapper.countsBySupplier(supplier, type, phonenum, telephone, description); + return supplierMapperEx.countsBySupplier(supplier, type, phonenum, telephone, description); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) @@ -134,7 +138,7 @@ public class SupplierService { } public List findByAll(String supplier, String type, String phonenum, String telephone, String description) { - return supplierMapper.findByAll(supplier, type, phonenum, telephone, description); + return supplierMapperEx.findByAll(supplier, type, phonenum, telephone, description); } public BaseResponseInfo importExcel(List mList) throws Exception { diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index 23bf7b28..2876c7fa 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.SystemConfig; import com.jsh.erp.datasource.entities.SystemConfigExample; import com.jsh.erp.datasource.mappers.SystemConfigMapper; +import com.jsh.erp.datasource.mappers.SystemConfigMapperEx; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +22,9 @@ public class SystemConfigService { @Resource private SystemConfigMapper systemConfigMapper; + @Resource + private SystemConfigMapperEx systemConfigMapperEx; + public SystemConfig getSystemConfig(long id) { return systemConfigMapper.selectByPrimaryKey(id); } @@ -30,11 +34,11 @@ public class SystemConfigService { return systemConfigMapper.selectByExample(example); } public List select(int offset, int rows) { - return systemConfigMapper.selectByConditionSystemConfig(offset, rows); + return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows); } public int countSystemConfig() { - return systemConfigMapper.countsBySystemConfig(); + return systemConfigMapperEx.countsBySystemConfig(); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/src/main/java/com/jsh/erp/service/unit/UnitService.java b/src/main/java/com/jsh/erp/service/unit/UnitService.java index e4c37a9e..59595f16 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitService.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.Unit; import com.jsh.erp.datasource.entities.UnitExample; import com.jsh.erp.datasource.mappers.UnitMapper; +import com.jsh.erp.datasource.mappers.UnitMapperEx; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,6 +22,9 @@ public class UnitService { @Resource private UnitMapper unitMapper; + @Resource + private UnitMapperEx unitMapperEx; + public Unit getUnit(long id) { return unitMapper.selectByPrimaryKey(id); } @@ -31,11 +35,11 @@ public class UnitService { } public List select(String name, int offset, int rows) { - return unitMapper.selectByConditionUnit(name, offset, rows); + return unitMapperEx.selectByConditionUnit(name, offset, rows); } public int countUnit(String name) { - return unitMapper.countsByUnit(name); + return unitMapperEx.countsByUnit(name); } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index e671251e..5951b593 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.UserExample; import com.jsh.erp.datasource.mappers.UserMapper; +import com.jsh.erp.datasource.mappers.UserMapperEx; import com.jsh.erp.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +27,9 @@ public class UserService { @Resource private UserMapper userMapper; + @Resource + private UserMapperEx userMapperEx; + public User getUser(long id) { return userMapper.selectByPrimaryKey(id); } @@ -36,11 +40,11 @@ public class UserService { } public List select(String userName, String loginName, int offset, int rows) { - return userMapper.selectByConditionUser(userName, loginName, offset, rows); + return userMapperEx.selectByConditionUser(userName, loginName, offset, rows); } public int countUser(String userName, String loginName) { - return userMapper.countsByUser(userName, loginName); + return userMapperEx.countsByUser(userName, loginName); } /** * create by: cjl