|
@@ -1,11 +1,14 @@
|
|
|
package com.slibra.web.controller.business;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import com.slibra.common.DecimalUtils;
|
|
|
+import com.slibra.common.utils.DateUtils;
|
|
|
+import com.slibra.common.utils.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -42,7 +45,7 @@ public class TXinyiForecastComparisonController extends BaseController
|
|
|
private ITXinyiForecastComparisonService tXinyiForecastComparisonService;
|
|
|
|
|
|
/**
|
|
|
- * 查询信义预测对比列表
|
|
|
+ * 查询信义预测对比列表(分页)
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:comparison:list')")
|
|
|
@GetMapping("/list")
|
|
@@ -54,6 +57,33 @@ public class TXinyiForecastComparisonController extends BaseController
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 图标展示接口(不分页)
|
|
|
+ * @param tXinyiForecastComparison
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @GetMapping("/echartsList")
|
|
|
+ public List<TXinyiForecastComparison> echartsList(TXinyiForecastComparison tXinyiForecastComparison)
|
|
|
+ {
|
|
|
+ //请求参数
|
|
|
+ String timeBegin = tXinyiForecastComparison.getTimeBegin();
|
|
|
+ String timeEnd = tXinyiForecastComparison.getTimeEnd();
|
|
|
+
|
|
|
+ //日期兜底处理
|
|
|
+ Date nowDate = DateUtils.getNowDate();
|
|
|
+ Date dayBefore7 = DateUtils.plusDate(-7, nowDate);
|
|
|
+ //先用日期获取当天和前一天的数据,如果获取不到,则提示错误信息
|
|
|
+ String nowDateStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, nowDate);
|
|
|
+ String dayBefore7Str = DateUtils.parseDateToStr(DateUtils.YYYYMMDD_TS, dayBefore7);
|
|
|
+ if(StringUtils.isBlank(timeBegin))
|
|
|
+ tXinyiForecastComparison.setTimeBegin(dayBefore7Str);
|
|
|
+ if(StringUtils.isBlank(timeEnd))
|
|
|
+ tXinyiForecastComparison.setTimeEnd(nowDateStr);
|
|
|
+ // this.addListExtra(list);//处理误差率 乘以100,取绝对值 保留2位小数
|
|
|
+ return tXinyiForecastComparisonService.selectTXinyiForecastComparisonList(tXinyiForecastComparison);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 导出信义预测对比列表
|
|
|
*/
|