导入修改

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

@@ -114,21 +114,26 @@ public class OrganizationRatingController {
 				InputStream is = file.getInputStream();
 				List<OrganizationRating> organizationRatingList = new ArrayList<>();
 				//Excel导入导出的单元类
-				List<String[]> strings = ExcelUtil.readData(fileType, startRows, true, is);
+				List<String[]> strings = ExcelUtil.readData(fileType, startRows-1, true, is);
 				//遍历Excel表每一行的数据
 				for (String[] str : strings) {
+					if(startRows==1){
+						startRows++;
+						continue;
+					}
+
 					OrganizationRating organizationRating = new OrganizationRating();
 
 					organizationRating.setId(str[0]);//主键
 					organizationRating.setOrganizationShortName(str[1]);//考评组织名称
 					organizationRating.setOrganizationId(str[2]);//考评组织ID
 					organizationRating.setBinSection(str[3]);//板块id
-					organizationRating.setYear(str[5]);//年度
-					organizationRating.setScjyRate(str[6]);//生产经营评级
-					organizationRating.setQqRate(str[7]);//基建评级
-					organizationRating.setJjRate(str[8]);//基建评级
-					organizationRating.setYearRate(str[9]);//年度评级
-					organizationRating.setRemark(str[10]);
+					organizationRating.setYear(str[4]);//年度
+					organizationRating.setScjyRate(str[5]);//生产经营评级
+					organizationRating.setQqRate(str[6]);//前期评级
+					organizationRating.setJjRate(str[7]);//基建评级
+					organizationRating.setYearRate(str[8]);//年度评级
+					organizationRating.setRemark(str[9]);
 
 
 					if (null == str[0] || "".equals(str[0])) {
@@ -147,7 +152,7 @@ public class OrganizationRatingController {
 					return R.error().data("保存失败！");
 				}
 			} catch (Exception e) {
-				return R.customError(e.getMessage()).data("失败！");
+				return R.customError("失败");
 			}
 		}
 		return R.customError("上传文件为空！");

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/result/R.java

@@ -57,8 +57,8 @@ public class R {
 
 	public static R customError(String msg){
 		R r = new R();
-		r.setSuccess(true);
-		r.setCode(ResultCode.CUSTOMERROR);
+		r.setSuccess(false);
+		r.setCode(ResultCode.ERROR);
 		r.setMessage(msg);
 		r.setMsg(msg);
 		return r;

ims-service/ims-eval/src/main/resources/mappers/EvaluationPortalMapper.xml

@@ -41,7 +41,7 @@
         ea.portal_id,
         ea.matter_heigh_note,
         ea.matter_low_note,
-        ea.manage_height_note,
+        ea.manage_heigh_note,
         ea.manage_low_note,
         ea.standard_heigh_note,
         ea.standard_low_note