From eff695958926f1a0f57c6f696e957e6b32b67e39 Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Fri, 2 Aug 2024 10:15:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspect/task/controller/TaskController.java    | 10 +++----
 .../hnac/hzinfo/inspect/task/mapper/TaskMapper.xml | 31 +++++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java
index f738356..e7a0b6b 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java
@@ -143,21 +143,17 @@ public class TaskController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperation(value = "分页显示任务列表", notes = "传入task")
-	@Operate(label = "查询巡检任务分页列表-2",type = BusinessType.QUERY,ignore = false)
+	@Operate(label = "查询巡检任务分页列表-2",type = BusinessType.QUERY)
 	public R<BladePage<TaskVo>> list(TaskListQuery task, Query query) {
-		//CacheUtil.put("test#2","inspect","test","12");
-//		LambdaQueryWrapper<TaskEntity> queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task);
-//		queryWrapper.orderByDesc(TaskEntity::getUpdateTime);
-//		IPage<TaskEntity> pages = taskService.page(Condition.getPage(query), queryWrapper);
 		IPage<TaskVo> pages = Condition.getPage(query);
-		if(!AuthUtil.isAdministrator()){
+		if (!AuthUtil.isAdministrator()) {
 			task.setCurUserId(AuthUtil.getUserId());
 			task.setTenantId(AuthUtil.getTenantId());
 		}
 		if (task.getCurUserId() == -1) {
 			task.setCurUserId(null);
 		}
-		List<TaskVo> list = taskService.getListPage(pages,task);
+		List<TaskVo> list = taskService.getListPage(pages, task);
 		pages.setRecords(list);
 		BladePage<TaskVo> bladePage = BladePage.of(pages);
 		return R.data(bladePage);
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
index 261a0c2..7ed3974 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
@@ -132,14 +132,18 @@
     </select>
 
     <select id="getListPage" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
-        SELECT t.*,u.USER_ID from HZ_ST_EX_TASK t
-        LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID
-        where t.IS_DELETED=0 and u.IS_DELETED=0
+        SELECT
+            t.*, u.USER_ID
+        from
+            HZ_ST_EX_TASK t
+            left join HZ_ST_EX_TASK_USER u on t.ID = u.TASK_ID
+        where
+            t.IS_DELETED = 0 and u.IS_DELETED = 0
         <if test="task.dutyId != null ">
-            and t.DUTY_ID=#{task.dutyId}
+            and t.DUTY_ID = #{task.dutyId}
         </if>
         <if test="task.curUserId != null and task.curUserId != ''">
-            and u.USER_ID=#{task.curUserId}
+            and u.USER_ID = #{task.curUserId}
         </if>
         <if test="task.planName != null and task.planName != ''">
             and t.PLAN_NAME like concat('%', #{task.planName}, '%')
@@ -157,31 +161,32 @@
             and t.PLAN_END_TIME &gt;= #{task.startTime}
         </if>
         <if test="task.cycle != null and task.cycle != ''">
-            and t.CYCLE=#{task.cycle}
+            and t.CYCLE = #{task.cycle}
         </if>
         <if test="task.status != null">
-            and t.STATUS=#{task.status}
+            and t.STATUS = #{task.status}
         </if>
         <if test="task.keepOnRecord != null">
-            and t.KEEP_ON_RECORD=#{task.keepOnRecord}
+            and t.KEEP_ON_RECORD = #{task.keepOnRecord}
         </if>
         <if test="task.tenantId != null and task.tenantId != ''">
             and t.TENANT_ID = #{task.tenantId}
         </if>
         <if test="task.autoVideo != null">
-            and t.AUTO_VIDEO=#{task.autoVideo}
+            and t.AUTO_VIDEO = #{task.autoVideo}
         </if>
         <if test="task.taskIds != null and task.taskIds != ''">
-            and FIND_IN_SET(t.ID,#{task.taskIds})
+            and FIND_IN_SET(t.ID, #{task.taskIds})
         </if>
-        <if test="task.areaId != null">
-            and t.CREATE_DEPT = #{task.areaId}
+        <if test="task.createDept != null">
+            and t.CREATE_DEPT = #{task.createDept}
         </if>
         <if test="task.yearMonth != null">
-            and date_format(t.PLAN_START_TIME,'%Y-%m')= #{task.yearMonth}
+            and date_format(t.PLAN_START_TIME,'%Y-%m') = #{task.yearMonth}
         </if>
         order by t.UPDATE_TIME desc
     </select>
+
     <select id="getAllPageList" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
         SELECT
         t.*, b.USER_ID as userIds,