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

@@ -2,6 +2,7 @@ package com.ims.eval.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.ims.eval.entity.custom.Data1015Result;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.custom.impl.BasicIndicatorBenchmarkingService;
 import lombok.extern.slf4j.Slf4j;
@@ -63,10 +64,10 @@ public class BasicIndicatorBenchmarkingController {
 	 */
 	@PostMapping(value = "queryData1015")
 	public R queryData1015(@RequestBody JSONObject object,HttpServletRequest request) {
-		JSONObject json = null;
+		List<Data1015Result>  json = null;
 		try {
 
-			json = basicIndicatorBenchmarkingService.queryData(object,request);
+			json = basicIndicatorBenchmarkingService.queryData1015(object,request);
 		} catch (Exception e) {
 			log.error("错误",e);
 			return R.error().customError("获取组织机构数据错误");

ims-service/ims-eval/src/main/java/com/ims/eval/entity/custom/Bbk1015Result.java

@@ -0,0 +1,29 @@
+package com.ims.eval.entity.custom;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Bbk1015Result {
+
+	private static final long serialVersionUID = 6131673218827464899L;
+
+
+	/**
+	 * 操作提示信息
+	 */
+	private String msg;
+
+	/**
+	 * 状态码
+	 */
+	private Integer code;
+
+	/**
+	 * date
+	 */
+	private List<Data1015Result> data;
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/custom/Data1015Result.java

@@ -0,0 +1,40 @@
+package com.ims.eval.entity.custom;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Data1015Result {
+
+	private static final long serialVersionUID = 6131673218827464899L;
+
+	private Integer parent;
+	private String districtCode;
+	private String geomY;
+	private String geomX;
+	private String orgLevel;
+	private String orgAddress;
+	private String remark;
+	private String jzPx;
+	private String orgLevelCode;
+	private String orgType;
+	private String orgCode;
+	private String department;
+	private String orgPx;
+	private String orgName;
+	private String irn;
+	private String powerLocalName;
+	private String orgCodeJt;
+	private String orgLocal;
+	private Integer provinceIrn;
+	private String orgFdType;
+	private String lyStationId;
+	private String rl;
+	private String provinceLocalName;
+	private String jzts;
+	private Integer status;
+	private List<Data1015Result> children;
+
+}

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

@@ -90,7 +90,9 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 							Map<String, List<CalculateIndicatorItemInfo>> optionCodeGropList = ciiList.stream().collect(Collectors.groupingBy(CalculateIndicatorItemInfo::getOptionCode));
 							for (Map.Entry<String, List<CalculateIndicatorItemInfo>> optionCodeGropListEntry : optionCodeGropList.entrySet()) {
 
-								List<CalculateIndicatorItemInfo> values2 = optionCodeGropListEntry.getValue().stream().filter(f->cci.getBinSection().contains(f.getSectionId())).collect(Collectors.toList());
+//								List<CalculateIndicatorItemInfo> values2 = optionCodeGropListEntry.getValue().stream().filter(f->cci.getBinSection().contains(f.getSectionId())).collect(Collectors.toList());
+
+								List<CalculateIndicatorItemInfo> values2 = optionCodeGropListEntry.getValue();
 
 								//从小到大的顺序排序
 								Collections.sort(values2, new Comparator<CalculateIndicatorItemInfo>() {

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

@@ -136,7 +136,6 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 			if ("YDKP".equals(evaluation.getCheckCycle())) {
 				if("XNYFG".equals(bi.getSectionCode()) || "ZHZC".equals(bi.getSectionCode())||
 					"GCGS".equals(bi.getSectionCode()) || "TJGS".equals(bi.getSectionCode())||
-					"QQ".equals(bi.getSectionCode()) || "JJ".equals(bi.getSectionCode())||
 					"GD".equals(bi.getSectionCode())|| "GLSX".equals(bi.getSectionCode()) ||
 					"KJCX".equals(bi.getSectionCode()) || "ZDZX".equals(bi.getSectionCode())){
 					continue;