diff --git a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java index f7e50f5f..1a8d6412 100644 --- a/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java +++ b/src/main/java/com/lz/modules/app/resp/ResultRecordResp.java @@ -36,4 +36,6 @@ public class ResultRecordResp { private Integer type ; + private String monthTimeStr; + } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index c3cce562..6499bf71 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -184,6 +185,7 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecordMapper.selectByConditionByLeader(page, params) ); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM"); List resultRecords = pageUtils.getList(); if (CollectionUtils.isNotEmpty(resultRecords)) { List list = new ArrayList<>(); @@ -196,6 +198,7 @@ public class ResultRecordServiceImpl extends ServiceImpl