问题处理

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -84,8 +84,8 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 
 		IPage<Indicator> list = baseMapper.selectPage(page, qw);
 
-		list.getRecords().stream().forEach(l->{
-			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
+		list.getRecords().stream().forEach(l -> {
+			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" : CacheContext.ddNameMap.get(l.getBinSection()));
 			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
 		});
 
@@ -93,24 +93,23 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	}
 
 	@Override
-	public IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle) {
+	public IPage<Indicator> list2(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company, String evaluationCycle) {
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
-		IPage<Indicator> list = baseMapper.seleclistPage(page, id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
+		IPage<Indicator> list = baseMapper.seleclistPage(page, id, indicatorName, indicatorCode, binSection, binStage, dept, company, evaluationCycle);
 		List<Indicator> records = list.getRecords();
-		records.stream().forEach(r ->{
+		records.stream().forEach(r -> {
 			r.setDeptName(CacheContext.ddNameMap.get(r.getDeptId()));
 		});
 		return list;
 	}
 
 	@Override
-	public List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle) {
+	public List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company, String evaluationCycle) {
 
-		List<Indicator> list = null;
-		if (null != evaluationCycle){
-			evaluationCycle = evaluationCycle.replaceAll("ALL","");
-			list = baseMapper.seleclistAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
+		if (evaluationCycle != null) {
+			evaluationCycle = evaluationCycle.replaceAll("ALL", "");
 		}
+		List<Indicator> list = baseMapper.seleclistAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company, evaluationCycle);
 		return list;
 	}
 
@@ -135,7 +134,7 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 
 	@Transactional
 	@Override
-	public boolean saveGroup(IndicatorDTO dto) throws Exception{
+	public boolean saveGroup(IndicatorDTO dto) throws Exception {
 		if (null != dto && (null == dto.getId() || "".equals(dto.getId().trim()))) {
 			QueryWrapper<Indicator> qw = new QueryWrapper<>();
 			qw.lambda().eq(Indicator::getIndicatorCode, dto.getIndicatorCode());
@@ -206,7 +205,7 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 		//获取指标
 		IndicatorDTO indicatorDTO = baseMapper.selectById(id);
 		//根据指标获取明细组
-		if(null != indicatorDTO) {
+		if (null != indicatorDTO) {
 			List<IndicatorDictionaryDTO> dtoList = indicatorDictionaryService.list(indicatorDTO.getId(), "", "");
 			indicatorDTO.setDtoList(dtoList);
 		}