积分bug修改

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<PointVerificationResultDTO>().ok(pointVerificationLogService.verifyPoint(verificationParam));
     }
 
+    /**
+     * @Description 获取工作端积分核销记录
+     * @param verificationParam
+     * @return
+     * @author wangc
+     * @date 2020.07.24 16:08
+     **/
+    @PostMapping("recordmonthly")
+    public Result<WorkPointVerficationListResultDTO> getStaffVerificationRecordMonthly(@LoginUser TokenDto token,@RequestBody WorkPointVerificationFormDTO verificationParam){
+        verificationParam.setStaffId(token.getUserId());
+        ValidatorUtils.validateEntity(verificationParam, ResiCommonUserIdFormDTO.UserIdGroup.class);
+        return new  Result<WorkPointVerficationListResultDTO>().ok(pointVerificationLogService.getStaffVerificationRecordMonthly(verificationParam));
+    }
 
 }

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<PointVerifi
                         dataList.stream().mapToInt(o -> o.getPoint()).sum()
                 );
             }else{
-                int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize();
+                int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize();
-                int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize();
+                int toIndex = verificationParam.getPageNo()  * verificationParam.getPageSize();
                 if(toIndex > dataList.size()) {
                     toIndex = dataList.size();
                 }

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<BelongGridNameResultDTO> gridResult =
                         govOrgOpenFeignClient.getGridNameByGridId(gridParam);
                     if(gridResult.success() && null != gridResult.getData()

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -107,8 +107,8 @@
             <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
                 wechat.USER_ID = #{item}
             </foreach>
-            <if test='null != realName and "" != reamName'>
+            <if test='null != realName and "" != realName'>
-                AND base.REAL_NAME = #{realName}
+                AND (base.REAL_NAME LIKE concat('%',#{realName},'%') OR wechat.NICKNAME LIKE concat('%',#{realName},'%'))
             </if>
         ORDER BY
            base.REAL_NAME , wechat.NICKNAME