POINT USER 修改

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java

@@ -190,13 +190,13 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
             }
             List<WorkPointVerificationLogResultDTO> dataList =
                     baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date));
-            if(NumConstant.ONE < verificationParam.getPageNo()){
+            if(NumConstant.ONE == verificationParam.getPageNo()){
                 result.setTotalPoint(
                         dataList.stream().mapToInt(o -> 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();
                 }
@@ -209,13 +209,13 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
             boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
             for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){
 
-                WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO();
+                WorkPointVerificationDetailResultDTO o = ConvertUtils.sourceToTarget(dataList.get(i),WorkPointVerificationDetailResultDTO.class);
                 o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString());
-                o.setRemark(dataList.get(i).getRemark());
                 if(userRequestCallback) {
                     //如果是陌生人显示微信昵称
                     o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName()));
                 }
+
                 resultObj.add(o);
             }
 

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()
@@ -125,6 +126,7 @@ public class UserBaseInfoRedis {
                         }
                         baseInfo.setShowName(buffer.toString());
                     }
+                }
             }else{
                 //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id
                 LatestGridInfoResultDTO gridLatest =
@@ -136,7 +138,7 @@ public class UserBaseInfoRedis {
             set(baseInfo);
             return baseInfo;
         }
-        }
+
         return null;
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -197,7 +197,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
             if(StringUtils.isNotBlank(info.getUserId())){
                 UserBaseInfoResultDTO cache = userBaseInfoRedis.getUserInfo(info.getUserId());
                 if(null != cache) {
-                    info.setRegisteredGrid(cache.getRegisteredGridName());
+                    info.setRegisteredGrid(StringUtils.isBlank(cache.getRegisteredGridName()) ? ModuleConstant.EMPTY_STR : cache.getRegisteredGridName());
                 }
             }
         });

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

@@ -29,7 +29,7 @@
     <select id="selectListByUserIdList" parameterType="java.lang.String" resultType="com.epmet.dto.result.UserBaseInfoResultDTO">
         SELECT
         ubi.id,
-            ubi.USER_ID,
+        wechat.USER_ID,
         ubi.MOBILE,
         ubi.SURNAME,
         ubi.`NAME`,
@@ -39,13 +39,17 @@
         ubi.STREET,
         ubi.DISTRICT,
         ubi.BUILDING_ADDRESS,
-            ubi.NICKNAME,
-            ubi.HEAD_IMG_URL
+        wechat.NICKNAME,
+        wechat.HEAD_IMG_URL
     FROM
-            user_base_info ubi
-        WHERE
-            ubi.DEL_FLAG = '0'
+        user_wechat wechat
+        LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID
+        AND wechat.DEL_FLAG = '0'
+        AND ubi.DEL_FLAG = '0'
         AND ubi.USER_ID = #{userId}
+    WHERE
+        wechat.USER_ID = #{userId}
+
     </select>
 
     <!-- 根据用户id获取user_wechat表微信用户基本信息   -->

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

@@ -94,9 +94,9 @@
     <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
         SELECT
         wechat.USER_ID,
-            wechat.NICKNAME AS userNickname,
-            wechat.HEAD_IMG_URL AS userHeadPhoto,
-            base.REAL_NAME AS userName
+        IFNULL(wechat.NICKNAME,'') AS userNickname,
+        IFNULL(wechat.HEAD_IMG_URL,'') AS userHeadPhoto,
+        IFNULL(base.REAL_NAME,'') AS userName
         FROM
             user_wechat wechat
         LEFT JOIN