From 42b4552a29fab0f4b060972c64b78120a4a3b801 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 12 Sep 2024 10:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E4=BB=BB=E5=8A=A1=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=BD=9C=E5=BA=9F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=9C=A8=E6=9C=80=E5=90=8E=EF=BC=9B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/mapper/AssessTaskMapper.java  | 27 +++++++++++++++++++
 .../xyt/service/AssessTaskService.java        | 19 +------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
index dafb4a0..a1ed9e7 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
@@ -111,4 +111,31 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
             </script>
              """)
     List<AssessTask> resultStat(MonthRangeSo monthRangeSo);
+
+    @Select("""
+            <script>
+                select t.* from public.assess_task t 
+                <where>
+                <if test="obj.taskName != null and obj.taskName != ''">
+                     t.task_name like concat('%', #{obj.taskName}, '%')
+                </if>
+                 <if test="obj.dateRangeSo != null and obj.dateRangeSo.start != null">
+                     and t.start_date <![CDATA[>=]]> #{obj.dateRangeSo.start}
+                </if>  
+                <if test="obj.dateRangeSo != null and obj.dateRangeSo.end != null">
+                    and t.start_date <![CDATA[<=]]> #{obj.dateRangeSo.end}
+                </if>
+                <if test="obj.status != null">
+                    and t.status = #{obj.status}
+                </if>
+                </where>
+                ORDER BY
+                    CASE
+                        WHEN t.status = 4 THEN 1
+                        ELSE 0
+                    END ASC,
+                    t.create_time DESC
+            </script>
+             """)
+    Page<AssessTask> listPage(Page<AssessTask> page,@Param("obj") AssessTaskPageSo page1);
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
index 5628634..6e85915 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
@@ -1,11 +1,8 @@
 package com.gunshi.project.xyt.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.db.dto.MonthRangeSo;
@@ -98,21 +95,7 @@ public class AssessTaskService extends ServiceImpl<AssessTaskMapper, AssessTask>
     }
 
     public Page<AssessTask> listPage(AssessTaskPageSo page) {
-        LambdaQueryWrapper<AssessTask> queryWrapper = Wrappers.lambdaQuery();
-        if (ObjectUtils.isNotNull(page.getTaskName())) {
-            queryWrapper.like(AssessTask::getTaskName, page.getTaskName());
-        }
-        if (page.getStatus() != null) {
-            queryWrapper.eq(AssessTask::getStatus, page.getStatus());
-        }
-        if(page.getDateRangeSo() != null && page.getDateRangeSo().getStart() != null){
-            queryWrapper.ge(AssessTask::getStartDate,page.getDateRangeSo().getStart());
-        }
-        if(page.getDateRangeSo() != null && page.getDateRangeSo().getEnd() != null){
-            queryWrapper.le(AssessTask::getStartDate,page.getDateRangeSo().getEnd());
-        }
-        queryWrapper.orderByDesc(AssessTask::getCreateTime);
-        Page<AssessTask> res = this.page(page.getPageSo().toPage(), queryWrapper);
+        Page<AssessTask> res = this.baseMapper.listPage(page.getPageSo().toPage(), page);
         if (res.getRecords() != null && res.getRecords().size() > 0) {
             for (AssessTask record : res.getRecords()) {
                 record.setAssessObjects(assessObjectService.getObject(record.getId()));