|
@@ -110,30 +110,30 @@ public class WcBlackoutPlanServiceImpl extends AbstractCrudService<WcBlackoutPla
|
|
|
(o, i) -> {
|
|
|
int startCurrent = (i - 1) * 30;
|
|
|
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.setContacts(plannedOutageList.get(j).getContacts());
|
|
|
- wcBlackoutPlanVo.setStartTime(plannedOutageList.get(j).getStartTime());
|
|
|
- wcBlackoutPlanVo.setEnable(plannedOutageList.get(j).getEnable());
|
|
|
- wcBlackoutPlanVo.setCreator(plannedOutageList.get(j).getCreator());
|
|
|
- wcBlackoutPlanVo.setCreateTime(plannedOutageList.get(j).getCreateTime());
|
|
|
- wcBlackoutPlanVo.setPhone(plannedOutageList.get(j).getPhone());
|
|
|
- wcBlackoutPlanVo.setSiteName(plannedOutageList.get(j).getSiteName());
|
|
|
- wcBlackoutPlanVo.setId(plannedOutageList.get(j).getId());
|
|
|
- wcBlackoutPlanVo.setPlanType(plannedOutageList.get(j).getPlanType());
|
|
|
- wcBlackoutPlanVo.setSiteId(plannedOutageList.get(j).getSiteId());
|
|
|
- if (plannedOutageList.get(j).getStartTime().getTime()>new Date().getTime()){
|
|
|
- wcBlackoutPlanVo.setType("未执行");
|
|
|
- }else if(plannedOutageList.get(j).getStartTime().getTime()<new Date().getTime()&&plannedOutageList.get(j).getEndTime().getTime()>new Date().getTime()){
|
|
|
- wcBlackoutPlanVo.setType("执行中");
|
|
|
- }else if (plannedOutageList.get(j).getEndTime().getTime()<new Date().getTime()){
|
|
|
- wcBlackoutPlanVo.setType("已执行");
|
|
|
- }
|
|
|
- plannedOutageListOne.add(wcBlackoutPlanVo);
|
|
|
- }
|
|
|
- }
|
|
|
+// if (plannedOutageList.size()>0){
|
|
|
+// for (int j = 0; j< plannedOutageList.size(); j++) {
|
|
|
+// WcBlackoutPlanOneVo wcBlackoutPlanVo = new WcBlackoutPlanOneVo();
|
|
|
+// wcBlackoutPlanVo.setEndTime(plannedOutageList.get(j).getEndTime());
|
|
|
+// wcBlackoutPlanVo.setContacts(plannedOutageList.get(j).getContacts());
|
|
|
+// wcBlackoutPlanVo.setStartTime(plannedOutageList.get(j).getStartTime());
|
|
|
+// wcBlackoutPlanVo.setEnable(plannedOutageList.get(j).getEnable());
|
|
|
+// wcBlackoutPlanVo.setCreator(plannedOutageList.get(j).getCreator());
|
|
|
+// wcBlackoutPlanVo.setCreateTime(plannedOutageList.get(j).getCreateTime());
|
|
|
+// wcBlackoutPlanVo.setPhone(plannedOutageList.get(j).getPhone());
|
|
|
+// wcBlackoutPlanVo.setSiteName(plannedOutageList.get(j).getSiteName());
|
|
|
+// wcBlackoutPlanVo.setId(plannedOutageList.get(j).getId());
|
|
|
+// wcBlackoutPlanVo.setPlanType(plannedOutageList.get(j).getPlanType());
|
|
|
+// wcBlackoutPlanVo.setSiteId(plannedOutageList.get(j).getSiteId());
|
|
|
+// if (plannedOutageList.get(j).getStartTime().getTime()>new Date().getTime()){
|
|
|
+// wcBlackoutPlanVo.setType("未执行");
|
|
|
+// }else if(plannedOutageList.get(j).getStartTime().getTime()<new Date().getTime()&&plannedOutageList.get(j).getEndTime().getTime()>new Date().getTime()){
|
|
|
+// wcBlackoutPlanVo.setType("执行中");
|
|
|
+// }else if (plannedOutageList.get(j).getEndTime().getTime()<new Date().getTime()){
|
|
|
+// wcBlackoutPlanVo.setType("已执行");
|
|
|
+// }
|
|
|
+// plannedOutageListOne.add(wcBlackoutPlanVo);
|
|
|
+// }
|
|
|
+// }
|
|
|
return new ArrayList<>(BeanMapperUtils.mapList(plannedOutageList, WcBlackoutPlanVo.class, WcBlackoutPlanOneExportVo.class));
|
|
|
}, null);
|
|
|
if (null != workbook) {
|