|
@@ -8,10 +8,10 @@ import com.galaxis.manatee.entity.chuanyun.dto.*;
|
|
|
import com.galaxis.manatee.manager.ChuanYunManager;
|
|
|
import com.galaxis.manatee.util.TimeUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -41,7 +41,11 @@ public class DataArcherService {
|
|
|
List<String> matchers = new ArrayList<>();
|
|
|
matchers.add("F0000001_2," + chuanyunSelfWorkHourDTO.getProjectId());
|
|
|
matchers.add("F0000002_2," + chuanyunSelfWorkHourDTO.getUserId());
|
|
|
- matchers.add("F0000003_2," + TimeUtil.formatDateTime(chuanyunSelfWorkHourDTO.getDayLogDate()));
|
|
|
+ LocalDateTime dayLogDate = chuanyunSelfWorkHourDTO.getDayLogDate();
|
|
|
+ LocalDateTime localDateTimeStart = LocalDateTime.of(dayLogDate.getYear(), dayLogDate.getMonthValue(), dayLogDate.getDayOfMonth(), 0, 0, 0);
|
|
|
+ LocalDateTime localDateTimeEnd = LocalDateTime.of(dayLogDate.getYear(), dayLogDate.getMonthValue(), dayLogDate.getDayOfMonth(), 23, 59, 59);
|
|
|
+ matchers.add("F0000003_1," + TimeUtil.formatDateTime(localDateTimeStart));
|
|
|
+ matchers.add("F0000003_3," + TimeUtil.formatDateTime(localDateTimeEnd));
|
|
|
matchers.add("F0000005_2," + chuanyunSelfWorkHourDTO.getProjectType());
|
|
|
if ("3".equals(chuanyunSelfWorkHourDTO.getStatus())) {
|
|
|
matchers.add("F0000006_2," + chuanyunSelfWorkHourDTO.getStatus());
|