From e479648fdca0080f05c006b3e71d372c1f092f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com>
Date: Mon, 24 Jul 2023 17:13:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=A5=A8=E7=BB=9F=E8=AE=A1=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=96=B0=E5=A2=9E=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardTicket/service/impl/StandardTicketInfoServiceImpl.java  | 6 ++++++
 .../java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java | 6 ++++++
 .../ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java   | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
index 2e0cf6e..1262a20 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
+++ b/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
     public List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
         String flowTaskName = ticketCountQueryVo.getFlowTaskName();
+        String dateTime = ticketCountQueryVo.getDateTime();
         String type = ticketCountQueryVo.getType();
         QueryWrapper<StandardTicketInfoEntity> queryWrapper = new QueryWrapper<>();
         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());
             queryWrapper.lambda().in(BaseEntity::getId, idList);
         }
+
+
+        if (StringUtils.isNotBlank(dateTime)) {
+            queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
+        }
         return baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java
index a32e8dc..0181fd6 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java
+++ b/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 dateTime;
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
index 8c04835..559dd69 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
+++ b/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 type = ticketCountQueryVo.getType();
+
+        String dateTime = ticketCountQueryVo.getDateTime();
         //查询
         QueryWrapper<WorkTicketInfoEntity> queryWrapper = new QueryWrapper<>();
         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)) {
             List<WorkTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(null);