Browse Source

两票统计分析新增日期查询

zhongwei
段飞宇 1 year ago
parent
commit
e479648fdc
  1. 6
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
  2. 6
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java
  3. 5
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

6
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java

@ -713,6 +713,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
@Override @Override
public List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { public List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
String flowTaskName = ticketCountQueryVo.getFlowTaskName(); String flowTaskName = ticketCountQueryVo.getFlowTaskName();
String dateTime = ticketCountQueryVo.getDateTime();
String type = ticketCountQueryVo.getType(); String type = ticketCountQueryVo.getType();
QueryWrapper<StandardTicketInfoEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<StandardTicketInfoEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(StringUtils.isNotBlank(type), StandardTicketInfoEntity::getTicketType, type); queryWrapper.lambda().eq(StringUtils.isNotBlank(type), StandardTicketInfoEntity::getTicketType, type);
@ -735,6 +736,11 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList()); evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
queryWrapper.lambda().in(BaseEntity::getId, idList); queryWrapper.lambda().in(BaseEntity::getId, idList);
} }
if (StringUtils.isNotBlank(dateTime)) {
queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
}
return baseMapper.selectList(queryWrapper); return baseMapper.selectList(queryWrapper);
} }
} }

6
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java

@ -31,4 +31,10 @@ public class TicketCountQueryVo {
* 合格 * 合格
*/ */
private String qualified; private String qualified;
/**
* 时间
*/
private String dateTime;
} }

5
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@ -1148,6 +1148,8 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
String qualified = ticketCountQueryVo.getQualified(); String qualified = ticketCountQueryVo.getQualified();
String type = ticketCountQueryVo.getType(); String type = ticketCountQueryVo.getType();
String dateTime = ticketCountQueryVo.getDateTime();
//查询 //查询
QueryWrapper<WorkTicketInfoEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<WorkTicketInfoEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(StringUtils.isNotBlank(type), WorkTicketInfoEntity::getType, queryWrapper.lambda().eq(StringUtils.isNotBlank(type), WorkTicketInfoEntity::getType,
@ -1163,6 +1165,9 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
} }
if (StringUtils.isNotBlank(dateTime)) {
queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
}
//合格 //合格
if (StringUtils.isNoneBlank(qualified) && "合格".equals(qualified)) { if (StringUtils.isNoneBlank(qualified) && "合格".equals(qualified)) {
List<WorkTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(null); List<WorkTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(null);

Loading…
Cancel
Save