基础指标对标

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

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,10 +44,10 @@ public class BasicIndicatorBenchmarkingController {
 	 */
 	@PostMapping(value = "queryData1011")
 	public R queryData1011(@RequestBody JSONObject object,HttpServletRequest request) {
-		JSONObject json = null;
+		Map json = null;
 		try {
 
-			json = basicIndicatorBenchmarkingService.queryData(object,request);
+			json = basicIndicatorBenchmarkingService.queryData1011(object,request);
 		} catch (Exception e) {
 			log.error("错误",e);
 			return R.error().customError("获取获取对标数据错误");

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

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

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

@@ -0,0 +1,28 @@
+package com.ims.eval.entity.custom;
+
+
+import lombok.Data;
+
+@Data
+public class Data1011Result {
+
+	private static final long serialVersionUID = 6131673218827464899L;
+	private String lastTime;
+	private String valueTime;
+	private String orgName;
+	private String unitName;
+	private Integer irn;
+	private String fdlx;
+	private String itemCode;
+	private String indexCode;
+	private double tongQiValue;
+	private double shangQiValue;
+	private String itemName;
+	private String month;
+	private String orgCode;
+	private String unitCode;
+	private double huanBi;
+	private double tongBi;
+	private String time;
+	private double value;
+}