导出调整

common/src/main/resources/mapper/base/ApplicationMiddle.xml

@@ -237,6 +237,7 @@
         <result property="offerImg" column="offer_img"/>
         <result property="personName" column="person_name"/>
         <result property="personPhone" column="person_phone"/>
+        <result property="sex" column="sex_"/>
         <result property="schoolNumberId" column="school_number_id"/>
         <association property="schoolNumber" column="school_number_id"
                      select="com.jpsoft.campus.modules.base.dao.SchoolNumberDAO.get"></association>
@@ -258,7 +259,8 @@
 			a.offer_img,
 			a.school_number_id,
 			f.name_ as person_name,
-			f.phone_ as person_phone
+			f.phone_ as person_phone,
+			b.sex_ as sex_
 			FROM base_application_middle a
 			LEFT JOIN base_student_info b ON a.student_id = b.id_
 			LEFT JOIN base_person_student c ON (a.person_id = c.person_id AND a.student_id = c.student_id)

common/src/main/resources/mapper/base/ApplicationPrimary.xml

@@ -231,6 +231,7 @@
         <result property="offerImg" column="offer_img"/>
         <result property="personName" column="person_name"/>
         <result property="personPhone" column="person_phone"/>
+        <result property="sex" column="sex_"/>
         <result property="schoolNumberId" column="school_number_id"/>
         <association property="schoolNumber" column="school_number_id"
                      select="com.jpsoft.campus.modules.base.dao.SchoolNumberDAO.get"></association>
@@ -252,7 +253,8 @@
 			a.offer_img,
 			a.school_number_id,
 			f.name_ as person_name,
-			f.phone_ as person_phone
+			f.phone_ as person_phone,
+			b.sex_ as sex_
 			FROM base_application_primary a
 			LEFT JOIN base_student_info b ON a.student_id = b.id_
 			LEFT JOIN base_person_student c ON (a.person_id = c.person_id AND a.student_id = c.student_id)

web/src/main/java/com/jpsoft/campus/modules/base/controller/ApplicationMiddleController.java

@@ -1154,7 +1154,7 @@ public class ApplicationMiddleController {
             HSSFCell cellTitle13 = rowTitle.createCell(12);
             cellTitle13.setCellValue("插班生报名年级");
             HSSFCell cellTitle14 = rowTitle.createCell(13);
-            cellTitle14.setCellValue("");
+            cellTitle14.setCellValue("性别");
             HSSFCell cellTitle15 = rowTitle.createCell(14);
             cellTitle15.setCellValue("");
             HSSFCell cellTitle16 = rowTitle.createCell(15);
@@ -1163,6 +1163,8 @@ public class ApplicationMiddleController {
             cellTitle17.setCellValue("");
             HSSFCell cellTitle18 = rowTitle.createCell(17);
             cellTitle18.setCellValue("");
+            HSSFCell cellTitle19 = rowTitle.createCell(18);
+            cellTitle19.setCellValue("");
 
 //            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
 //            for(int i = 1; i < maxColumn; i++) {
@@ -1325,6 +1327,15 @@ public class ApplicationMiddleController {
                     cellContent13.setCellValue(amDTO.getSchoolNumber().getGradeStr());
                 }
 
+                if(amDTO.getSex() != null) {
+                    HSSFCell cellContent14 = rowContent.createCell(13);
+                    if (amDTO.getSex() == 1) {
+                        cellContent14.setCellValue("男");
+                    } else {
+                        cellContent14.setCellValue("女");
+                    }
+                }
+
                 List<Sort> sortList2 = new ArrayList<>();
                 sortList2.add(new Sort("create_time","asc"));
                 Map<String,Object> searchParams2 = new HashMap<>();
@@ -1337,7 +1348,7 @@ public class ApplicationMiddleController {
                 Page<ApprovalInfo> aiPage = approvalInfoService.pageSearch(searchParams2,0,1000,false,sortList2);
                 List<ApprovalInfo> apList = aiPage.getResult();
                 for(int b =0;b<apList.size();b++){
-                    HSSFCell cellContent = rowContent.createCell(b+13);
+                    HSSFCell cellContent = rowContent.createCell(b+14);
                     ApprovalInfo ap = apList.get(b);
                     cellContent.setCellValue(ap.getRemark());
                 }

web/src/main/java/com/jpsoft/campus/modules/base/controller/ApplicationPrimaryController.java

@@ -1272,7 +1272,7 @@ public class ApplicationPrimaryController {
             HSSFCell cellTitle13 = rowTitle.createCell(12);
             cellTitle13.setCellValue("插班生报名年级");
             HSSFCell cellTitle14 = rowTitle.createCell(13);
-            cellTitle14.setCellValue("");
+            cellTitle14.setCellValue("性别");
             HSSFCell cellTitle15 = rowTitle.createCell(14);
             cellTitle15.setCellValue("");
             HSSFCell cellTitle16 = rowTitle.createCell(15);
@@ -1281,6 +1281,8 @@ public class ApplicationPrimaryController {
             cellTitle17.setCellValue("");
             HSSFCell cellTitle18 = rowTitle.createCell(17);
             cellTitle18.setCellValue("");
+            HSSFCell cellTitle19 = rowTitle.createCell(18);
+            cellTitle19.setCellValue("");
 
 //            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
 //            for(int i = 1; i < maxColumn; i++) {
@@ -1449,6 +1451,15 @@ public class ApplicationPrimaryController {
                     cellContent13.setCellValue(apDTO.getSchoolNumber().getGradeStr());
                 }
 
+                if(apDTO.getSex() != null) {
+                    HSSFCell cellContent14 = rowContent.createCell(13);
+                    if (apDTO.getSex() == 1) {
+                        cellContent14.setCellValue("男");
+                    } else {
+                        cellContent14.setCellValue("女");
+                    }
+                }
+
                 List<Sort> sortList2 = new ArrayList<>();
                 sortList2.add(new Sort("create_time","asc"));
                 Map<String,Object> searchParams2 = new HashMap<>();
@@ -1461,7 +1472,7 @@ public class ApplicationPrimaryController {
                 Page<ApprovalInfo> aiPage = approvalInfoService.pageSearch(searchParams2,0,1000,false,sortList2);
                 List<ApprovalInfo> apList = aiPage.getResult();
                 for(int b =0;b<apList.size();b++){
-                    HSSFCell cellContent = rowContent.createCell(b+13);
+                    HSSFCell cellContent = rowContent.createCell(b+14);
                     ApprovalInfo ap = apList.get(b);
                     cellContent.setCellValue(ap.getRemark());
                 }