功能完善

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

@@ -52,12 +52,12 @@ public class BasicIndicatorBenchmarkingController {
 	}
 
 	/**
-	 * 获取基础指标对标同期数据
+	 * 获取基础指标对标同比数据
 	 *
 	 * @param object
 	 * @return
 	 */
-	@PostMapping(value = "contemporaneousData")
+	@PostMapping(value = "/contemporaneousData")
 	public R contemporaneousData(@RequestBody JSONObject object, HttpServletRequest request) {
 		Map json = null;
 		try {
@@ -71,12 +71,12 @@ public class BasicIndicatorBenchmarkingController {
 	}
 
 	/**
-	 * 获取基础指标对标上期数据
+	 * 获取基础指标对标环比数据
 	 *
 	 * @param object
 	 * @return
 	 */
-	@PostMapping(value = "previousPeriodData")
+	@PostMapping(value = "/previousPeriodData")
 	public R previousPeriodData(@RequestBody JSONObject object, HttpServletRequest request) {
 		Map json = null;
 		try {

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/BasicIndicatorBenchmarkingService.java

@@ -1,6 +1,8 @@
 package com.ims.eval.service.custom.impl;
 
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ims.eval.config.ImaConfig;
@@ -160,12 +162,19 @@ public class BasicIndicatorBenchmarkingService {
 	}
 
 	/**
-	 * 获取基础指标对标同期数据
+	 * 获取基础指标对标同比数据
 	 *
 	 * @param body
 	 * @return
 	 */
 	public Map contemporaneousData(JSONObject body, HttpServletRequest request) {
+		JSONObject obj = body.getJSONObject("map");
+		obj.remove("startTime");
+		String startTime = DateUtil.formatDate(DateUtil.offset(DateUtil.parse(obj.getString("startTime"), "yyyy-MM-dd"), DateField.YEAR, -1));
+		obj.put("startTime", startTime);
+		obj.remove("endTime");
+		String endTime = DateUtil.formatDate(DateUtil.offset(DateUtil.parse(obj.getString("endTime"), "yyyy-MM-dd"), DateField.YEAR, -1));
+		obj.put("endTime", endTime);
 		Map count = new LinkedHashMap();
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
@@ -243,12 +252,19 @@ public class BasicIndicatorBenchmarkingService {
 	}
 
 	/**
-	 * 获取基础指标对标上期数据
+	 * 获取基础指标对标环比数据
 	 *
 	 * @param body
 	 * @return
 	 */
 	public Map previousPeriodData(JSONObject body, HttpServletRequest request) {
+		JSONObject obj = body.getJSONObject("map");
+		obj.remove("startTime");
+		String startTime = DateUtil.formatDate(DateUtil.offsetMonth(DateUtil.parse(obj.getString("startTime"), "yyyy-MM-dd"), -1));
+		obj.put("startTime", startTime);
+		obj.remove("endTime");
+		String endTime = DateUtil.formatDate(DateUtil.offsetMonth(DateUtil.parse(obj.getString("endTime"), "yyyy-MM-dd"), -1));
+		obj.put("endTime", endTime);
 		Map count = new LinkedHashMap();
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_JSON_UTF8);

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

@@ -238,7 +238,7 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 							OrganizationStructure organizationStructure0 = organizationStructureList.stream().filter(item -> item.getShortName().equals(str[0])).findFirst().orElse(null);
 							if (null != organizationStructure0) {
 								multipleBrand.setOrganizationId(organizationStructure0.getId());
-								multipleBrand.setOrganizationName(organizationStructure0.getName());
+								multipleBrand.setOrganizationName(organizationStructure0.getShortName());
 							}
 							if (null != str[1] && !"".equals(str[1])) {
 								OrganizationStructure organizationStructure1 = organizationStructureList.stream().filter(item -> item.getShortName().equals(str[1])).findFirst().orElse(null);
@@ -252,7 +252,9 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 							multipleBrand.setScore(Double.valueOf(str[5]));
 							multipleBrand.setYear(str[6]);
 							multipleBrand.setMonth(str[7]);
-							multipleBrand.setRemark(str[8]);
+							if (null != str[8]){
+								multipleBrand.setRemark(str[8]);
+							}
 							multipleBrandList.add(multipleBrand);
 						}
 					}