Browse Source

更新床位导入接口

liu 11 months ago
parent
commit
d40d2f349a
1 changed files with 31 additions and 33 deletions
  1. 31 33
      src/main/java/com/template/controller/WelcomeBedController.java

+ 31 - 33
src/main/java/com/template/controller/WelcomeBedController.java

@@ -706,41 +706,39 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         Sheet sheet = workbook.createSheet("床位信息");
         Sheet sheet = workbook.createSheet("床位信息");
 
 
         Row headerRow = sheet.createRow(0);
         Row headerRow = sheet.createRow(0);
-        headerRow.createCell(0).setCellValue("序号");
-        headerRow.createCell(1).setCellValue("校区名称");
-        headerRow.createCell(2).setCellValue("楼栋名称");
-        headerRow.createCell(3).setCellValue("寝室号");
-        headerRow.createCell(4).setCellValue("床位号");
-        headerRow.createCell(5).setCellValue("床位性别");
-        headerRow.createCell(6).setCellValue("所属年级");
-        headerRow.createCell(7).setCellValue("所属学院");
-        headerRow.createCell(8).setCellValue("所属专业");
-        headerRow.createCell(9).setCellValue("所属班级");
-        headerRow.createCell(10).setCellValue("辅导员");
-        headerRow.createCell(11).setCellValue("是否入住");
-        headerRow.createCell(12).setCellValue("录取号");
-        headerRow.createCell(13).setCellValue("姓名");
-        headerRow.createCell(14).setCellValue("备注");
-        headerRow.createCell(15).setCellValue("是否保留");
+        headerRow.createCell(0).setCellValue("校区名称");
+        headerRow.createCell(1).setCellValue("楼栋名称");
+        headerRow.createCell(2).setCellValue("寝室号");
+        headerRow.createCell(3).setCellValue("床位号");
+        headerRow.createCell(4).setCellValue("床位性别");
+        headerRow.createCell(5).setCellValue("所属年级");
+        headerRow.createCell(6).setCellValue("所属学院");
+        headerRow.createCell(7).setCellValue("所属专业");
+        headerRow.createCell(8).setCellValue("所属班级");
+        headerRow.createCell(9).setCellValue("辅导员");
+        headerRow.createCell(10).setCellValue("是否入住");
+        headerRow.createCell(11).setCellValue("录取号");
+        headerRow.createCell(12).setCellValue("姓名");
+        headerRow.createCell(13).setCellValue("备注");
+        headerRow.createCell(14).setCellValue("是否保留");
         for (int i = 0; i < result.size(); i++) {
         for (int i = 0; i < result.size(); i++) {
             WelcomeBed bed = result.get(i);
             WelcomeBed bed = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
             Row dataRow = sheet.createRow(i + 1);
-            dataRow.createCell(0).setCellValue(i + 1);
-            dataRow.createCell(1).setCellValue(bed.getSchool());
-            dataRow.createCell(2).setCellValue(bed.getBuild());
-            dataRow.createCell(3).setCellValue(bed.getDormitory());
-            dataRow.createCell(4).setCellValue(bed.getNumber());
-            dataRow.createCell(5).setCellValue(bed.getSex());
+            dataRow.createCell(0).setCellValue(bed.getSchool());
+            dataRow.createCell(1).setCellValue(bed.getBuild());
+            dataRow.createCell(2).setCellValue(bed.getDormitory());
+            dataRow.createCell(3).setCellValue(bed.getNumber());
+            dataRow.createCell(4).setCellValue(bed.getSex());
             if (ObjectUtils.isEmpty(bed.getGrade())) {
             if (ObjectUtils.isEmpty(bed.getGrade())) {
-                dataRow.createCell(6).setCellValue("");
+                dataRow.createCell(5).setCellValue("");
             } else {
             } else {
-                dataRow.createCell(6).setCellValue(bed.getGrade());
+                dataRow.createCell(5).setCellValue(bed.getGrade());
             }
             }
 
 
-            dataRow.createCell(7).setCellValue(bed.getCollege());
-            dataRow.createCell(8).setCellValue(bed.getMajor());
-            dataRow.createCell(9).setCellValue(bed.getClassstr());
-            dataRow.createCell(10).setCellValue(bed.getInstructor());
+            dataRow.createCell(6).setCellValue(bed.getCollege());
+            dataRow.createCell(7).setCellValue(bed.getMajor());
+            dataRow.createCell(8).setCellValue(bed.getClassstr());
+            dataRow.createCell(9).setCellValue(bed.getInstructor());
             Integer isCheck1 = bed.getIsCheck();
             Integer isCheck1 = bed.getIsCheck();
             String rz = "";
             String rz = "";
             if (isCheck1 == 1) {
             if (isCheck1 == 1) {
@@ -748,10 +746,10 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             } else {
             } else {
                 rz = "否";
                 rz = "否";
             }
             }
-            dataRow.createCell(11).setCellValue(rz);
-            dataRow.createCell(12).setCellValue(bed.getCardNum());
-            dataRow.createCell(13).setCellValue(bed.getName());
-            dataRow.createCell(14).setCellValue(bed.getRemark());
+            dataRow.createCell(10).setCellValue(rz);
+            dataRow.createCell(11).setCellValue(bed.getCardNum());
+            dataRow.createCell(12).setCellValue(bed.getName());
+            dataRow.createCell(13).setCellValue(bed.getRemark());
             Integer retentionState1 = bed.getRetentionState();
             Integer retentionState1 = bed.getRetentionState();
             String bl = "";
             String bl = "";
             if (1 == retentionState1) {
             if (1 == retentionState1) {
@@ -759,7 +757,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             } else {
             } else {
                 bl = "是";
                 bl = "是";
             }
             }
-            dataRow.createCell(15).setCellValue(bl);
+            dataRow.createCell(14).setCellValue(bl);
 
 
         }
         }
         // 将工作簿写入文件
         // 将工作簿写入文件