修改

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<AcitveProductDeptEntity> {
 
-    int selectProductByDeptId(PointExchangeFormDTO formDTO);
+    Integer selectProductByDeptId(PointExchangeFormDTO formDTO);
 }

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<AcitveProductInfoEntity> {
      * @author qushutong
      * @date 2021/9/29 14:31
      */
-    int getResidueByProductId(PointExchangeFormDTO formDTO);
+    Integer getResidueByProductId(PointExchangeFormDTO formDTO);
 }

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<ActivePointLogEntity> {
      * @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<ActivePointLogEntity> {
      * @author qushutong
      * @date 2021/9/29 16:31
      */
-    int selectIsSignIn(PointLogFormDTO pointLogFormDTO);
+    Integer selectIsSignIn(PointLogFormDTO pointLogFormDTO);
 }

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 &lt; NOW()
+        AND info.END_TIME &gt; NOW()
         AND info.STATE = '1'
         AND info.`NAME` LIKE '%' #{searchKey} '%'
         AND info.DEL_FLAG = '0'

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'
             )