1.应要求修改水库工程基础信息中一些原本是字符串类型的字段为数字类型字段

2.水库溢洪查询功能
master
李一帆 2025-04-07 15:24:19 +08:00
commit 8037cc33e2
3 changed files with 5 additions and 3 deletions

View File

@ -519,7 +519,7 @@ public class AttResBase implements Serializable {
*/
@TableField(value="benefit")
@Schema(description="供水效益")
private BigDecimal benefit;
private String benefit;
/**
*

View File

@ -184,6 +184,8 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
ret.add(vo);
}
//倒序输出
ret.sort(Comparator.comparing(StZqrlBVo::getTm).reversed());
return ret;
}

View File

@ -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);