diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/entity/RectificationEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/entity/RectificationEntity.java index 06c412b..8f6f952 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/entity/RectificationEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/train/entity/RectificationEntity.java @@ -37,18 +37,18 @@ public class RectificationEntity extends TenantEntity { private Integer rectificationType; @ApiModelProperty(value = "限时日期") - @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) - @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) private Date limitTime; @ApiModelProperty(value = "提醒日期") - @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) - @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) private Date remindTime; @ApiModelProperty(value = "完成日期") - @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) - @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) private Date completeTime; @ApiModelProperty(value = "问题事项") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/PointServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/PointServiceImpl.java index 6b488f3..36df5b0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/PointServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/PointServiceImpl.java @@ -130,6 +130,9 @@ public class PointServiceImpl implements PointService { return result.getData(); } + + + /** * 历史数据统计 * @param curve diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/controller/RectificationController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/controller/RectificationController.java index fd81ac0..c6a3b99 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/controller/RectificationController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/controller/RectificationController.java @@ -39,6 +39,7 @@ public class RectificationController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "新增违章考核", notes = "传入RectificationEntity") public R save(@RequestBody RectificationEntity entity) { + entity.setStatus(0); return R.status(service.save(entity)); } @@ -64,7 +65,7 @@ public class RectificationController extends BladeController { } @GetMapping("/summary") - @ApiOperationSupport(order = 5) + @ApiOperationSupport(order = 6) @ApiOperation(value = "汇总", notes = "查询条件:站点ID、月份") public R> summary(RectificationParamVo params, Query query) { return R.data(service.summary(params,Condition.getPage(query))); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/mapper/RectificationMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/mapper/RectificationMapper.xml index 7d7114f..2243e3f 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/mapper/RectificationMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/mapper/RectificationMapper.xml @@ -15,6 +15,9 @@ and create_time like concat('%', #{params.month}, '%') + + and rectification_type = #{params.rectificationType} + group by station_id,rectification_type ) a diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/RectificlationServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/RectificlationServiceImpl.java index d2dcbbc..86ad9e6 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/RectificlationServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/train/service/impl/RectificlationServiceImpl.java @@ -43,10 +43,10 @@ public class RectificlationServiceImpl extends ServiceImpl impl if(StringUtil.isNotBlank(params.getStationId())){ wrapper.eq(TrainEntity::getStationId,params.getStartTime()); } - if(StringUtil.isNotBlank(params.getStationId())){ - wrapper.ge(TrainEntity::getStationId,params.getStartTime() + " 00:00:00"); - } if(StringUtil.isNotBlank(params.getStartTime())){ + wrapper.ge(TrainEntity::getTrainStartTime,params.getStartTime() + " 00:00:00"); + } + if(StringUtil.isNotBlank(params.getEndTime())){ wrapper.le(TrainEntity::getTrainStartTime,params.getEndTime() + " 23:59:59"); } return super.page(page,wrapper);