功能完善

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

@@ -169,11 +169,11 @@ public class BasicIndicatorBenchmarkingService {
 	 */
 	public Map contemporaneousData(JSONObject body, HttpServletRequest request) {
 		JSONObject obj = body.getJSONObject("map");
+		String startTime = DateUtil.formatDate(DateUtil.offset(DateUtil.parse(obj.getString("startTime")), DateField.YEAR, -1));
 		obj.remove("startTime");
-		String startTime = DateUtil.formatDate(DateUtil.offset(DateUtil.parse(obj.getString("startTime"), "yyyy-MM-dd"), DateField.YEAR, -1));
 		obj.put("startTime", startTime);
+		String endTime = DateUtil.formatDate(DateUtil.offset(DateUtil.parse(obj.getString("endTime")), DateField.YEAR, -1));
 		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();
@@ -259,11 +259,11 @@ public class BasicIndicatorBenchmarkingService {
 	 */
 	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.remove("startTime");
 		obj.put("startTime", startTime);
-		obj.remove("endTime");
 		String endTime = DateUtil.formatDate(DateUtil.offsetMonth(DateUtil.parse(obj.getString("endTime"), "yyyy-MM-dd"), -1));
+		obj.remove("endTime");
 		obj.put("endTime", endTime);
 		Map count = new LinkedHashMap();
 		HttpHeaders headers = new HttpHeaders();