Commit e8470581 authored by suhuiguang's avatar suhuiguang

1,修复日期为%Y-%m-%d

parent 7af83d62
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</select> </select>
<select id="genRangeDate" resultType="map"> <select id="genRangeDate" resultType="map">
SELECT SELECT
DATE( DATE_ADD( #{beginDate}, INTERVAL @s DAY ) ) AS date, DATE_FORMAT(DATE( DATE_ADD( #{beginDate}, INTERVAL @s DAY )),'%Y-%m-%d') AS date,
@s := @s + 1 AS `index` @s := @s + 1 AS `index`
FROM FROM
mysql.help_topic, mysql.help_topic,
......
...@@ -89,6 +89,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService { ...@@ -89,6 +89,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
return rangeDate.stream().map(p -> { return rangeDate.stream().map(p -> {
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
result.put("key", p.get("date")); result.put("key", p.get("date"));
result.put("viewType", viewTypeEnum.getCode());
result.put("data", this.buildViewData(viewTypeEnum, p.get("date").toString(), RequestContext.getAppKey())); result.put("data", this.buildViewData(viewTypeEnum, p.get("date").toString(), RequestContext.getAppKey()));
return result; return result;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment