导入导出 处理修改优化

ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationEvaluationInfo.java

@@ -57,7 +57,7 @@ public class OrganizationEvaluationInfo extends Model {
     /**
      * 能否量化
      */
-    private String isQuantified;
+    private Boolean isQuantified;
 
     /**
      * 量化值
@@ -118,4 +118,10 @@ public class OrganizationEvaluationInfo extends Model {
 	private String  deptId;
 
 
+	/**
+	 * 组织id
+	 */
+	private String organizationId;
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/EvaluateRuleInfoIndicatorDTO.java

@@ -31,7 +31,7 @@ public class EvaluateRuleInfoIndicatorDTO {
 	/**
 	 * 能否量化
 	 */
-	private String isQuantified;
+	private Boolean isQuantified;
 
 	/**
 	 * 选项名称
@@ -50,4 +50,10 @@ public class EvaluateRuleInfoIndicatorDTO {
 	private String deptId;
 
 
+	/**
+	 * 组织id
+	 */
+	private String organizationId;
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/IndicatorResDTO.java

@@ -28,7 +28,7 @@ public class IndicatorResDTO {
 	/**
 	 * 能否量化
 	 */
-	private String isQuantified;
+	private Boolean isQuantified;
 
 	/**
 	 * 选项名称

ims-service/ims-eval/src/main/java/com/ims/eval/schedule/ScoreCalculationSchedule.java

@@ -156,7 +156,7 @@ public class ScoreCalculationSchedule {
 
 		try {
 			//判断可用量化的进行变量替换
-			if ("是".equals(list.get(0).getIsQuantified())){
+			if (list.get(0).getIsQuantified()){
 
 				//删除考评指标明细中的包含max或者min的指标项
 				Iterator<OrganizationEvaluationInfo> iterator = list.iterator();

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

@@ -46,4 +46,16 @@ public interface IOrganizationEvaluationInfoService extends IService<Organizatio
 	byte[] downloadExcel(String organizationEvaluationId, String indicatorId, String binSection, String binStage, HttpServletRequest request)throws Exception;
 
 	boolean importExcel(MultipartFile file,HttpServletRequest request) throws IOException;
+
+
+	/**
+	 * 获取当前考评记录的指标项记录
+	 * @param organizationEvaluationId 考评记录id
+	 * @param indicatorId 指标id
+	 * @param organizationId 组织id
+	 * @param childOptionCode 组合子指标和指标项
+	 * @return
+	 */
+	List<OrganizationEvaluationInfo> getEvaluationInfoByOptionCodeList(String organizationEvaluationId, String indicatorId, String organizationId, String childOptionCode);
+
 }

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

@@ -1,6 +1,7 @@
 package com.ims.eval.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ims.common.utils.FormulaUtils;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
@@ -10,7 +11,6 @@ import com.ims.eval.entity.*;
 import com.ims.eval.dao.OrganizationEvaluationInfoMapper;
 import com.ims.eval.entity.dto.request.AddEvaluationInfoDTO;
 import com.ims.eval.entity.dto.response.IndicatorResDTO;
-import com.ims.eval.entity.dto.response.MyuserResDTO;
 import com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO;
 import com.ims.eval.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,6 +21,7 @@ import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,8 +94,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			i.setUpdateMark(true);
 		});
 		Map<String  ,List<OrganizationEvaluationInfoResDTO>> map  = list.stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIsQuantified));
-		map.put("quantifiedList", map.remove("是"));
-		map.put("nonQuantifiedList", map.remove("否"));
+		map.put("quantifiedList", map.remove(true));
+		map.put("nonQuantifiedList", map.remove(false));
 		return map;
 	}
 
@@ -107,13 +108,13 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				OrganizationEvaluationInfo info = baseMapper.selectById(entity.getId());
 
 				info.setQuantifiedValue(entity.getQuantifiedValue());//量化值
