WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test

Browse Source
This commit is contained in:
zyx.net
2022-12-23 11:00:18 +08:00
parent 8c0b7bf0c0 f728dc7cdc
commit 3cc7e7aaad
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
+6 -1
View File
@@ -230,16 +230,21 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl<OnlCgformCollect
public IPage<OnlCgformCollection> queryPageList(Map<String, Object> params) {
// params.put("orderByField","serial_number");
// params.put("orderBy","1");
if(ObjectUtils.isEmpty(params.get("orderByField"))){
params.put("orderBy","");
}
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);
IPage result = new Page();
//表头排序（状态单独处理）
if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){
List<Map<String, Object>> infoList = onlCgformCollectionMapper.infoList(params);
result = stateSort(params,pageNo,pageSize,result,infoList);
}else{
result = onlCgformCollectionMapper.queryPageList(page,params);
}
List<Map<String,Object>> records = result.getRecords();
dataDispose(records,params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java
+11 -2
View File
@@ -25,7 +25,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -209,16 +213,21 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl<OnlCgformSubscrib
public IPage<OnlCgformSubscribe> queryPageList(Map<String,Object> params) {
// params.put("orderByField","title");
// params.put("orderBy","1");
if(ObjectUtils.isEmpty(params.get("orderByField"))){
params.put("orderBy",null);
}
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);
IPage result = new Page();
//表头排序（状态单独处理）
if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){
List<Map<String, Object>> mapList = onlCgformSubscribeMapper.infoList(params);
result = onlCgformCollectionService.stateSort(params,pageNo,pageSize,result,mapList);
}else{
result = onlCgformSubscribeMapper.queryPageList(page,params);
}
List<Map<String,Object>> records = result.getRecords();
dataDispose(records,params);