From 1ec4d99326cb8c39d93c8857e16be8a3fb95046b Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Thu, 18 Jul 2024 10:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkPermitController.java      | 18 ++++++++++-------
 .../modules/smart/mapper/WorkPermitMapper.xml | 20 +++++++++----------
 .../energy/modules/smart/vo/WorkPermitVO.java |  2 ++
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java
index 5e02f62..2d761d2 100644
--- a/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java
+++ b/src/main/java/org/energy/modules/smart/controller/WorkPermitController.java
@@ -52,7 +52,9 @@ import com.dayu.daf.core.boot.ctrl.DafController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -88,9 +90,8 @@ public class WorkPermitController extends DafController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入workPermit")
-	public R<IPage<WorkPermit>> list(WorkPermit workPermit, Query query) {
+	public R<IPage<WorkPermit>> list(WorkPermitVO workPermit, Query query) {
 		QueryWrapper<WorkPermit> qw = new QueryWrapper<>();
-		qw.orderByAsc("eq_ledger_code");
 		//场站
 		if (null != workPermit.getStations()) {
 			qw.lambda().eq(WorkPermit::getStations, workPermit.getStations());
@@ -115,15 +116,18 @@ public class WorkPermitController extends DafController {
 		if (StringUtil.isNotEmpty(workPermit.getIssuer())) {
 			qw.lambda().like(WorkPermit::getIssuer, workPermit.getIssuer());
 		}
-	//计划开始时间
-		if (null != workPermit.getPlanStartDate()) {
-			qw.lambda().like(WorkPermit::getPlanStartDate, workPermit.getPlanStartDate());
-		}
+
 		//工作负责人
 		if (StringUtil.isNotEmpty(workPermit.getWorkChargePerson())) {
 			qw.lambda().like(WorkPermit::getWorkChargePerson, workPermit.getWorkChargePerson());
 		}
-		IPage<WorkPermit> pages = workPermitService.page(Condition.getPage(query), Condition.getQueryWrapper(workPermit));
+
+		//计划开始时间
+		if (null != workPermit.getPlanStartDateExt()) {
+			String planStartDate = workPermit.getPlanStartDateExt().substring(0,10);
+			qw.lambda().last(" and plan_start_date >= TO_TIMESTAMP('"+planStartDate + " 00:00:00','YYYY-MM-DD HH24:MI:SS')");
+		}
+		IPage<WorkPermit> pages = workPermitService.page(Condition.getPage(query), qw);
 		return R.data(pages);
 	}
 
diff --git a/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml
index a7c5078..95ad774 100644
--- a/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml
+++ b/src/main/java/org/energy/modules/smart/mapper/WorkPermitMapper.xml
@@ -68,31 +68,31 @@
              , work_state
              , check_status
         from
-            smt_work_permit
-        where is_deleted = 0
+            smt_work_permit a
+        where a.is_deleted = 0
         <if test="vo.workTicketNo != null and vo.workTicketNo != ''">
-            and a.work_ticket_no = #{vo.workTicketNo}
+            and a.work_ticket_no LIKE CONCAT('%', #{vo.workTicketNo}, '%')
         </if>
         <if test="vo.workTicketType != null and vo.workTicketType != ''">
-            and a.work_ticket_type = #{vo.workTicketType}
+            and a.work_ticket_type LIKE CONCAT('%', #{vo.workTicketType}, '%')
         </if>
         <if test="vo.workChargePerson != null and vo.workChargePerson != ''">
-            and a.work_charge_person = #{vo.workChargePerson}
+            and a.work_charge_person LIKE CONCAT('%', #{vo.workChargePerson}, '%')
         </if>
         <if test="vo.licensors != null and vo.licensors != ''">
-            and a.licensors = #{vo.licensors}
+            and a.licensors LIKE CONCAT('%', #{vo.licensors}, '%')
         </if>
         <if test="vo.issuer != null and vo.issuer != ''">
-            and a.issuer = #{vo.issuer}
+            and a.issuer LIKE CONCAT('%', #{vo.issuer}, '%')
         </if>
-        <if test="vo.planStartDate != null and vo.planStartDate != ''">
-            and a.plan_start_date = #{vo.planStartDate}
+        <if test="vo.planStartDateExt != null and vo.planStartDateExt != ''">
+            and a.plan_start_date &gt;= TO_TIMESTAMP(#{vo.planStartDateExt},'Dy Mon DD YYYY HH24:MI:SS')AT TIME ZONE 'GMT-8'
         </if>
         <if test="vo.workState != null and vo.workState != ''">
             and a.work_state = #{vo.workState}
         </if>
         <if test="vo.stations != null and vo.stations != ''">
-            and b.stations = ${vo.stations}
+            and a.stations = #{vo.stations}
         </if>
     </select>
 
diff --git a/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java b/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java
index e333ff3..9934013 100644
--- a/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java
+++ b/src/main/java/org/energy/modules/smart/vo/WorkPermitVO.java
@@ -17,4 +17,6 @@ import io.swagger.annotations.ApiModel;
 public class WorkPermitVO extends WorkPermit {
 	private static final long serialVersionUID = 1L;
 
+	private String planStartDateExt;
+
 }