-				if(entity.getIsQuantified().equals("否") && "JKF".equals(info.getOptionCode())){//加扣分
+				if(!entity.getIsQuantified() && "JKF".equals(info.getOptionCode())){//加扣分
 					if(StringUtils.isNumber(entity.getNonQuantifiedValue())){
 						info.setQuantifiedValue(Double.valueOf(entity.getNonQuantifiedValue()));
 					}
 				}
 
-				if(entity.getIsQuantified().equals("否") && "JCF".equals(info.getOptionCode())){//基础分
+				if(!entity.getIsQuantified() && "JCF".equals(info.getOptionCode())){//基础分
 					if(StringUtils.isNumber(entity.getNonQuantifiedValue())){
 						info.setQuantifiedValue(Double.valueOf(entity.getNonQuantifiedValue()));
 					}
@@ -147,13 +148,13 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					addinfo.setIsQuantified(entity.getIsQuantified());
 					addinfo.setQuantifiedValue(entity.getQuantifiedValue());
 
-					if(entity.getIsQuantified().equals("否") && "JKF".equals(d.getOptionCode())){//加扣分
+					if(!entity.getIsQuantified() && "JKF".equals(d.getOptionCode())){//加扣分
 						if(StringUtils.isNumber(entity.getNonQuantifiedValue())){
 							addinfo.setQuantifiedValue(Double.valueOf(entity.getNonQuantifiedValue()));
 						}
 					}
 
-					if(entity.getIsQuantified().equals("否") && "JCF".equals(d.getOptionCode())){//基础分
+					if(!entity.getIsQuantified() && "JCF".equals(d.getOptionCode())){//基础分
 						if(StringUtils.isNumber(entity.getNonQuantifiedValue())){
 							addinfo.setQuantifiedValue(Double.valueOf(entity.getNonQuantifiedValue()));
 						}
@@ -196,9 +197,6 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	@Override
 	public List<OrganizationEvaluationInfoResDTO> finishValueList(String organizationEvaluationId, String dept, String organizationShortName, String indicatorName, String binSection,String isQuantified, HttpServletRequest request) {
 		List<OrganizationEvaluationInfoResDTO> list = baseMapper.selectListEvaluationInfoId2(organizationEvaluationId,dept,organizationShortName,indicatorName,binSection,isQuantified,"","");//默认获取指定的怎目标
-		list.stream().forEach(i->{
-			i.setUpdateMark(true);
-		});
 		return list;
 	}
 
@@ -402,16 +400,16 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 
 
-		//获取用户信息 23031009
-		boolean deptFlag = false;
-		MyuserResDTO user = userService.getSysUser(request);
-		if(null != user){
-			String deptId = "23031009";
-			if(deptId.equals(user.getDeptId())){
-				deptFlag = true;
-			}
-
-		}
+//		//获取用户信息 23031009
+//		boolean deptFlag = false;
+//		MyuserResDTO user = userService.getSysUser(request);
+//		if(null != user){
+//			String deptId = "23031009";
+//			if(deptId.equals(user.getDeptId())){
+//				deptFlag = true;
+//			}
+//
+//		}
 
 		boolean titlemark = true;//标记生成标题
 		List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId, indicatorId,binSection,binStage,"");
@@ -439,9 +437,6 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					if (!d.getIsShow()) {
 						continue;
 					}
-					if(!deptFlag && d.getOptionCode().contains("DF")){
-						continue;
-					}
 					titlemap.put("key", d.getOptionName());//名称
 					titlemap.put("code",d.getChildCode()+"_"+d.getOptionCode());//名称
 					titlemap.put("flag", d.getIsQuantified());//是否量化
@@ -449,18 +444,18 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 				}
 
-//				if(deptFlag){
-					Map deptFlagMap = new LinkedHashMap();
-					deptFlagMap.put("key", "填报状态");//名称
-					deptFlagMap.put("code","state");//名称
-					deptFlagMap.put("flag", false);//是否编辑
-					titleArray.add(deptFlagMap);
-//				}
 
 
 				title.put(childCodeEntry.getKey().split(",")[1], titleArray);
 
 			}
+			Map deptstateMap = new LinkedHashMap();
+			List<Map> titlestateArray = new ArrayList<>();
+			deptstateMap.put("key", "填报状态");//名称
+			deptstateMap.put("code","state");//名称
+			deptstateMap.put("flag", false);//是否编辑
+			titlestateArray.add(deptstateMap);
+			title.put("状态", titlestateArray);
 			titlemark = false;
 			data.put("title", title);
 		}
@@ -515,15 +510,16 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	@Override
 	public byte[] downloadExcel(String organizationEvaluationId, String indicatorId, String binSection, String binStage,HttpServletRequest request) throws Exception{
 
-		//获取用户信息 23031009
-		boolean deptFlag = false;
-		MyuserResDTO user = userService.getSysUser(request);
-		if(null != user){
-			String deptId = "23031009";
-			if(deptId.equals(user.getDeptId())){
-				deptFlag = true;
-			}
-		}
+//		//获取用户信息 23031009
+//		boolean deptFlag = false;
+//		MyuserResDTO user = userService.getSysUser(request);
+//		if(null != user){
+//			String deptId = "23031009";
+//			if(deptId.equals(user.getDeptId())){
+//				deptFlag = true;
+//			}
+//		}
+		String[] values = new String[]{"不合格", "待确认", "已确认"};
 
 		Map<String ,List<Map<String,String>>> title = new LinkedHashMap();//标题
 		List<Map<String,String>> mapList = new ArrayList<>();//数据list
@@ -562,13 +558,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 						if (!d.getIsShow()) {
 							continue;
 						}
-
-						if(!deptFlag && d.getOptionCode().contains("DF")){
-							continue;
-						}
 						titlemap.put(d.getChildCode()+"_"+d.getOptionCode(), d.getOptionName());//名称
-						titlemap.put("ID_" +d.getChildCode()+"_"+d.getOptionCode(), "ID隐藏");//id
-						titlemap.put("IS_LH_" +d.getChildCode()+"_"+d.getOptionCode(), "是否量化隐藏");//是否量化
+//						titlemap.put("ID_" +d.getChildCode()+"_"+d.getOptionCode(), "ID隐藏");//id
+//						titlemap.put("IS_LH_" +d.getChildCode()+"_"+d.getOptionCode(), "是否量化隐藏");//是否量化
 					}
 					titleArray.add(titlemap);
 					title.put(childCodeEntry.getKey().split(",")[1], titleArray);
@@ -593,20 +585,18 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					}
 					if (mark) {
 						indicatormap.put("organizationShortName", resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getOrganizationShortName());//公司名
+						indicatormap.put("organizationId", resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getOrganizationId());//公司编号
 
 						String  state2 = resultMap.get(d.getChildCode()+"_"+d.getOptionCode()).getState();//(-1:不合格；0:待确认；1:已确认)
 						state = stateConvert(state2,true);
 						mark = false;
 					}
-					if(!deptFlag && d.getOptionCode().contains("DF")){
-						continue;
-					}
 					//指标属性
 					indicatormap.put(d.getChildCode() + "_" + d.getOptionCode(), null == resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getNonQuantifiedValue() ? "" : resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getNonQuantifiedValue());
 					//指标id
-					indicatormap.put("ID_" + d.getChildCode() + "_" + d.getOptionCode(), resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getId());
+//					indicatormap.put("ID_" + d.getChildCode() + "_" + d.getOptionCode(), resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getId());
 					//是否量化
-					indicatormap.put("IS_LH_" + d.getChildCode() + "_" + d.getOptionCode(), resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getIsQuantified2()?"1":"2");
+//					indicatormap.put("IS_LH_" + d.getChildCode() + "_" + d.getOptionCode(), resultMap.get(d.getChildCode() + "_" + d.getOptionCode()).getIsQuantified2()?"1":"2");
 				}
 			}
 			indicatormap.put("state",state);//状态
