From fbe4d1066db027ce6495178c6745d7f823ca9ed9 Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Wed, 17 Jul 2024 17:39:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A5=A8=EF=BC=88=E5=BC=A0?=
 =?UTF-8?q?=E5=90=8C=E6=9C=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OperationTicketController.java | 35 +------------
 .../smart/mapper/OperationTicketMapper.java   |  2 +-
 .../smart/mapper/OperationTicketMapper.xml    | 52 ++++++++++++++-----
 .../service/IOperationTicketService.java      |  2 +-
 .../impl/OperationTicketServiceImpl.java      |  4 +-
 .../modules/smart/vo/OperationTicketVO.java   |  1 +
 6 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java
index 9c11e39..d9849c4 100644
--- a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java
+++ b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java
@@ -94,40 +94,7 @@ public class OperationTicketController extends DafController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入operationTicket")
 	public R<IPage<OperationTicketVO>> page(OperationTicketVO operationTicket, Query query) {
-		QueryWrapper<OperationTicketVO> qw = new QueryWrapper<>();
-		//场站
-		if (null != operationTicket.getStation()) {
-			qw.lambda().eq(OperationTicketVO::getStation, operationTicket.getStation());
-		}
-		//操作票编号
-		if (StringUtil.isNotEmpty(operationTicket.getOperationTicketNo())) {
-			qw.lambda().like(OperationTicketVO::getOperationTicketNo, operationTicket.getOperationTicketNo());
-		}
-		//操作票类型
-		if (StringUtil.isNotEmpty(operationTicket.getOperationTicketType())){
-			qw.lambda().like(OperationTicketVO::getOperationTicketType, operationTicket.getOperationTicketType());
-		}
-		//工作负责人
-		if (StringUtil.isNotEmpty(operationTicket.getWorkLeader())) {
-			qw.lambda().like(OperationTicketVO::getWorkLeader, operationTicket.getWorkLeader());
-		}
-		//作业风险等级
-		if (StringUtil.isNotEmpty(operationTicket.getJobRiskLevel())) {
-			qw.lambda().like(OperationTicketVO::getJobRiskLevel, operationTicket.getJobRiskLevel());
-		}
-		//控制等级
-		if (StringUtil.isNotEmpty(operationTicket.getControlLevel())) {
-			qw.lambda().like(OperationTicketVO::getControlLevel, operationTicket.getControlLevel());
-		}
-		//计划开始时间
-		if (StringUtil.isNotEmpty(operationTicket.getPlannedStartTime())) {
-			qw.lambda().like(OperationTicketVO::getPlannedStartTime, operationTicket.getPlannedStartTime());
-		}
-		//状态
-		if (null != operationTicket.getSts()) {
-			qw.lambda().eq(OperationTicketVO::getSts, operationTicket.getSts());
-		}
-		IPage<OperationTicketVO> pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), qw);
+		IPage<OperationTicketVO> pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), operationTicket);
 		return R.data(pages);
 	}
 
diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java
index 10583d3..8cee9ff 100644
--- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java
+++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java
@@ -30,5 +30,5 @@ public interface OperationTicketMapper extends BaseMapper<OperationTicket> {
 
 	List<OperationTicketExcel> exportData(@Param("entity")OperationTicket operationTicket);
 
-	List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper<OperationTicketVO> queryWrapper);
+	List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("entity")OperationTicket operationTicket);
 }
diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml
index 295a063..9c4001f 100644
--- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml
+++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml
@@ -99,20 +99,44 @@
 
     <select id="selectOperationTicketPageExt" resultMap="operationTicketVOResultMap">
         select
-            count(b.operation_ticket_no) AS operationItemsCount,
+            count(b.id) AS operationItemsCount,
             a.*
         from
             smt_operation_ticket a
                 left join smt_operation_item b
                           on a.operation_ticket_no = b.operation_ticket_no
                               and b.is_deleted = 0
