|
|
@@ -11,10 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
|
@Service
|
|
|
@@ -75,9 +72,12 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
|
|
|
List<Map<String,Object>> curThurs = new ArrayList<>();
|
|
|
List<Map<String,Object>> curTuess = new ArrayList<>();
|
|
|
List<Map<String,Object>> curWeds = new ArrayList<>();
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("hh:mm");
|
|
|
+ SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
|
|
|
+ dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-6"));
|
|
|
for (ClazzCurriculumDO cc:curricula) {
|
|
|
Long curFri = cc.getCurFri();
|
|
|
+ //System.err.println(cc.getCurStartTime());
|
|
|
+ //System.err.println(dateFormat.format(cc.getCurStartTime()));
|
|
|
if (ObjectUtils.isNotEmpty(curFri)){
|
|
|
Map<String, Object> curFriMap = new HashMap<>();
|
|
|
curFriMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
|