diff --git a/src/main/java/com/gunshi/project/xyt/model/AttResBase.java b/src/main/java/com/gunshi/project/xyt/model/AttResBase.java index c3230ed..c45566c 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttResBase.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttResBase.java @@ -519,7 +519,7 @@ public class AttResBase implements Serializable { */ @TableField(value="benefit") @Schema(description="供水效益") - private BigDecimal benefit; + private String benefit; /** * 全流域面积 diff --git a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java index b001ace..b66f2fe 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java @@ -184,6 +184,8 @@ public class StStbprpBService extends ServiceImpl { ret.add(vo); } + //倒序输出 + ret.sort(Comparator.comparing(StZqrlBVo::getTm).reversed()); return ret; } diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java index 7288ecc..f855469 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java @@ -143,7 +143,7 @@ public class DataTaskTSG { calendar.add(Calendar.HOUR_OF_DAY, -20); } } else { - int diffDays = new BigDecimal((int) Math.ceil(now.getTime() - stm.getTime() / (24 * 60 * 60 * 1000))).intValue(); + int diffDays = new BigDecimal((int) Math.ceil((now.getTime() - stm.getTime()) / (24 * 60 * 60 * 1000))).intValue(); if (diffDays > 3) { calendar.add(Calendar.DATE, -2); calendar.add(Calendar.HOUR_OF_DAY, -20); @@ -261,7 +261,7 @@ public class DataTaskTSG { calendar.add(Calendar.HOUR_OF_DAY, -20); } } else { - int diffDays = new BigDecimal((int) Math.ceil(now.getTime() - stm.getTime() / (24 * 60 * 60 * 1000))).intValue(); + int diffDays = new BigDecimal((int) Math.ceil((now.getTime() - stm.getTime()) / (24 * 60 * 60 * 1000))).intValue(); if (diffDays > 3) { calendar.add(Calendar.DATE, -2); calendar.add(Calendar.HOUR_OF_DAY, -20);