|
@@ -9,6 +9,7 @@ import cn.rankin.cmsweb.service.user.TerminalUserService;
|
|
|
import cn.rankin.common.utils.api.model.APIResult;
|
|
|
import cn.rankin.common.utils.api.page.Page;
|
|
|
import cn.rankin.common.utils.util.BeanUtil;
|
|
|
+import cn.rankin.common.utils.util.DateUtil;
|
|
|
import cn.rankin.common.utils.util.ListUtil;
|
|
|
import cn.rankin.data.api.product.vo.ProductVo;
|
|
|
import cn.rankin.data.api.user.dto.CampusSearchDTO;
|
|
@@ -138,7 +139,8 @@ public class StmtTerminalUserController
|
|
|
row.createCell(4).setCellValue(vo.getEndTime());
|
|
|
row.createCell(5).setCellValue(vo.getCampusContactName());
|
|
|
row.createCell(6).setCellValue(vo.getCampusContactWay());
|
|
|
- row.createCell(7).setCellValue(vo.getCampusContactWay());
|
|
|
+ row.createCell(7).setCellValue(vo.getCampusName());
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -201,6 +203,11 @@ public class StmtTerminalUserController
|
|
|
|
|
|
for (TerminalUserAuthVo vo : terminalUserAuthVos)
|
|
|
{
|
|
|
+ //时间转换
|
|
|
+ String startTime = DateUtil.parseDateStr(vo.getStartTime());
|
|
|
+ String endTime = DateUtil.parseDateStr(vo.getEndTime());
|
|
|
+ vo.setStartTimeStr(startTime);
|
|
|
+ vo.setEndTimeStr(endTime);
|
|
|
String campusId = vo.getCampusId();
|
|
|
|
|
|
if (campusId != null && campusId.trim() != "")
|