@@ -655,9 +645,24 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		headerCell1.setCellStyle(cellStyle);
 		sheet.addMergedRegion(new CellRangeAddress(1, 2, 1, 1));
 
+		Cell headerCell2 = headerRow1.createCell(2);
+		headerCell2.setCellValue("单位编码");
+		headerCell2.setCellStyle(cellStyle);
+		headerCell2.setCellStyle(cellStyle);
+		sheet.addMergedRegion(new CellRangeAddress(1, 2, 2, 2));
+
+		Cell header3Cell0 = headerRow3.createCell(0);
+		header3Cell0.setCellValue("zhidmap,evalId="+organizationEvaluationId+",indId="+indicatorId);
 
-        Integer colsize = 1;
-		Integer optioncols = 2;
+		Cell header3Cell1 = headerRow3.createCell(1);
+		header3Cell1.setCellValue("organizationShortName");
+
+		Cell header3Cell2 = headerRow3.createCell(2);
+		header3Cell2.setCellValue("organizationId");
+
+
+		Integer colsize = 2;
+		Integer optioncols = 3;
 		for (String  key : title.keySet()) {//存在多个标题
 			List<Map<String,String>> titleArray2 = title.get(key);
 			Cell headerCellcolsize = headerRow1.createCell(colsize+1);
@@ -674,9 +679,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				colsize = colsize + key2.size();
 				for (String  key3 : key2.keySet()) {
 
-					Cell header3Cell2 = headerRow3.createCell(optioncols);
-					header3Cell2.setCellValue(key3);
-					header3Cell2.setCellStyle(cellStyle);
+					Cell header3Cell3 = headerRow3.createCell(optioncols);
+					header3Cell3.setCellValue(key3);
+					header3Cell3.setCellStyle(cellStyle);
 
 					Cell header2Cell2 = headerRow2.createCell(optioncols);
 					header2Cell2.setCellValue(key2.get(key3));
@@ -704,13 +709,26 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				Cell dataCell1 = headerRowdate.createCell(colsdata);
 				dataCell1.setCellValue(datamaps.get(datakey).toString());
 				dataCell1.setCellStyle(cellStyle);
+
+				if("state".equals(datakey)){
+					// 创建一个数据验证对象
+					DataValidationHelper validationHelper = sheet.getDataValidationHelper();
+					DataValidationConstraint constraint = validationHelper.createExplicitListConstraint(values);
+					// 设置下拉列表的位置范围为
+					CellRangeAddressList addressList = new CellRangeAddressList(rowdate, rowdate, colsdata, colsdata); // 行索引和列索引从0开始计数
+					// 创建数据验证对象
+					DataValidation validation = validationHelper.createValidation(constraint, addressList);
+
+					// 将数据验证对象应用于单元格
+					sheet.addValidationData(validation);
+				}
+
 				colsdata++;
 			}
 			rowdate++;
 		}
 
 
