wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交人瞩

Browse Source
This commit is contained in:
quyixiao 2020-09-01 09:33:19 +08:00
parent 68901379fb
commit 0d230e7294
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/app/resp/ResultRecordResp.java
View File

@ -36,4 +36,6 @@ public class ResultRecordResp {
private Integer type ; private Integer type ;
private String monthTimeStr;
} }

3
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -33,6 +33,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -184,6 +185,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
PageUtils pageUtils = PageUtils.startPage(params.getPage(), params.getLimit()).doSelect( PageUtils pageUtils = PageUtils.startPage(params.getPage(), params.getLimit()).doSelect(
page -> resultRecordMapper.selectByConditionByLeader(page, params) page -> resultRecordMapper.selectByConditionByLeader(page, params)
); );
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM");
List<ResultRecord> resultRecords = pageUtils.getList(); List<ResultRecord> resultRecords = pageUtils.getList();
if (CollectionUtils.isNotEmpty(resultRecords)) { if (CollectionUtils.isNotEmpty(resultRecords)) {
List<ResultRecordResp> list = new ArrayList<>(); List<ResultRecordResp> list = new ArrayList<>();
@ -196,6 +198,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
} else if (resp.getStatus().equals(5) && staffRoleMap.get(user.getUserId()) == null) { } else if (resp.getStatus().equals(5) && staffRoleMap.get(user.getUserId()) == null) {
resp.setStatus(1); // 如果不是自己审批，说明自己己经审批完成 resp.setStatus(1); // 如果不是自己审批，说明自己己经审批完成
} }
resp.setMonthTimeStr(df.format(resultRecord.getMonthTime()));
list.add(resp); list.add(resp);
} }
pageUtils.setList(list); pageUtils.setList(list);