-            <if test="ew.customSqlSegment!=null and ew.customSqlSegment!=''">
-                ${ew.customSqlSegment} and a.is_deleted = 0
-            </if>
-            <if test="ew.customSqlSegment==null or ew.customSqlSegment==''">
-                where a.is_deleted = 0
-            </if>
-
+<!--            <if test="ew.customSqlSegment!=null and ew.customSqlSegment!=''">-->
+<!--                ${ew.customSqlSegment} and a.is_deleted = 0-->
+<!--            </if>-->
+<!--            <if test="ew.customSqlSegment==null or ew.customSqlSegment==''">-->
+<!--                where a.is_deleted = 0-->
+<!--            </if>-->
+        where a.is_deleted = 0
+        <if test="entity.station != null and entity.station != ''">
+            AND a.station = #{entity.station}
+        </if>
+        <if test="entity.operationTicketNo != null and entity.operationTicketNo != ''">
+            AND a.operation_ticket_no LIKE CONCAT('%', #{entity.operationTicketNo}, '%')
+        </if>
+        <if test="entity.operationTicketType != null and entity.operationTicketType != ''">
+            AND a.operation_ticket_type LIKE CONCAT('%',#{entity.operationTicketType}, '%')
+        </if>
+        <if test="entity.workLeader != null and entity.workLeader != ''">
+            AND a.work_leader LIKE CONCAT('%',#{entity.workLeader}, '%')
+        </if>
+        <if test="entity.jobRiskLevel != null and entity.jobRiskLevel != ''">
+            AND a.job_risk_level LIKE CONCAT('%',#{entity.jobRiskLevel}, '%')
+        </if>
+        <if test="entity.controlLevel != null and entity.controlLevel != ''">
+            AND a.control_level LIKE CONCAT('%',#{entity.controlLevel}, '%')
+        </if>
+        <if test="entity.plannedStartTime != null and entity.plannedStartTime != ''">
+            AND a.planned_start_time LIKE CONCAT('%',#{entity.plannedStartTime}, '%')
+        </if>
+        <if test="entity.sts != null and entity.sts != ''">
+            AND a.sts = #{entity.sts}
+        </if>
         group by
             b.operation_ticket_no
                , a.id
@@ -137,22 +161,22 @@
             AND a.station = #{entity.station}
         </if>
         <if test="entity.operationTicketNo != null and entity.operationTicketNo != ''">
-            AND a.operation_ticket_no LIKE #{entity.operation_ticket_no}
+            AND a.operation_ticket_no LIKE #{entity.operationTicketNo}
         </if>
         <if test="entity.operationTicketType != null and entity.operationTicketType != ''">
-            AND a.operation_ticket_type LIKE #{entity.operation_ticket_type}
+            AND a.operation_ticket_type LIKE #{entity.operationTicketType}
         </if>
         <if test="entity.workLeader != null and entity.workLeader != ''">
-            AND a.work_leader LIKE #{entity.work_leader}
+            AND a.work_leader LIKE #{entity.workLeader}
         </if>
         <if test="entity.jobRiskLevel != null and entity.jobRiskLevel != ''">
-            AND a.job_risk_level LIKE #{entity.job_risk_level}
+            AND a.job_risk_level LIKE #{entity.jobRiskLevel}
         </if>
         <if test="entity.controlLevel != null and entity.controlLevel != ''">
-            AND a.control_level LIKE #{entity.control_level}
+            AND a.control_level LIKE #{entity.controlLevel}
         </if>
         <if test="entity.plannedStartTime != null and entity.plannedStartTime != ''">
-            AND a.planned_start_time LIKE #{entity.planned_start_time}
+            AND a.planned_start_time LIKE #{entity.plannedStartTime}
         </if>
         <if test="entity.sts != null and entity.sts != ''">
             AND a.sts = #{entity.sts}
diff --git a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java
index 32a9c5b..ed3177c 100644
--- a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java
+++ b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java
@@ -26,7 +26,7 @@ public interface IOperationTicketService extends BaseService<OperationTicket> {
 	 */
 	IPage<OperationTicketVO> selectOperationTicketPage(IPage<OperationTicketVO> page, OperationTicketVO operationTicket);
 
-	IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper);
+	IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page,OperationTicket operationTicket);
 
 	/**
 	 * 获取导出数据
diff --git a/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java
index 5edad37..85cfe8b 100644
--- a/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java
+++ b/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java
@@ -27,8 +27,8 @@ public class OperationTicketServiceImpl extends BaseServiceImpl<OperationTicketM
 	}
 
 	@Override
-	public IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper) {
-		return page.setRecords(baseMapper.selectOperationTicketPageExt(page, wrapper));
+	public IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, OperationTicket operationTicket) {
+		return page.setRecords(baseMapper.selectOperationTicketPageExt(page, operationTicket));
 	}
 
 	@Override
diff --git a/src/main/java/org/energy/modules/smart/vo/OperationTicketVO.java b/src/main/java/org/energy/modules/smart/vo/OperationTicketVO.java
index 713b5bd..1f532ce 100644
--- a/src/main/java/org/energy/modules/smart/vo/OperationTicketVO.java
+++ b/src/main/java/org/energy/modules/smart/vo/OperationTicketVO.java
@@ -19,4 +19,5 @@ public class OperationTicketVO extends OperationTicket {
 
 	//操作项目数
 	private int operationItemsCount;
+
 }