bug修复

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

@@ -155,7 +155,7 @@ public class OrganizationEvaluationInfoController {
 	}
 
 
-	@PostMapping("/import-excel")
+	@PostMapping("/import-excel2")
 	public R importExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) throws Exception {
 
 		boolean b = organizationEvaluationInfoService.importExcel(file, request);
@@ -167,7 +167,7 @@ public class OrganizationEvaluationInfoController {
 		}
 	}
 
-	@PostMapping("/import-excel2")
+	@PostMapping("/import-excel")
 	public R importExcel2(@RequestParam("file") MultipartFile file, HttpServletRequest request,
 						 @RequestParam(value = "organizationEvaluationId", required = false) String organizationEvaluationId,
 						 @RequestParam(value = "indicatorId") String indicatorId,

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

@@ -642,7 +642,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	}
 
 	@Override
-	public byte[] downloadExcel(String organizationEvaluationId, String indicatorId, String binSection, String binStage, HttpServletRequest request) throws Exception {
+	public byte[] downloadExcel2(String organizationEvaluationId, String indicatorId, String binSection, String binStage, HttpServletRequest request) throws Exception {
 
 		//获取用户信息 23031009
 		boolean deptFlag = false;
@@ -876,7 +876,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 
 	@Override
-	public byte[] downloadExcel2(String organizationEvaluationId, String indicatorId, String binSection, String binStage, HttpServletRequest request) throws Exception {
+	public byte[] downloadExcel(String organizationEvaluationId, String indicatorId, String binSection, String binStage, HttpServletRequest request) throws Exception {
 		//获取用户信息 23031009
 		boolean deptFlag = false;
 		MyuserResDTO user = userService.getSysUser(request);
@@ -1224,7 +1224,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 //		String organizationEvaluationId = "b6100f16f52bb1f295fef30c8c615a6a";
 ////		String indicatorId = "72e7f322011f14da236b385dc5b87c4e";
 //		String indicatorId = "e574a80a46dd0b43fbc891e19d3af6bc";
-//		String binSection = "1635164631537012737";
+//		String binSection2 = "1635165043711266817";
 //		String binStage = "1635160119237140482";
 		List<LinkedHashMap<String, Object>> dataList = new ArrayList<>();