Browse Source

代码优化;

hlf 1 year ago
parent
commit
9ad47f0a84

+ 4 - 2
ims-service/ims-eval/src/main/java/com/ims/eval/dao/ResponsibilityIndicatorInfoMapper.java

@@ -27,8 +27,10 @@ public interface ResponsibilityIndicatorInfoMapper extends BaseMapper<Responsibi
 																   @Param("optionCode") String optionCode,
 																   @Param("organizationId") String organizationId);
 
-	@DataPermission(isPermission = false)
-	List<ResponsibilityIndicatorInfoResDTO> selectResponsibilityIndicatorInfoList(@Param("deptResponsibilityId") String deptResponsibilityId, @Param("isQuantified") String isQuantified, @Param("dataState") String dataState);
+	@DataPermission(isPermission = true,type = true)
+	List<ResponsibilityIndicatorInfoResDTO> selectResponsibilityIndicatorInfoList(@Param("deptResponsibilityId") String deptResponsibilityId,
+																				  @Param("isQuantified") String isQuantified,
+																				  @Param("dataState") String dataState);
 
 
 	List<Map> selectResponsibilityIndicatorList(@Param("responsibilityId") String responsibilityId,

+ 0 - 4
ims-service/ims-eval/src/main/java/com/ims/eval/service/IResponsibilityIndicatorInfoService.java

@@ -26,10 +26,6 @@ public interface IResponsibilityIndicatorInfoService extends IService<Responsibi
 
 	Map<Object  ,List<ResponsibilityIndicatorInfoResDTO>> planValueList(List<String> deptResponsibilityIds, String dept, HttpServletRequest request);
 
-
-
-	Map<Object  ,List<ResponsibilityIndicatorInfoResDTO>> selectResponsibilityIndicatorInfoList(String deptResponsibilityId, String isQuantified, String dataState);
-
 	boolean saveOrUpdateDto(ResponsibilityIndicatorInfoUpdateDTO infoUpdateDTO);
 
 	boolean saveBatchDto(List<ResponsibilityIndicatorInfoUpdateDTO> infoUpdateDTOs);

+ 0 - 11
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/ResponsibilityIndicatorInfoServiceImpl.java

@@ -75,17 +75,6 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 
 	}
 
-
-	@Override
-	public Map<Object, List<ResponsibilityIndicatorInfoResDTO>> selectResponsibilityIndicatorInfoList(String deptResponsibilityId, String isQuantified, String dataState) {
-		List<ResponsibilityIndicatorInfoResDTO> list = baseMapper.selectResponsibilityIndicatorInfoList(deptResponsibilityId, isQuantified, dataState);
-		Map<Object, List<ResponsibilityIndicatorInfoResDTO>> map = list.stream().collect(Collectors.groupingBy(ResponsibilityIndicatorInfoResDTO::getIsQuantified));
-		map.put("quantifiedList", map.remove(true));
-		map.put("nonQuantifiedList", map.remove(false));
-		return map;
-	}
-
-
 	@Transactional
 	@Override
 	public boolean saveOrUpdateDto(ResponsibilityIndicatorInfoUpdateDTO infoUpdateDTO) {