commit
8037cc33e2
|
|
@ -519,7 +519,7 @@ public class AttResBase implements Serializable {
|
|||
*/
|
||||
@TableField(value="benefit")
|
||||
@Schema(description="供水效益")
|
||||
private BigDecimal benefit;
|
||||
private String benefit;
|
||||
|
||||
/**
|
||||
* 全流域面积
|
||||
|
|
|
|||
|
|
@ -184,6 +184,8 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
|
|||
ret.add(vo);
|
||||
}
|
||||
|
||||
//倒序输出
|
||||
ret.sort(Comparator.comparing(StZqrlBVo::getTm).reversed());
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue