From d6a6ba7e6484a352ff9c8c4c69a14d363bb23d72 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 14 Dec 2022 15:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E9=98=85-=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/OnlCgformCollectionMapper.xml | 13 ++-- .../impl/OnlCgformCollectionServiceImpl.java | 14 ++-- .../mapper/OnlCgformSubscribeMapper.java | 5 +- .../mapper/xml/OnlCgformSubscribeMapper.xml | 64 ++++++++++++++++++- .../impl/OnlCgformSubscribeServiceImpl.java | 13 +++- 5 files changed, 93 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml index 71e60206a..2cca02b0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml @@ -56,15 +56,16 @@ order by CONVERT( ${params.orderByField} USING gbk) COLLATE gbk_chinese_ci - - ${params.orderBy} - + order by occ.create_time - - ${params.orderBy} - + + + asc + + + desc order by occ.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java index 16fb190dd..7741d6b9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java @@ -228,25 +228,27 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl queryPageList(Map params) { +// params.put("orderByField","serial_number"); +// params.put("orderBy","1"); Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); IPage page = new Page(pageNo, pageSize); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); params.put("createBy",sysUser.getUsername()); IPage result = onlCgformCollectionMapper.queryPageList(page,params); - result = stateSort(params,pageNo,pageSize,result); + //表头排序（状态单独处理） + if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){ + List> infoList = onlCgformCollectionMapper.infoList(params); + result = stateSort(params,pageNo,pageSize,result,infoList); + } List> records = result.getRecords(); dataDispose(records,params); return result; } - private IPage stateSort(Map parameter, int pageNo, int pageSize, IPage infoPage) { -// parameter.put("orderByField","state"); -// parameter.put("orderBy","1"); + public IPage stateSort(Map parameter, int pageNo, int pageSize, IPage infoPage,List> infoList) { List> list = new LinkedList<>(); //状态排序，需要特殊处理 现行，即将实施，草稿，被替代，废止 if(ObjectUtils.isNotEmpty(parameter.get("orderByField")) && "state".equals((String) parameter.get("orderByField"))){ - List> infoList = onlCgformCollectionMapper.infoList(parameter); - List> active = infoList.stream() .filter(e -> LawsStateEnum.ACTIVE.getValue().equals(e.get("state"))).collect(Collectors.toList()); List> theUpcoming = infoList.stream() diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java index e453fd655..90b7b9223 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import org.apache.ibatis.annotations.Select; -import org.springframework.data.repository.query.Param; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -21,4 +21,7 @@ public interface OnlCgformSubscribeMapper extends BaseMapper List queryListByDocumentId(@Param("document_id") String document_id); IPage queryPageList(IPage page, @Param("params") Map params); + + List> infoList(@Param("params") Map params); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml index 3eecf85f9..cce2a1288 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml @@ -48,7 +48,67 @@ - + + + and bdl.state in + + #{item} + + + + order by CONVERT( ${params.orderByField} USING gbk) COLLATE gbk_chinese_ci + + + order by ocs.create_time + + + asc + + + desc + + + order by ocs.create_time desc + + + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java index af993cf26..34d732bfd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.collection.service.impl.OnlCgformCollectionServiceImpl; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.mapper.OnlCgformSubscribeMapper; @@ -17,6 +18,7 @@ import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +42,8 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl queryPageList(Map params) { +// params.put("orderByField","title"); +// params.put("orderBy","1"); Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); IPage page = new Page(pageNo, pageSize); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); params.put("createBy",sysUser.getUsername()); IPage result = onlCgformSubscribeMapper.queryPageList(page,params); + //表头排序（状态单独处理） + if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){ + List> mapList = onlCgformSubscribeMapper.infoList(params); + result = onlCgformCollectionService.stateSort(params,pageNo,pageSize,result,mapList); + } List> records = result.getRecords(); dataDispose(records,params); return result; @@ -271,4 +282,4 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl