|
|
@@ -17,6 +17,7 @@ import javax.annotation.Resource;
|
|
17
|
17
|
import java.time.LocalDate;
|
|
18
|
18
|
import java.time.LocalDateTime;
|
|
19
|
19
|
import java.time.LocalTime;
|
|
|
20
|
+import java.time.ZoneOffset;
|
|
20
|
21
|
import java.util.ArrayList;
|
|
21
|
22
|
import java.util.List;
|
|
22
|
23
|
|
|
|
@@ -119,7 +120,7 @@ public class UserService {
|
|
119
|
120
|
*/
|
|
120
|
121
|
public void resolverDacang(LocalDate localDate){
|
|
121
|
122
|
LocalDateTime currentTime = LocalDateTime.now();
|
|
122
|
|
- List<UserDto> userList = userMapper.selectDacang(LocalDateTime.of(localDate, LocalTime.MIN), LocalDateTime.of(localDate, LocalTime.MAX));
|
|
|
123
|
+ List<UserDto> userList = userMapper.selectDacang(LocalDateTime.of(localDate, LocalTime.MIN).toEpochSecond(ZoneOffset.ofHours(8)), LocalDateTime.of(localDate, LocalTime.MAX).toEpochSecond(ZoneOffset.ofHours(8)));
|
|
123
|
124
|
List<UserCount> resultList = new ArrayList<>();
|
|
124
|
125
|
userList.stream().forEach(row -> {
|
|
125
|
126
|
if(0 < row.getNum()) {
|
|
|
@@ -189,7 +190,7 @@ public class UserService {
|
|
189
|
190
|
*/
|
|
190
|
191
|
public void resolverChannel(LocalDate localDate){
|
|
191
|
192
|
LocalDateTime currentTime = LocalDateTime.now();
|
|
192
|
|
- List<UserDto> userList = userMapper.selectChannel(LocalDateTime.of(localDate, LocalTime.MIN), LocalDateTime.of(localDate, LocalTime.MAX));
|
|
|
193
|
+ List<UserDto> userList = userMapper.selectChannel(LocalDateTime.of(localDate, LocalTime.MIN).toEpochSecond(ZoneOffset.ofHours(8)), LocalDateTime.of(localDate, LocalTime.MAX).toEpochSecond(ZoneOffset.ofHours(8)));
|
|
193
|
194
|
List<UserCount> resultList = new ArrayList<>();
|
|
194
|
195
|
userList.stream().forEach(row -> {
|
|
195
|
196
|
if(0 < row.getNum()) {
|
|
|
@@ -224,7 +225,7 @@ public class UserService {
|
|
224
|
225
|
*/
|
|
225
|
226
|
public void resolverAgent(LocalDate localDate){
|
|
226
|
227
|
LocalDateTime currentTime = LocalDateTime.now();
|
|
227
|
|
- List<UserDto> userList = userMapper.selectAgent(LocalDateTime.of(localDate, LocalTime.MIN), LocalDateTime.of(localDate, LocalTime.MAX));
|
|
|
228
|
+ List<UserDto> userList = userMapper.selectAgent(LocalDateTime.of(localDate, LocalTime.MIN).toEpochSecond(ZoneOffset.ofHours(8)), LocalDateTime.of(localDate, LocalTime.MAX).toEpochSecond(ZoneOffset.ofHours(8)));
|
|
228
|
229
|
List<UserCount> resultList = new ArrayList<>();
|
|
229
|
230
|
userList.stream().forEach(row -> {
|
|
230
|
231
|
if(0 < row.getNum()) {
|