-
 		//隐藏行
 		sheet.getRow(3).setZeroHeight(true);
 		sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, colsize));
@@ -726,13 +744,11 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		return excelBytes;
 	}
 
+
+
 	@Override
 	public boolean importExcel(MultipartFile file,HttpServletRequest request) throws IOException {
 
-//		String organizationEvaluationId = request.getHeader("organizationEvaluationId");
-//
-//		String indicatorId = request.getHeader("indicatorId");
-
 		List<LinkedHashMap<String, Object>> dataList = new ArrayList<>();
 		try {
 			//获取原始的文件名
@@ -757,7 +773,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				LinkedHashMap<String, Object> dataMap = new LinkedHashMap<>();
 
 				// 遍历每一列数据
-				for (int j = 2; j < totalColumns; j++) {
+				for (int j = 0; j < totalColumns; j++) {
 					Cell headerCell = headerRow.getCell(j);
 					Cell cell = row.getCell(j);
 
@@ -789,51 +805,60 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			}
 			workbook.close();
 			for(Map<String, Object> map : dataList){
-
-				Map<String,Object > idMap = new HashMap();
-				Map valueMap =  new HashMap();
+				Map<String,String > idMap =  new HashMap();
+				Map<String,String > valueMap =  new HashMap();
 				for (String key : map.keySet()) {
-					Object value = map.get(key);
-					if(key.startsWith("ID_")){
+					String value = String.valueOf(map.get(key));
+					if(key.startsWith("zhidmap")){
+						String[] zhidmap = key.split(",");
+						idMap.put("evalId",zhidmap[1].split("=")[1]);
+						idMap.put("indId", zhidmap[2].split("=")[1]);
+						continue;
+					}if(key.startsWith("organization")){
+						idMap.put(key,value);
+						continue;
+					}if(key.startsWith("state")){
 						idMap.put(key,value);
+						continue;
 					}else {
 						valueMap.put(key,value);
+						continue;
 					}
 				}
-
 				List<OrganizationEvaluationInfo> evaluationInfos =new ArrayList<>();
-				for (Map.Entry<String,Object > entry : idMap.entrySet()) {
+				for (Map.Entry<String,String > entry : valueMap.entrySet()) {
+					//organizationEvaluationId 考评记录id
+					// indicatorId 指标id
+					// organizationId 组织id
+					// childOptionCode 组合子指标和指标项
+					List<OrganizationEvaluationInfo>  organizationEvaluationInfoList = 	getEvaluationInfoByOptionCodeList(idMap.get("evalId"),idMap.get("indId"),idMap.get("organizationId"),entry.getKey());
 					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
-					info.setId(entry.getValue().toString());
-
-					String quantified = valueMap.get(entry.getKey().replace("ID_", "IS_LH_")).toString();
-					if ("1".equals(quantified)) {
+					OrganizationEvaluationInfo oriinfo = null;
+					if(null !=organizationEvaluationInfoList &&  organizationEvaluationInfoList.size()>0){
+						 oriinfo = organizationEvaluationInfoList.get(0);//原始数据
+						info.setId(oriinfo.getId());
+					}
+					if (oriinfo.getIsQuantified()) {
 
-						if (MathCalculatorUtil.isNumber(String.valueOf(valueMap.get(entry.getKey().replace("ID_", "")).toString()))) {
-							info.setQuantifiedValue(Double.valueOf(valueMap.get(entry.getKey().replace("ID_", "")).toString()));
+						if (MathCalculatorUtil.isNumber(String.valueOf(entry.getValue()))) {
+							info.setQuantifiedValue(Double.valueOf(entry.getValue()));
 						} else {
 							info.setQuantifiedValue(0);
 						}
-
 					}
-					System.out.println(entry.getKey().replace("ID_","")+"="+valueMap.get(entry.getKey().replace("ID_","")).toString());
-
-					info.setNonQuantifiedValue(valueMap.get(entry.getKey().replace("ID_","")).toString());
-
-					String  state2 = valueMap.get("state").toString();
+					info.setNonQuantifiedValue(entry.getValue());
+					String  state2 = idMap.get("state").toString();
 					String state = stateConvert(state2,false);
 					info.setState(state);
 					evaluationInfos.add(info);
 				}
 				this.saveOrUpdateBatch(evaluationInfos);
-
 			}
 		} catch (IOException e) {
 			e.printStackTrace();
 			return false;
 		}
 		return true;
-
 	}
 
 	@Transactional
@@ -930,7 +955,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					info.setIndicatorId(addEvaluationInfoDTO.getIndicatorId());
 					info.setIndicatorDictionaryId(d.getId());
 					info.setOptionCode(d.getOptionCode());
-					info.setIsQuantified(d.getIsQuantified());
+					info.setIsQuantified(d.getIsQuantified2());
 					if (null != optionMap.get(d.getChildCode() + "_" + d.getOptionCode())) {
 						Object value = optionMap.get(d.getChildCode() + "_" +d.getOptionCode());
 						if (null != value) {
@@ -1016,6 +1041,29 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	}
 
 
+	@Override
+	public List<OrganizationEvaluationInfo> getEvaluationInfoByOptionCodeList(String organizationEvaluationId, String indicatorId, String organizationId, String childOptionCode) {
+
+		QueryWrapper<OrganizationEvaluationInfo> qw = new QueryWrapper<>();
+
+		if (StringUtils.isNotEmpty(organizationEvaluationId)) {
+			qw.lambda().eq(OrganizationEvaluationInfo::getOrganizationEvaluationId, organizationEvaluationId);
+		}
+
+		if (StringUtils.isNotEmpty(indicatorId)) {
+			qw.lambda().eq(OrganizationEvaluationInfo::getIndicatorId, indicatorId);
+		}
+
+		if (StringUtils.isNotEmpty(organizationId)) {
+			qw.lambda().eq(OrganizationEvaluationInfo::getOrganizationId, organizationId);
+		}
+		if (StringUtils.isNotEmpty(childOptionCode)) {
+			qw.eq("CONCAT(child_code, '_', option_code)", childOptionCode);
+		}
+		List<OrganizationEvaluationInfo> list = baseMapper.selectList(qw);
+		return list;
+	}
+
 	/**
 	 * 状态抓换 (-1:不合格；0:待确认；1:已确认)
 	 * @return
@@ -1024,6 +1072,10 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 //		(-1:不合格；0:待确认；1:已确认)
 		String state2 = "";
 		if (flge) {
+			if(StringUtils.isEmpty(state)){
+				state2 = "待确认";
+				return state2;
+			}
 
 			switch (state) {
 				case "-1":
@@ -1041,7 +1093,10 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			}
 
 		} else {
-
+			if(StringUtils.isEmpty(state)){
+				state2 = "0";
+				return state2;
+			}
 			switch (state) {
 				case "不合格":
 					state2 = "-1";

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

@@ -296,6 +296,8 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setIndicatorDictionaryId(r.getId());
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());
+					info.setState("0");
+					info.setOrganizationId(evaluationRule.getOrganizationId());
 					//
 					if ("JHZ".equals(r.getOptionCode()) || "MBZ".equals(r.getOptionCode()) || "DBZ".equals(r.getOptionCode())) {
 						if (null != objectMap.get(r.getIndicatorId())) {
@@ -400,6 +402,8 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());
 					info.setCreateTime(new Date());
+					info.setState("0");
+					info.setOrganizationId(evaluationRule.getOrganizationId());
 					organizationEvaluationInfos.add(info);
 				}
 				boolean b2 = organizationEvaluationInfoService.saveBatch(organizationEvaluationInfos);
@@ -484,6 +488,8 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					info.setOptionCode(r.getOptionCode());
 					info.setIsQuantified(r.getIsQuantified());
 					info.setCreateTime(new Date());
+					info.setState("0");
+					info.setOrganizationId(evaluationRule.getOrganizationId());
 					boolean b2 = organizationEvaluationInfoService.saveOrUpdate(info);
 					if (!b2) {
 						throw new CustomException("初始化目标责任书明细失败");

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

@@ -64,7 +64,7 @@
         SELECT
         ri.id id,
         i.id indicatorId,
-        i.is_quantified isQuantified,
+        d.is_quantified isQuantified,
         i.dept_id,
         d.id indicatorDictionaryID,
         d.option_code optionCode,