修改处置资产，和部门建议列表

pcbms/src/main/java/com/hssx/pcbms/controller/IdeaController.java

@@ -123,14 +123,14 @@ public class IdeaController {
 
     /**
      * 部门建议（领导部门下的所有意见）
-     * time:时间,uid:领导的id
+     * time:时间,uid:领导的id,pageNum:当前页，pageSize：每页多少条
      * @return
      */
     @ApiOperation(value = "部门建议（领导部门下的所有意见）", notes = "部门建议（领导部门下的所有意见）")
     @RequestMapping("/getDeptIdeaLists")
     @ResponseBody
-    public HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO) {
-        return ideaService.getDeptIdeaLists(ideaVO);
+    public HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO,PageUtil page) {
+        return ideaService.getDeptIdeaLists(ideaVO,page);
     }
 
 

pcbms/src/main/java/com/hssx/pcbms/service/IdeaService.java

@@ -28,5 +28,5 @@ public interface IdeaService extends IService<Idea> {
 
     HttpRespMsg getDraft(Idea idea);
 
-    HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO);
+    HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO,PageUtil page);
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/IdeaServiceImpl.java

@@ -126,7 +126,7 @@ public class IdeaServiceImpl extends ServiceImpl<IdeaMapper, Idea> implements Id
     }
 
     @Override
-    public HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO) {
+    public HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO,PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectById(ideaVO.getUid());
         if (user == null) {
@@ -135,7 +135,9 @@ public class IdeaServiceImpl extends ServiceImpl<IdeaMapper, Idea> implements Id
         }
         List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("dept_id", user.getDeptId())).stream().map(User::getId).collect(Collectors.toList());
         if (!userIds.isEmpty()){
-            msg.data = ideaMapper.selectDeptIdeaLists(ideaVO,userIds);
+            PageHelper.startPage(page.getPageNum(),page.getPageSize());
+            PageInfo<IdeaVO> info = new PageInfo<>(ideaMapper.selectDeptIdeaLists(ideaVO,userIds));
+            msg.data = info;
         }
         return msg;
     }

pcbms/src/main/resources/mapper/IdeaMapper.xml

@@ -103,7 +103,7 @@
             </foreach>
             and i.is_draft = 0
             <if test="ideaVO.time != null">
-                and date_format(i.indate,'%Y-%m') = #{time}
+                and date_format(i.indate,'%Y-%m') = #{ideaVO.time}
             </if>
         </where>
         order by i.indate,i.id desc