diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java index 2193d40b3..4d81bbeff 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java @@ -120,4 +120,15 @@ public class ActivePointLogController { public Result getIsSignIn(@RequestBody PointLogFormDTO pointLogFormDTO) { return new Result().ok(activePointLogService.getIsSignIn(pointLogFormDTO)); } + + /** + * 获取积分总数 + * @param params + * @return + */ + @GetMapping("getTotal") + public Result getTotal(@RequestParam Map params) { + Integer total = activePointLogService.getTotal(params); + return new Result().ok(total); + } } 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 bc1f92cdc..c28a3daf5 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 @@ -73,4 +73,13 @@ public interface ActivePointLogDao extends BaseDao { * @date 2021/9/29 16:31 */ Integer selectIsSignIn(PointLogFormDTO pointLogFormDTO); + + /** + * 获取积分总数 + * + * @param params + * @return + */ + Integer getTotal(Map params); + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java index 6ccd38785..04555f434 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java @@ -118,4 +118,11 @@ public interface ActivePointLogService extends BaseService * @date 2021/9/29 16:30 */ String getIsSignIn(PointLogFormDTO pointLogFormDTO); + + /** + * 获取积分总数 + * @param params + * @return + */ + Integer getTotal(Map params); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java index 63dfeac6d..f5def3d74 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java @@ -216,4 +216,17 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl params) { + Integer total = baseDao.getTotal(params); + return total; + } } 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 9df63e45e..c1ab36683 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 @@ -56,6 +56,12 @@ and FIND_IN_SET( #{deptId}, ALL_DEPT_IDS ) + + and MOBILE like '%' #{mobile} '%' + + + and OPERATION_DESC like '%' #{operationDesc} '%' + order by UPDATED_TIME desc @@ -102,5 +108,28 @@ AND lg.DEL_FLAG = '0' AND DATE_FORMAT(lg.CREATED_TIME, '%Y%m%d') =DATE_FORMAT(NOW(), '%Y%m%d') + + +