|
@@ -23,6 +23,8 @@ import org.springframework.stereotype.Service;
|
|
|
import java.io.File;
|
|
|
import java.io.FileOutputStream;
|
|
|
import java.io.IOException;
|
|
|
+import java.text.DateFormat;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
@@ -135,18 +137,18 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
|
|
|
@Override
|
|
|
public List<WcBlackoutPlanOneVo> wcBlackoutPlanOneVolist(String startTime, String endTime, Integer type, Integer startCurrent) {
|
|
|
List<WcBlackoutPlanOneVo> plannedOutageListOne = new ArrayList<>();
|
|
|
-
|
|
|
+ DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
List<WcBlackoutPlanVo> plannedOutageList = baseMapper.plannedOutageList(startTime, endTime, type, 0, 30, startCurrent);
|
|
|
if (plannedOutageList.size() > 0) {
|
|
|
for (int j = 0; j < plannedOutageList.size(); j++) {
|
|
|
WcBlackoutPlanOneVo wcBlackoutPlanVo = new WcBlackoutPlanOneVo();
|
|
|
- wcBlackoutPlanVo.setEndTime(plannedOutageList.get(j).getEndTime());
|
|
|
+ wcBlackoutPlanVo.setEndTime(format1.format(plannedOutageList.get(j).getEndTime()));
|
|
|
wcBlackoutPlanVo.setContacts(plannedOutageList.get(j).getContacts());
|
|
|
- wcBlackoutPlanVo.setStartTime(plannedOutageList.get(j).getStartTime());
|
|
|
+ wcBlackoutPlanVo.setStartTime(format1.format(plannedOutageList.get(j).getStartTime()));
|
|
|
wcBlackoutPlanVo.setEnable(plannedOutageList.get(j).getEnable());
|
|
|
wcBlackoutPlanVo.setCreator(plannedOutageList.get(j).getCreator());
|
|
|
- wcBlackoutPlanVo.setCreateTime(plannedOutageList.get(j).getCreateTime());
|
|
|
+ wcBlackoutPlanVo.setCreateTime(format1.format(plannedOutageList.get(j).getCreateTime()));
|
|
|
wcBlackoutPlanVo.setPhone(plannedOutageList.get(j).getPhone());
|
|
|
wcBlackoutPlanVo.setSiteName(plannedOutageList.get(j).getSiteName());
|
|
|
wcBlackoutPlanVo.setId(plannedOutageList.get(j).getId());
|