【网格实体化运作】分值计算逻辑修改-王公峰-2020-09-07

esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogListFormDTO.java

@@ -53,4 +53,9 @@ public class PointsLogListFormDTO implements Serializable {
     @NotBlank(message = "时间戳不能为空")
     private String timestamp;
 
+    /**
+     * 用户id
+     */
+    private String userId;
+
 }

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AppAcitveDao.xml

@@ -113,6 +113,9 @@
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(a.OPERATION_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
+        <if test="userId != null and userId != ''">
+            and a.USER_ID = #{userId}
+        </if>
         order by a.OPERATION_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>