修改编号不带-

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

@@ -120,5 +120,19 @@ public class IdeaController {
         return msg;
     }
 
+
+    /**
+     * 部门建议（领导部门下的所有意见）
+     * time:时间,uid:领导的id
+     * @return
+     */
+    @ApiOperation(value = "部门建议（领导部门下的所有意见）", notes = "部门建议（领导部门下的所有意见）")
+    @RequestMapping("/getDeptIdeaLists")
+    @ResponseBody
+    public HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO) {
+        return ideaService.getDeptIdeaLists(ideaVO);
+    }
+
+
 }
 

pcbms/src/main/java/com/hssx/pcbms/entity/vo/IdeaVO.java

@@ -16,4 +16,6 @@ import java.util.List;
 public class IdeaVO extends Idea {
     private IdeaComment ideaComment;
     private String time;
+    private String name;
+
 }

pcbms/src/main/java/com/hssx/pcbms/mapper/IdeaMapper.java

@@ -23,4 +23,6 @@ public interface IdeaMapper extends BaseMapper<Idea> {
     List<Idea> getIdeaScoreLists(@Param("ideaVO")IdeaVO ideaVO);
 
     void updateListByTime(@Param("score")Score score);
+
+    List<IdeaVO> selectDeptIdeaLists(@Param("ideaVO") IdeaVO ideaVO, @Param("ids")List<Integer> userIds);
 }

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

@@ -27,4 +27,6 @@ public interface IdeaService extends IService<Idea> {
     HttpRespMsg getAdviceScore(IdeaVO ideaVO);
 
     HttpRespMsg getDraft(Idea idea);
+
+    HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO);
 }

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

@@ -232,7 +232,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         } else if (goodsNo.getState() == 1) {
             nowState = "在用";
             User usering = userMapper.selectById(goodsNo.getUserId());
-            nowState = nowState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
+            nowState=(usering==null)?"其他":nowState + ("(" + usering.getName() + "/" + usering.getPhone() + ")");
         } else if (goodsNo.getState() == 3) {
             nowState = "报废";
         }

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

@@ -1,4 +1,5 @@
 package com.hssx.pcbms.service.impl;
+import	java.lang.ref.Reference;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -6,10 +7,12 @@ import com.github.pagehelper.PageInfo;
 import com.hssx.pcbms.entity.Idea;
 import com.hssx.pcbms.entity.IdeaComment;
 import com.hssx.pcbms.entity.Score;
+import com.hssx.pcbms.entity.User;
 import com.hssx.pcbms.entity.vo.IdeaVO;
 import com.hssx.pcbms.mapper.IdeaCommentMapper;
 import com.hssx.pcbms.mapper.IdeaMapper;
 import com.hssx.pcbms.mapper.ScoreMapper;
+import com.hssx.pcbms.mapper.UserMapper;
 import com.hssx.pcbms.service.IdeaService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
@@ -32,6 +35,8 @@ public class IdeaServiceImpl extends ServiceImpl<IdeaMapper, Idea> implements Id
     private IdeaCommentMapper ideaCommentMapper;
     @Resource
     private ScoreMapper scoreMapper;
+    @Resource
+    private UserMapper userMapper;
 
     @Override
     public HttpRespMsg add(Idea idea) {
@@ -119,4 +124,19 @@ public class IdeaServiceImpl extends ServiceImpl<IdeaMapper, Idea> implements Id
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getDeptIdeaLists(IdeaVO ideaVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectById(ideaVO.getUid());
+        if (user == null) {
+            msg.setError("用户不存在或出现身份异常，请联系管理员");
+            return msg;
+        }
+        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);
+        }
+        return msg;
+    }
 }

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

@@ -26,6 +26,7 @@
         <result column="uid" property="uid" />
         <result column="idea_indate" property="indate" />
         <result column="idea_content" property="content" />
+        <result column="name" property="name"/>
         <result column="score" property="score" />
         <result column="is_draft" property="isDraft" />
         <result column="is_evaluated" property="isEvaluated" />
@@ -86,4 +87,26 @@
           and uid = #{score.uid,jdbcType=INTEGER}
     </update>
 
+    <select id="selectDeptIdeaLists" resultMap="BaseResultMapVO">
+        select
+        i.id, i.uid,u.name, i.indate idea_indate, i.content idea_content, i.score, i.is_draft, i.is_evaluated, i.score_id,
+        ic.id cid,ic.idea_id, ic.content, ic.responder_id, ic.responder, ic.indate
+        from
+        idea i
+        left join idea_comment ic
+        on i.id = ic.idea_id
+        left join user u
+        on u.id = i.uid
+        <where>
+            <foreach collection="ids" separator="," index="index" item="item" close=")" open="i.uid in (">
+                #{item}
+            </foreach>
+            and i.is_draft = 0
+            <if test="ideaVO.time != null">
+                and date_format(i.indate,'%Y-%m') = #{time}
+            </if>
+        </where>
+        order by i.indate,i.id desc
+    </select>
+
 </mapper>