修改

ims-service/ims-eval/src/main/java/com/ims/eval/controller/OrganizationStructureController.java

@@ -61,6 +61,17 @@ public class OrganizationStructureController {
 		return R.ok().data(list);
 	}
 
+	@GetMapping(value = "getList2")
+	public R getList2(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "num", required = false) Integer num,
+		@RequestParam(value = "type", required = false) String type) {
+		List<OrganizationStructure> list = organizationStructureService.getList2(id,num,type);
+		return R.ok().data(list);
+	}
+
+
+
 
 	@GetMapping(value = "getList")
 	public R getList(

ims-service/ims-eval/src/main/java/com/ims/eval/service/IOrganizationStructureService.java

@@ -18,5 +18,8 @@ public interface IOrganizationStructureService extends IService<OrganizationStru
 
 	List<OrganizationStructure> getTree(String id,Integer num,String type );
 
+
+	List<OrganizationStructure> getList2(String id,Integer num,String type );
+
 	List<OrganizationStructure> getList(String likeParentId, String parentId, String name,String type, HttpServletRequest request);
 }

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

@@ -204,7 +204,6 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 				maxNum.setMark("1");
 
 				CalculateIndicatorItemInfo minNum  = (CalculateIndicatorItemInfo)optionCodeGropListEntry.getValue().get(0).clone();
-
 				minNum.setMark("0");
 
 
@@ -212,6 +211,11 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 				for (Map.Entry<String, List<CalculateIndicatorItemInfo>> childCodeGropListEntry : childCodeGropList.entrySet()){
 					String  childCode  = childCodeGropListEntry.getKey();
 
+					CalculateIndicatorItemInfo childinfo= childCodeGropListEntry.getValue().get(0);
+					//id置空
+					maxNum.setId(null);
+					minNum.setId(null);
+
 				}
 
 

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

@@ -64,7 +64,7 @@ public class OrganizationStructureServiceImpl extends ServiceImpl<OrganizationSt
 		}
 		QueryWrapper<OrganizationStructure> qw = new QueryWrapper<>();
 
-//		List<OrganizationStructure> list = baseMapper.selectList(qw);
+		List<OrganizationStructure> list2 = baseMapper.selectList(qw);
 
 //		http://10.65.79.83:86/ims-iam-ext/sys/sysOrg/allDataNoControl
 		JSONArray arr = remoteServiceBuilder.getGatewayUrl().allDataNoControl();
@@ -73,11 +73,31 @@ public class OrganizationStructureServiceImpl extends ServiceImpl<OrganizationSt
 		}
 
 		List<OrganizationStructure> list = arr.toJavaList(OrganizationStructure.class);
+		list.addAll(list2);
 		List<OrganizationStructure> tr = convert(list, id, num);
 		return tr;
 	}
 
 	@Override
+	public List<OrganizationStructure> getList2(String id, Integer num, String type) {
+		QueryWrapper<OrganizationStructure> qw = new QueryWrapper<>();
+		List<OrganizationStructure> list2 = baseMapper.selectList(qw);
+		JSONArray arr = remoteServiceBuilder.getGatewayUrl().allDataNoControl();
+		if (null == arr) {
+			return null;
+		}
+
+		List<OrganizationStructure> list = arr.toJavaList(OrganizationStructure.class);
+		list.addAll(list2);
+		List<OrganizationStructure> filteredList = list.stream()
+			.filter(structure -> structure.getType().equals("100")||structure.getType().equals("160")||structure.getType().equals("130")||structure.getType().equals("3"))
+			.collect(Collectors.toList());
+
+		return filteredList;
+
+	}
+
+	@Override
 	public List<OrganizationStructure> getList(String likeParentId, String parentId, String name,String type, HttpServletRequest request) {