From e9ac176e5fbc768ff22480ae1c999a4b06694535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 28 Aug 2022 00:20:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E6=88=B7/=E4=BB=93?= =?UTF-8?q?=E5=BA=93/=E7=BB=8F=E6=89=8B=E4=BA=BA=E7=AD=89=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/service/account/AccountService.java | 7 ++++--- .../java/com/jsh/erp/service/depot/DepotService.java | 4 ++-- .../jsh/erp/service/inOutItem/InOutItemService.java | 2 +- .../java/com/jsh/erp/service/person/PersonService.java | 2 +- .../java/com/jsh/erp/service/role/RoleService.java | 1 + .../com/jsh/erp/service/supplier/SupplierService.java | 10 +++++----- .../src/main/resources/mapper_xml/SupplierMapperEx.xml | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java index 9c869eab..1e345b05 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -74,10 +74,11 @@ public class AccountService { } public List getAccount() throws Exception{ - AccountExample example = new AccountExample(); - example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); List list=null; try{ + AccountExample example = new AccountExample(); + example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + example.setOrderByClause("sort asc, id desc"); list=accountMapper.selectByExample(example); }catch(Exception e){ JshException.readFail(logger, e); @@ -251,7 +252,7 @@ public class AccountService { public List findBySelect()throws Exception { AccountExample example = new AccountExample(); example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list = accountMapper.selectByExample(example); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java index aebf5360..6f76ae9e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -89,7 +89,7 @@ public class DepotService { public List getAllList()throws Exception { DepotExample example = new DepotExample(); example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("sort"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list=depotMapper.selectByExample(example); @@ -232,7 +232,7 @@ public class DepotService { DepotExample example = new DepotExample(); example.createCriteria().andTypeEqualTo(0).andEnabledEqualTo(true) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("sort"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list= depotMapper.selectByExample(example); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java index 6b8dff09..e7c7548c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java @@ -195,7 +195,7 @@ public class InOutItemService { example.createCriteria().andTypeEqualTo("支出").andEnabledEqualTo(true) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); } - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list = null; try{ list=inOutItemMapper.selectByExample(example); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java index cc23769c..41cac6c4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -224,7 +224,7 @@ public class PersonService { PersonExample example = new PersonExample(); example.createCriteria().andTypeEqualTo(type).andEnabledEqualTo(true) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id asc"); + example.setOrderByClause("sort asc, id desc"); List list =null; try{ list=personMapper.selectByExample(example); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java index 7021cfec..60fc5c34 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -63,6 +63,7 @@ public class RoleService { public List allList()throws Exception { RoleExample example = new RoleExample(); example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list=roleMapper.selectByExample(example); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index af7e0669..f99eaad5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -307,7 +307,7 @@ public class SupplierService { public List findBySelectCus()throws Exception { SupplierExample example = new SupplierExample(); example.createCriteria().andTypeLike("客户").andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list = supplierMapper.selectByExample(example); @@ -321,7 +321,7 @@ public class SupplierService { SupplierExample example = new SupplierExample(); example.createCriteria().andTypeLike("供应商").andEnabledEqualTo(true) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list = supplierMapper.selectByExample(example); @@ -335,7 +335,7 @@ public class SupplierService { SupplierExample example = new SupplierExample(); example.createCriteria().andTypeLike("会员").andEnabledEqualTo(true) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list = supplierMapper.selectByExample(example); @@ -349,7 +349,7 @@ public class SupplierService { SupplierExample example = new SupplierExample(); example.createCriteria().andIdEqualTo(supplierId) .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list = supplierMapper.selectByExample(example); @@ -382,7 +382,7 @@ public class SupplierService { SupplierExample example = new SupplierExample(); example.createCriteria().andTypeEqualTo("客户") .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - example.setOrderByClause("id desc"); + example.setOrderByClause("sort asc, id desc"); List list=null; try{ list = supplierMapper.selectByExample(example); diff --git a/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml index 039bebac..e30d43bd 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml @@ -69,7 +69,7 @@ and telephone like #{bindTelephone} and ifnull(delete_flag,'0') !='1' - order by id desc + order by sort asc, id desc