From 47723f869e8dce815ee1e9b13cbef349eabf1a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 29 Sep 2021 18:29:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dao/AcitveProductDeptDao.java | 2 +- .../java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java | 2 +- .../main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java | 4 ++-- .../src/main/resources/mapper/AcitveProductInfoDao.xml | 4 ++-- .../src/main/resources/mapper/ActivePointLogDao.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductDeptDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductDeptDao.java index 80ff88f2c..47112a211 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductDeptDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductDeptDao.java @@ -31,5 +31,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AcitveProductDeptDao extends BaseDao { - int selectProductByDeptId(PointExchangeFormDTO formDTO); + Integer selectProductByDeptId(PointExchangeFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java index ed48ced44..f6ad9b332 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java @@ -65,5 +65,5 @@ public interface AcitveProductInfoDao extends BaseDao { * @author qushutong * @date 2021/9/29 14:31 */ - int getResidueByProductId(PointExchangeFormDTO formDTO); + Integer getResidueByProductId(PointExchangeFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java index 689614dfc..977ceee54 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java @@ -63,7 +63,7 @@ public interface ActivePointLogDao extends BaseDao { * @author qushutong * @date 2021/9/28 10:46 */ - int selectDoubleTimeCount(String userId); + Integer selectDoubleTimeCount(String userId); /*** * 判断是否签到 @@ -72,5 +72,5 @@ public interface ActivePointLogDao extends BaseDao { * @author qushutong * @date 2021/9/29 16:31 */ - int selectIsSignIn(PointLogFormDTO pointLogFormDTO); + Integer selectIsSignIn(PointLogFormDTO pointLogFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml index 7ac4cb803..9ff506983 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml @@ -88,8 +88,8 @@ ex.PRODUCT_ID = info.ID ) ) > 0 - AND info.START_TIME < NOW() - AND info.END_TIME > NOW() + AND info.START_TIME < NOW() + AND info.END_TIME > NOW() AND info.STATE = '1' AND info.`NAME` LIKE '%' #{searchKey} '%' AND info.DEL_FLAG = '0' diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml index f89e4eaee..72c8ec4ff 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml @@ -73,7 +73,7 @@ FROM epdc_active_point_log pl WHERE - DATE_FORMAT(pl.CREATED_TIME, '%Y%m%d') > DATE_FORMAT( + DATE_FORMAT(pl.CREATED_TIME, '%Y%m%d') > DATE_FORMAT( date_sub(now(), INTERVAL 4 DAY), '%Y%m%d' )