From 386e5c4060f74cb4a14549df77d862a34f9428a6 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 29 Mar 2022 09:53:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA=E5=8F=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/system/domain/SysLogininfor.java | 10 ++++++++++ .../resources/mapper/system/SysLogininforMapper.xml | 3 +++ 2 files changed, 13 insertions(+) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/SysLogininfor.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/SysLogininfor.java index 473c6951..fd6919f0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/SysLogininfor.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/domain/SysLogininfor.java @@ -41,6 +41,16 @@ public class SysLogininfor extends BaseEntity @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date accessTime; + private String ids; + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } + public Long getInfoId() { return infoId; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 7828f474..a6f878ed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(access_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + + and find_in_set(info_id, #{ids}) + order by info_id desc From 9ffb5dc495cd07dcf2a663a0ae4ae7d061c0ec9f Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 29 Mar 2022 10:18:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AF=BC=E5=87=BA=E5=8F=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/system/api/domain/SysOperLog.java | 10 ++++++++++ .../main/resources/mapper/system/SysOperLogMapper.xml | 3 +++ 2 files changed, 13 insertions(+) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysOperLog.java index 6d57761b..dc98a3c6 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysOperLog.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysOperLog.java @@ -80,6 +80,16 @@ public class SysOperLog extends BaseEntity @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operTime; + private String ids; + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } + public Long getOperId() { return operId; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index c83bc89e..dd59a563 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -59,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + + and find_in_set(oper_id, #{ids}) + order by oper_id desc