bug修改

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

@@ -209,7 +209,9 @@ public class OrganizationRatingController {
 	 * 导入文件
 	 */
 	@PostMapping(value = "/importExcel")
-	public R importExcel(@RequestParam("file") MultipartFile file) {
-		return organizationRatingService.importExcel(file);
+	public R importExcel(@RequestParam("file") MultipartFile file,
+						 @RequestParam(value = "binSection") String binSection
+						 ) {
+		return organizationRatingService.importExcel(file,binSection);
 	}
 }

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

@@ -36,5 +36,6 @@ public interface IOrganizationRatingService extends IService<OrganizationRating>
 
 	void exportExcel(HttpServletResponse response, String binSection, String year) throws IOException;
 
-	R importExcel(MultipartFile file);
+	R importExcel(MultipartFile file,String binSection);
+
 }

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

@@ -82,10 +82,15 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 			List<String[]> strings = ExcelUtil.readData(fileType, startRows, true, is);
 			List<String> ids = strings.stream().map(row -> row[row.length - 1]).collect(Collectors.toList());
 			List<OrganizationRating> organizationRatings = baseMapper.selectBatchIds(ids);
+			if (!binSection.equals(organizationRatings.get(0).getBinSection())) {
+				throw new CustomException("请导入" + binSection + "的数据");
+			}
 			//遍历Excel表每一行的数据
 			for (String[] str : strings) {
 				for (OrganizationRating or : organizationRatings) {
-					if (str[15].equals(or.getId())) {
+					if (str[0].equals(or.getOrganizationShortName())&&str[3].equals(or.getYear())) {
+//					if (str[15].equals(or.getId())) {
+//						or.setOrganizationShortName(str[0]);
 						or.setSafetyEnvProtection(str[3]);
 						or.setVeto(str[4]);
 						or.setNetProfit(str[5]);