Merge remote-tracking branch 'origin/master'

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

@@ -23,7 +23,7 @@ public interface ProjectManagementMapper {
      * @param projectName
      * @return
      */
-    @Select("select count(*) from hr_project_management where projectName=#{projectName}")
+    @Select("select count(*) from hr_project_management where projectName=#{projectName} and isdel = 0")
     Integer getByprojectName(String projectName);
 
     /**

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

@@ -444,19 +444,8 @@ public class ProjectManagementService {
         List<ScoreIndex> scoreIndexList = null;
         try {
             //根据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<TradingJudgmentPoints> judgmentPointsList = mapper.getJudgmentPoints(projectId);
+
             Integer size = judgmentPointsList.size();
             for (int i = 0; i<size; i++){
                 TradingJudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
@@ -465,7 +454,6 @@ public class ProjectManagementService {
                 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);