From a8c9e84cbdbacb30eddcfa1825a82b3ab7fb3f37 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 31 Dec 2024 11:03:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E7=9F=A5=E8=AF=86=E5=9B=BE=E8=B0=B1=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=B8=8D=E8=BF=9B=E5=8E=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/domain/TaskCaseRecord.java | 9 ++++++--- .../supervision/police/domain/TaskRecord.java | 8 ++++++-- .../police/service/impl/MroServiceImpl.java | 2 +- .../service/impl/TaskRecordServiceImpl.java | 1 + .../service/impl/TripleInfoServiceImpl.java | 3 --- .../supervision/police/vo/TaskInfoReqVO.java | 17 +++++++++++++++++ src/main/resources/mapper/TaskRecordMapper.xml | 6 +++--- 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/supervision/police/domain/TaskCaseRecord.java b/src/main/java/com/supervision/police/domain/TaskCaseRecord.java index c244db2..a2ae6aa 100644 --- a/src/main/java/com/supervision/police/domain/TaskCaseRecord.java +++ b/src/main/java/com/supervision/police/domain/TaskCaseRecord.java @@ -1,5 +1,6 @@ package com.supervision.police.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,7 +8,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; /** * @TableName task_case_record @@ -59,7 +60,8 @@ public class TaskCaseRecord implements Serializable { /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人ID @@ -69,7 +71,8 @@ public class TaskCaseRecord implements Serializable { /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @Serial @TableField(exist = false) diff --git a/src/main/java/com/supervision/police/domain/TaskRecord.java b/src/main/java/com/supervision/police/domain/TaskRecord.java index 67eb71e..ec51214 100644 --- a/src/main/java/com/supervision/police/domain/TaskRecord.java +++ b/src/main/java/com/supervision/police/domain/TaskRecord.java @@ -1,11 +1,13 @@ package com.supervision.police.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; /** @@ -69,7 +71,8 @@ public class TaskRecord implements Serializable { /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人ID @@ -79,7 +82,8 @@ public class TaskRecord implements Serializable { /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java index 601b38a..dc69c5c 100644 --- a/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/MroServiceImpl.java @@ -41,7 +41,7 @@ public class MroServiceImpl implements MroService { .like(StrUtil.isNotEmpty(caseProcessReqVO.getCaseName()), ModelCase::getCaseName, caseProcessReqVO.getCaseName()) .in(CollUtil.isNotEmpty(caseProcessReqVO.getIdentifyResult()), ModelCase::getIdentifyResult, caseProcessReqVO.getIdentifyResult()) .in(CollUtil.isNotEmpty(caseProcessReqVO.getAnalysisStatus()), ModelCase::getCaseAnalysisStatus, caseProcessReqVO.getAnalysisStatus()) - .orderBy(true, StrUtil.equalsIgnoreCase(caseProcessReqVO.getSort(), "asc"), ModelCase::getCaseAnalysisSuccessTime) + .orderBy(true, StrUtil.equalsIgnoreCase(caseProcessReqVO.getSort(), "desc"), ModelCase::getCaseAnalysisSuccessTime) .page(Page.of(page, size)); final Set processCaseIds = new HashSet<>(); diff --git a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java index ca5ef39..cdbb5a6 100644 --- a/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java @@ -186,6 +186,7 @@ public class TaskRecordServiceImpl extends ServiceImpl queryTaskList(TaskInfoReqVO taskInfo, Integer page, Integer size) { + taskInfo.checkSorted(); return super.getBaseMapper().queryTaskList(taskInfo, Page.of(page, size)); } diff --git a/src/main/java/com/supervision/police/service/impl/TripleInfoServiceImpl.java b/src/main/java/com/supervision/police/service/impl/TripleInfoServiceImpl.java index cad82bc..2cf3cb8 100644 --- a/src/main/java/com/supervision/police/service/impl/TripleInfoServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/TripleInfoServiceImpl.java @@ -33,9 +33,6 @@ public class TripleInfoServiceImpl extends ServiceImpl - + and c.case_name like concat('%',#{taskInfo.caseName},'%') - + and t.status = #{taskInfo.taskStatus} - order by c.create_time #{taskInfo.createTimeSorted} ,t.create_time #{taskInfo.cancelTimeSorted} + order by c.create_time ${taskInfo.createTimeSorted} ,t.create_time ${taskInfo.cancelTimeSorted}