修改

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

@@ -176,8 +176,6 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 				}
 			}
 
-		}else {
-			throw new Exception("计算指标项明细为空");
 		}
 		return 1;
 	}

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

@@ -241,7 +241,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 											OrganizationEvaluationInfo info = baseMapper.selectById(dto.getId());
 											//将计算结果保存
 											info.setQuantifiedValue(score);
+											info.setNonQuantifiedValue(score+"");
 											dto.setQuantifiedValue(score);
+											dto.setNonQuantifiedValue(score+"");
 											this.saveOrUpdate(info);
 										}
 								}
@@ -314,7 +316,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 											OrganizationEvaluationInfo info  = baseMapper.selectById(dto.getId());
 											//将计算结果保存
 											info.setQuantifiedValue(score);
+											info.setNonQuantifiedValue(score+"");
 											dto.setQuantifiedValue(score);
+											dto.setNonQuantifiedValue(score+"");
 											this.saveOrUpdate(info);
 										}
 									}
@@ -646,7 +650,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	@Override
 	public boolean importExcel(MultipartFile file) throws IOException {
 
-		List<Map<String, Object>> dataList = new ArrayList<>();
+		List<LinkedHashMap<String, Object>> dataList = new ArrayList<>();
 		try {
 			//获取原始的文件名
 			String originalFilename = file.getOriginalFilename();
@@ -668,7 +672,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			// 遍历每一行数据
 			for (int i = startingRowIndex; i <= sheet.getLastRowNum(); i++) {
 				Row row = sheet.getRow(i);
-				Map<String, Object> dataMap = new LinkedHashMap<>();
+				LinkedHashMap<String, Object> dataMap = new LinkedHashMap<>();
 
 				// 遍历每一列数据
 				for (int j = 2; j < totalColumns; j++) {
@@ -723,6 +727,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					if(quantified){
 						info.setQuantifiedValue(Double.valueOf(valueMap.get(entry.getKey().replace("ID_","")).toString()));
 					}
+					System.out.println(entry.getKey().replace("ID_","")+"="+valueMap.get(entry.getKey().replace("ID_","")).toString());
+
 					info.setNonQuantifiedValue(valueMap.get(entry.getKey().replace("ID_","")).toString());
 					evaluationInfos.add(info);
 				}

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

@@ -355,7 +355,7 @@
 
 
 
-            and id.option_code not in ('CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','WCLDF','LRGXKHMAX','LRGXKHMIN')
+            and id.option_code not in ('CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','LRGXKHMAX','LRGXKHMIN')
         </where>
 
         order by be.order_num,oer.organization_short_name,bn.order_num,ri.order_num,id.child_code,id.option_code,id.option_order asc