Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -49,6 +50,7 @@
            "w.finish_at, " +
            "w.aim_num, " +
            "w.img_height, " +
            "w.handle_id, " +
            "w.create_at  " +
            "FROM " +
            "com_act_micro_wish w " +
@@ -136,6 +138,7 @@
            "w.evaluate_at, " +
            "w.img_width, " +
            "w.img_height, " +
            "w.handle_id, " +
            "w.evaluate  " +
            "FROM " +
            "com_act_micro_wish w " +
@@ -226,4 +229,14 @@
            "ORDER BY  camw.create_at desc "+
            " </script>")
    IPage<MicroListVO> getScreenMicroList(Page page, @Param("microListDTO") ScreenMicroListDTO microListDTO);

    /**
     * 微心愿处理人列表
     * @param communityId   社区id
     * @param type  处理人类型（1.后台用户  2.党员  3.志愿者）
     * @return  处理人列表
     */
    List<SysUserVO> getWishHandleListAdmin(@Param("type") Integer type,@Param("communityId") Long communityId);

    SysUserVO getUserByUserId(@Param("userId") Long userId);
}