pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -637,7 +637,9 @@ SELECT COUNT(*) AS recordCount FROM rm_open_close_valve_history <where> <if test="closeType != null"> AND cl_type = #{closeType} </if> <if test="timeStart != null and timeStop != null"> AND cl_dt BETWEEN #{timeStart} AND #{timeStop} </if> pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -114,7 +114,7 @@ if(timeStart_open != null && timeStart_open != "") { timeStart_open = timeStart_open + " 00:00:00"; } else { timeStart_open = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString(); timeStart_open = LocalDate.now() + " 00:00:00"; } qo.setTimeStop_open(timeStart_open); @@ -130,7 +130,7 @@ if(timeStart_close != null && timeStart_close != "") { timeStart_close = timeStart_close + " 00:00:00"; } else { timeStart_close = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString(); timeStart_close = LocalDate.now() + " 00:00:00"; } qo.setTimeStart_close(timeStart_close);
@@ -329,7 +329,7 @@ Integer openType = qo.getOpenType(); String openTypeName = ""; if (openType == null){ openTypeName = "未知"; openTypeName = "不知道您要查那种开阀类型"; }else { switch (openType) { case 1: @@ -348,7 +348,7 @@ openTypeName = "开关阀卡开阀"; break; default: openTypeName = "未知"; openTypeName = "不知道您要查那种开阀类型"; } } @@ -374,19 +374,24 @@ */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStop != null) { timeStop = timeStop + " 23:59:59"; if(timeStart != null) { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null) { timeStop = timeStop + " 23:59:59"; }else { timeStart = null; } qo.setTimeStart(timeStart); qo.setTimeStop(timeStop); Integer closeType = qo.getCloseType(); String closeTypeName = ""; if (closeType == null){ closeTypeName = "不知道您要查那种关阀类型"; }else { switch (closeType) { case 2: closeTypeName = "刷卡关阀"; @@ -418,8 +423,10 @@ case 14: closeTypeName = "远程定量关阀"; break; default: closeTypeName = "不知道您要查那种关阀类型"; } } // 生成查询参数 Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ; Integer closeTypeCount = Optional.ofNullable(rmOpenCloseValveLastMapper.getCountByCloseType(params)).orElse(0); pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/CloseTypeQo.java
@@ -19,7 +19,7 @@ /** * 关阀类型 */ @NotNull(message = "关阀类型不能为空") // @NotNull(message = "关阀类型不能为空") private Integer closeType; /** @@ -32,6 +32,6 @@ * 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @NotBlank(message = "结束时间不能为空") // @NotBlank(message = "结束时间不能为空") private String timeStop; }
