From 25ce94c2600d32ac138e88a43566ac585ef6c4fb Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 23 Aug 2023 14:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E4=BF=AE=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OperAccessTaskController.java       | 19 ++++++--
 .../access/mapper/OperAccessTaskMapper.java        |  3 ++
 .../access/mapper/OperAccessTaskMapper.xml         | 50 +++++++++++++++++++---
 .../access/service/IOperAccessTaskService.java     |  1 +
 .../service/impl/OperAccessTaskServiceImpl.java    |  8 ++++
 5 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java
index c5df91c..de3219d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java
@@ -87,24 +87,37 @@ public class OperAccessTaskController extends BladeController {
 		return service.detail(id);
 	}
 
+
 	/**
 	 * 分页
 	 */
 	@ApiLog
-	@PostMapping("/list")
+	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@OperationAnnotation(moduleName = "检修管理",title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询我的检修任务列表")
 	@ApiOperation(value = "分页 查询参数:name,code,handler,status,planId,planCode")
+	public R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query) {
+		return service.list(req, query);
+	}
+	/**
+	 * 分页
+	 */
+	@ApiLog
+	@PostMapping("/listByStatus")
+	@ApiOperationSupport(order = 50)
+	@OperationAnnotation(moduleName = "检修管理",title = "检修任务",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "分页查询我的检修任务列表")
+	@ApiOperation(value = "分页 查询参数:name,code,handler,status,planId,planCode")
 	public R<IPage<OperAccessTaskVO>> list(@RequestBody OperAccessTaskDTO req) {
 		Query query=new Query();
 		query.setCurrent(req.getCurrent());
 		query.setSize(req.getSize());
-		return service.list(req, query);
+		return service.listByStatus(req, query);
 	}
 
-
 	 /**
 	  * 获取检修台账
 	  */
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java
index b9ca2b3..b45f846 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.java
@@ -28,6 +28,9 @@ public interface OperAccessTaskMapper extends UserDataScopeBaseMapper<OperAccess
 	@UserDataAuth
 	List<OperAccessTaskVO> pageCondition(IPage page, @Param("req") OperAccessTaskDTO req);
 
+
+	List<OperAccessTaskVO> pageConditionByStatus(IPage page, @Param("req") OperAccessTaskDTO req);
+
 	List<OperAccessTaskEntity> selectByEmCode(String emCode,List<String> list);
 
 	@SqlParser(filter = true)
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
index 13cbc3b..6efe664 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
@@ -65,12 +65,7 @@
             <if test="req.code != null and req.code != ''">
                 AND t.`CODE` LIKE CONCAT('%',#{req.code},'%')
             </if>
-            <if test="req.ids != null">
-                AND t.id in
-              <foreach collection="req.ids" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-              </foreach>
-            </if>
+
             <if test="req.handler != null">
                 AND t.`HANDLER`=#{req.handler}
             </if>
@@ -97,7 +92,48 @@
             </if>
         ORDER BY t.create_time DESC
     </select>
-
+    <select id="pageConditionByStatus" resultType="com.hnac.hzims.operational.access.vo.OperAccessTaskVO">
+        SELECT t.*,p.name as planName
+        FROM hzims_oper_access_task t
+        left join hzims_oper_access_plan p
+        on t.plan_id = p.id
+        WHERE
+        t.IS_DELETED =0
+        <if test="req.code != null and req.code != ''">
+            AND t.`CODE` LIKE CONCAT('%',#{req.code},'%')
+        </if>
+        <if test="req.ids != null">
+            AND t.id in
+            <foreach collection="req.ids" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="req.handler != null">
+            AND t.`HANDLER`=#{req.handler}
+        </if>
+        <if test="req.planId != null">
+            AND p.ID =#{req.planId}
+        </if>
+        <if test="req.name != null and req.name != ''">
+            AND t.`NAME` LIKE CONCAT('%',#{req.name},'%')
+        </if>
+        <if test="req.excludeNullTicket != null and req.excludeNullTicket == 1">
+            and t.`TICKET_ID` is null
+        </if>
+        <if test="req.startTime != null and req.startTime != ''">
+            and t.`PLAN_START_TIME` &gt; #{req.startTime}
+        </if>
+        <if test="req.endTime != null and req.startTime != '' ">
+            and t.`PLAN_START_TIME` &lt; #{req.endTime}
+        </if>
+        <if test="req.deptIds != null">
+            and t.create_dept in
+            <foreach collection="req.deptIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        ORDER BY t.create_time DESC
+    </select>
     <select id="selectByEmCode" resultType="com.hnac.hzims.operational.access.entity.OperAccessTaskEntity" parameterType="list">
         select * from hzims_oper_access_task
         where IS_DELETED = 0
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java
index 07012b4..6c1c211 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java
@@ -33,6 +33,7 @@ public interface IOperAccessTaskService extends BaseService<OperAccessTaskEntity
 	R<OperAccessTaskVO> detail(Long id);
 
 	R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query);
+	R<IPage<OperAccessTaskVO>> listByStatus(OperAccessTaskDTO req, Query query);
 
 	List<OperAccessTaskEntity> getByEmCode(String emCode,List<String> list);
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java
index 0aad039..561085b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java
@@ -228,6 +228,14 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl<OperAccessTaskMap
     }
 
     @Override
+    public R<IPage<OperAccessTaskVO>> listByStatus(OperAccessTaskDTO req, Query query) {
+        IPage<OperAccessTaskVO> page = Condition.getPage(query);
+        List<OperAccessTaskVO> data = mapper.pageConditionByStatus(page, req);
+        page.setRecords(OperAccessTaskWrapper.build().listVOExtras(data));
+        return R.data(page);
+    }
+
+    @Override
     public List<OperAccessTaskEntity> getByEmCode(String emCode, List<String> list) {
         return this.baseMapper.selectByEmCode(emCode, list);
     }