diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java index 5b1445db95..ff4bdd2285 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java @@ -1,12 +1,15 @@ package com.epmet.controller; -import com.epmet.common.token.annotation.Login; + import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.PointVerificationFormDTO; +import com.epmet.dto.form.ResiCommonUserIdFormDTO; +import com.epmet.dto.form.WorkPointVerificationFormDTO; import com.epmet.dto.result.PointVerificationResultDTO; +import com.epmet.dto.result.WorkPointVerficationListResultDTO; import com.epmet.service.PointVerificationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -40,5 +43,18 @@ public class ExchangeController { return new Result().ok(pointVerificationLogService.verifyPoint(verificationParam)); } + /** + * @Description 获取工作端积分核销记录 + * @param verificationParam + * @return + * @author wangc + * @date 2020.07.24 16:08 + **/ + @PostMapping("recordmonthly") + public Result getStaffVerificationRecordMonthly(@LoginUser TokenDto token,@RequestBody WorkPointVerificationFormDTO verificationParam){ + verificationParam.setStaffId(token.getUserId()); + ValidatorUtils.validateEntity(verificationParam, ResiCommonUserIdFormDTO.UserIdGroup.class); + return new Result().ok(pointVerificationLogService.getStaffVerificationRecordMonthly(verificationParam)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 319b3fa0ce..32d86c57a5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -195,8 +195,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl o.getPoint()).sum() ); }else{ - int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); - int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize(); + int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize(); + int toIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); if(toIndex > dataList.size()) { toIndex = dataList.size(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ac442388ad..f8b68ddb11 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -106,6 +106,7 @@ public class UserBaseInfoRedis { baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); gridParam.setGridId(relation.getGridId()); + baseInfo.setRegisteredGridId(relation.getGridId()); Result gridResult = govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index cfacc58191..11dc871caa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -107,8 +107,8 @@ wechat.USER_ID = #{item} - - AND base.REAL_NAME = #{realName} + + AND (base.REAL_NAME LIKE concat('%',#{realName},'%') OR wechat.NICKNAME LIKE concat('%',#{realName},'%')) ORDER BY base.REAL_NAME , wechat.NICKNAME