Merge remote-tracking branch 'origin/master'

src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java

@@ -195,6 +195,17 @@ public interface ProjectManagementMapper {
             "</script>"})
     List<TradingJudgmentPoints> getJudgmentPoints(@Param("projectId") Integer projectId);
 
+    /**
+     * 查询单个项目判分点信息，根据项目id
+     *
+     * @param projectId 项目id
+     * @return
+     */
+    @Select({"<script>",
+            "select * from hr_judgment_points where find_in_set(#{projectId},projectId)",
+            "</script>"})
+    List<JudgmentPoints> getJudgmentPointsPs(@Param("projectId") Integer projectId);
+
     /**
      * 查询单个项目判分点信息，根据项目id
      *

src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java

@@ -445,15 +445,29 @@ public class ProjectManagementService {
         HashMap<String, Object> score = new HashMap<String, Object>();
         List<ScoreIndex> scoreIndexList = null;
         try {
-            List<TradingJudgmentPoints> judgmentPointsList = mapper.getJudgmentPoints(projectId);
-            Integer size = judgmentPointsList.size();
+            //根据projectId查询判分点交易类型
+            //List<TradingJudgmentPoints> judgmentPointsList = mapper.getJudgmentPoints(projectId);
+
+            /*Integer size = judgmentPointsList.size();
             for (int i = 0; i<size; i++){
                 TradingJudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
                 Integer judgmentPointsId = tradingJudgmentPoints.getId();
                 Integer systemId = tradingJudgmentPoints.getSystemId();
                 scoreIndexList = mapper.getScore(judgmentPointsId,systemId,projectId);
                 score.put("scoreIndexList"+i,scoreIndexList);
+            }*/
+
+            //根据projectId查询判分点信息
+            List<JudgmentPoints> judgmentPointsList = mapper.getJudgmentPointsPs(projectId);
+            Integer size = judgmentPointsList.size();
+            for (int i = 0; i<size; i++){
+                JudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
+                Integer judgmentPointsId = tradingJudgmentPoints.getJudgmentPointsId();
+                Integer systemId = tradingJudgmentPoints.getSystemId();
+                scoreIndexList = mapper.getScore(judgmentPointsId,systemId,projectId);
+                score.put("scoreIndexList"+i,scoreIndexList);
             }
+
             List<Role> roleList = mapper.queryProjectId(projectId);
             obj.put("roleList",roleList);
             obj.put("judgmentPointsList", judgmentPointsList);
@@ -665,6 +679,8 @@ public class ProjectManagementService {
                 Integer pointId = points.get(i).getJudgmentPointsId();
                 //根据该判分点得到数据库存储的对应数据
                 JudgmentPoints point = mapper.getByjudgmentPointsId(pointId);
+
+                //JudgmentPoints point = mapper.newGetProjectId(pointId);
                 //取出绑定的项目id
                 String projectIds = point.getProjectId();
                 //取出实验要求