积分记录入参epmetUserIdList

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

@@ -571,7 +571,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
      */
     @Override
     public PageData<ResiPointPageResDTO> pageUserPoint(IcResiPointPageFormDTO formDTO) {
-        if(StringUtils.isBlank(formDTO.getEpmetUserId())){
+        if(org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){
             return new PageData<ResiPointPageResDTO>(new ArrayList<>(),NumConstant.ZERO);
         }
         PageInfo<ResiPointPageResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -52,7 +52,9 @@
             USER_POINT_ACTION_LOG
         WHERE
             DEL_FLAG = '0'
-        AND USER_ID = #{epmetUserId}
+        <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
+            USER_ID = #{epmetUserId}
+        </foreach>
         ORDER BY
             CREATED_TIME DESC
     </select>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 
 @Data
@@ -11,7 +12,7 @@ public class PageUserReportEventFormDTO implements Serializable {
     public interface AddUserInternalGroup {
     }
     //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class)
-    private String epmetUserId;
+    private List<String> epmetUserIdList;
     @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
     private Integer pageNo;
     @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)