添加资产编号

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

@@ -89,7 +89,7 @@ public class ScoreController {
     }
     /**
      * 根据日期获取评分详情
-     * 参数：time:时间 2019-12
+     * 参数：time:时间 2019-12 ，uid：被打分人id
      *
      * @return
      */
@@ -99,7 +99,7 @@ public class ScoreController {
     public HttpRespMsg getDetailByTimeAndUid(Score score,String time) {
         HttpRespMsg msg = new HttpRespMsg();
         try {
-             msg = scoreService.detail(score);
+             msg = scoreService.getDetailByTimeAndUid(score,time);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -16,5 +16,6 @@ import java.util.List;
 public class ScoreVO extends Score {
     private String time;
     private List<IdeaVO> ideaVO;
+    private Double ideaScoreSum;
 
 }

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

@@ -22,4 +22,6 @@ public interface ScoreService extends IService<Score> {
     HttpRespMsg getList(Score score,PageUtil page);
 
     HttpRespMsg detail(Score score);
+
+    HttpRespMsg getDetailByTimeAndUid(Score score,String time);
 }

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

@@ -109,6 +109,26 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getDetailByTimeAndUid(Score score,String time) {
+        HttpRespMsg msg = new HttpRespMsg();
+        ScoreVO vo = new ScoreVO();
+        Score oldScore = scoreMapper.selectOne(new QueryWrapper<Score>().eq("scoring_year_month",time));
+        if(oldScore != null){
+            BeanUtils.copyProperties(oldScore,vo);
+            Idea idea = new Idea();
+            idea.setUid(score.getUid());
+            List<IdeaVO> ideaVos = ideaMapper.getIdeaListByUid(idea, time);
+            if(ideaVos.size()>0){
+//                vo.setIdeaVO(ideaVos);
+                double sum = ideaVos.stream().filter(x -> x.getScore() != null).mapToDouble(Idea::getScore).sum();
+                vo.setIdeaScoreSum(sum);
+            }
+            msg.data = vo;
+        }
+        return msg;
+    }
+
     private HttpRespMsg addScore(Date yearMonth, Date nowDate, Integer type, Score score,Score oldScore) {
         HttpRespMsg msg = new HttpRespMsg();
         //评分上个月