导出内容调整

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtTerminalUserController.java

@@ -121,8 +121,8 @@ public class StmtTerminalUserController
         row1.createCell(0).setCellValue("终端编号");
         row1.createCell(1).setCellValue("课程包编号");
         row1.createCell(2).setCellValue("课程包名称");
-        row1.createCell(3).setCellValue("开通时间");
-        row1.createCell(4).setCellValue("到期时间");
+        row1.createCell(3).setCellValue("权限有效期");
+        row1.createCell(4).setCellValue("权限有效时长");
         row1.createCell(5).setCellValue("联系人");
         row1.createCell(6).setCellValue("联系方式");
         row1.createCell(7).setCellValue("校区名称");
@@ -144,8 +144,21 @@ public class StmtTerminalUserController
                 row.createCell(0).setCellValue(vo.getUCode());
                 row.createCell(1).setCellValue(vo.getPCode());
                 row.createCell(2).setCellValue(vo.getPName());
-                row.createCell(3).setCellValue(DateUtil.parseDateStr(vo.getStartTime()));
-                row.createCell(4).setCellValue(DateUtil.parseDateStr(vo.getEndTime()));
+                String dateStr = "起始时间: " + DateUtil.parseDateStr(vo.getStartTime()) + "\\r\\n";
+                dateStr += "到期时间：" + DateUtil.parseDateStr(vo.getEndTime());
+                row.createCell(3).setCellValue(dateStr);
+
+                //判断是否到期
+                Long curTime = new Date().getTime();
+                //获取到期天数
+                String expiredStr = "已到期";
+                long days = (vo.getEndTime() - curTime) / (1000 * 3600 * 24);
+                if (days > 0)
+                {
+                    expiredStr = days + "天到期";
+                }
+
+                row.createCell(4).setCellValue(expiredStr);
                 row.createCell(5).setCellValue(vo.getCampusContactName());
                 row.createCell(6).setCellValue(vo.getCampusContactWay());
                 row.createCell(7).setCellValue(vo.getCampusName());