Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

河北PMS算法调整

Browse Source
This commit is contained in:
xuyang
2024-03-11 18:57:02 +08:00
parent 6f01259e2f
commit 431c7c03d0
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
View File

@@ -147,6 +147,8 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
private String formatBeginMonth(String searchBeginTime, String dataType) { private String formatBeginMonth(String searchBeginTime, String dataType) {
if (Objects.equals(dataType, "02")) { if (Objects.equals(dataType, "02")) {
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN); return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN);
} else if (Objects.equals(dataType, "01")){
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN);
} }
return searchBeginTime; return searchBeginTime;
} }

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
View File

@@ -191,6 +191,8 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
private String formatBeginMonth(String searchBeginTime, String dataType) { private String formatBeginMonth(String searchBeginTime, String dataType) {
if (Objects.equals(dataType, "02")) { if (Objects.equals(dataType, "02")) {
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN); return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_MONTH_PATTERN)), DatePattern.NORM_MONTH_PATTERN);
} else if (Objects.equals(dataType, "01")){
return DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(searchBeginTime, DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN);
} }
return searchBeginTime; return searchBeginTime;
} }