diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java index ff91a77..7e2f76c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java @@ -80,6 +80,8 @@ public class ProjectNew extends BaseEntity { @ApiModelProperty(value = "风险等级") private String riskLevel; + private int riskSize; + private String suggestion; private String taskName; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java index 26e7c0c..b020339 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import com.securitycontrol.screen.mapper.ProjectNewMapper; import com.securitycontrol.screen.domain.ProjectNew; import com.securitycontrol.screen.service.IProjectNewService; +import org.springframework.util.CollectionUtils; /** * 工程信息Service业务层处理 @@ -41,7 +42,16 @@ public class ProjectNewServiceImpl implements IProjectNewService { */ @Override public List selectProjectNewList(ProjectNew projectNew) { - return projectNewMapper.selectProjectNewList(projectNew); + List projects = projectNewMapper.selectProjectNewList(projectNew); + for (ProjectNew project : projects) { + List projectRisks = projectNewMapper.selectProjectRiskDetailList(project); + if (CollectionUtils.isEmpty(projectRisks)) { + project.setRiskSize(0); + } else { + project.setRiskSize(projectRisks.size()); + } + } + return projects; } @Override