Merge remote-tracking branch 'origin/dev'

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -719,20 +719,22 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		// 项目评价初始化信息插入
 		// 应评价数 = 话题创建者 + 议题发起者 + 议题表决人 【去重】
 		// 议题发起者 和 议题表决人 和 话题创建者 查询
-		Result<List<String>> canEvaluateProjectCount = govIssueOpenFeignClient.canEvaluateProjectCount(projectEntity.getOriginId());
+		if (projectEntity.getOrigin().equals(ProjectConstant.ISSUE)) {
-		if (!canEvaluateProjectCount.success()){
+			Result<List<String>> canEvaluateProjectCount = govIssueOpenFeignClient.canEvaluateProjectCount(projectEntity.getOriginId());
-			throw new RenException("【查询项目应评价人数失败】，【"+canEvaluateProjectCount.getMsg()+"】");
+			if (!canEvaluateProjectCount.success()) {
-		}
+				throw new RenException("【查询项目应评价人数失败】，【" + canEvaluateProjectCount.getMsg() + "】");
-		List<String> userIds = canEvaluateProjectCount.getData();
+			}
-		ProjectSatisfactionStatisticsEntity entity1 = new ProjectSatisfactionStatisticsEntity();
+			List<String> userIds = canEvaluateProjectCount.getData();
-		entity1.setShouldEvaluateCount(userIds.size());
+			ProjectSatisfactionStatisticsEntity entity1 = new ProjectSatisfactionStatisticsEntity();
-		entity1.setCustomerId(projectEntity.getCustomerId());
+			entity1.setShouldEvaluateCount(userIds.size());
-		entity1.setProjectId(fromDTO.getProjectId());
+			entity1.setCustomerId(projectEntity.getCustomerId());
-		entity1.setBadCount(NumConstant.ZERO);
+			entity1.setProjectId(fromDTO.getProjectId());
-		entity1.setGoodCount(NumConstant.ZERO);
+			entity1.setBadCount(NumConstant.ZERO);
-		entity1.setPerfectCount(NumConstant.ZERO);
+			entity1.setGoodCount(NumConstant.ZERO);
-		// 新添一条记录
+			entity1.setPerfectCount(NumConstant.ZERO);
-		statisticsDao.insert(entity1);
+			// 新添一条记录
+			statisticsDao.insert(entity1);
+		}
 	}
 
 	@Override