导出调整

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

@@ -237,6 +237,9 @@
         <result property="offerImg" column="offer_img"/>
         <result property="personName" column="person_name"/>
         <result property="personPhone" column="person_phone"/>
+        <result property="schoolNumberId" column="school_number_id"/>
+        <association property="schoolNumber" column="school_number_id"
+                     select="com.jpsoft.campus.modules.base.dao.SchoolNumberDAO.get"></association>
     </resultMap>
     <select id="searchDTO" parameterType="hashmap" resultMap="ApplicationMiddleDTOMap">
         <![CDATA[
@@ -253,6 +256,7 @@
 			e.name_ as offer_name,
 			a.offer_code,
 			a.offer_img,
+			a.school_number_id,
 			f.name_ as person_name,
 			f.phone_ as person_phone
 			FROM base_application_middle a

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

@@ -231,7 +231,9 @@
         <result property="offerImg" column="offer_img"/>
         <result property="personName" column="person_name"/>
         <result property="personPhone" column="person_phone"/>
-
+        <result property="schoolNumberId" column="school_number_id"/>
+        <association property="schoolNumber" column="school_number_id"
+                     select="com.jpsoft.campus.modules.base.dao.SchoolNumberDAO.get"></association>
     </resultMap>
     <select id="searchDTO" parameterType="hashmap" resultMap="ApplicationPrimaryDTOMap">
         <![CDATA[
@@ -248,6 +250,7 @@
 			e.name_ as offer_name,
 			a.offer_code,
 			a.offer_img,
+			a.school_number_id,
 			f.name_ as person_name,
 			f.phone_ as person_phone
 			FROM base_application_primary a

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

@@ -1152,7 +1152,7 @@ public class ApplicationMiddleController {
             HSSFCell cellTitle12 = rowTitle.createCell(11);
             cellTitle12.setCellValue("学生地址");
             HSSFCell cellTitle13 = rowTitle.createCell(12);
-            cellTitle13.setCellValue("");
+            cellTitle13.setCellValue("插班生报名年级");
             HSSFCell cellTitle14 = rowTitle.createCell(13);
             cellTitle14.setCellValue("");
             HSSFCell cellTitle15 = rowTitle.createCell(14);
@@ -1161,12 +1161,15 @@ public class ApplicationMiddleController {
             cellTitle16.setCellValue("");
             HSSFCell cellTitle17 = rowTitle.createCell(16);
             cellTitle17.setCellValue("");
+            HSSFCell cellTitle18 = rowTitle.createCell(17);
+            cellTitle18.setCellValue("");
 
 //            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
 //            for(int i = 1; i < maxColumn; i++) {
 //                //int columnWidth = sheet.getColumnWidth(i) / 256;
 //                sheet.setColumnWidth(i, 12 * 256);
 //            }
+            sheet.setColumnWidth(1, 15 * 256);
             //学校
             sheet.setColumnWidth(2, 20 * 256);
             //身份证
@@ -1177,6 +1180,8 @@ public class ApplicationMiddleController {
             sheet.setColumnWidth(10, 15 * 256);
             //地址
             sheet.setColumnWidth(11, 50 * 256);
+            //插班生报名年级
+            sheet.setColumnWidth(12, 20 * 256);
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -1314,6 +1319,12 @@ public class ApplicationMiddleController {
                 HSSFCell cellContent12 = rowContent.createCell(11);
                 cellContent12.setCellValue(amDTO.getAddress());
 
+                //插班生报名年级
+                HSSFCell cellContent13 = rowContent.createCell(12);
+                if(amDTO.getSchoolNumber() != null) {
+                    cellContent13.setCellValue(amDTO.getSchoolNumber().getGradeStr());
+                }
+
                 List<Sort> sortList2 = new ArrayList<>();
                 sortList2.add(new Sort("create_time","asc"));
                 Map<String,Object> searchParams2 = new HashMap<>();
@@ -1326,7 +1337,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+12);
+                    HSSFCell cellContent = rowContent.createCell(b+13);
                     ApprovalInfo ap = apList.get(b);
                     cellContent.setCellValue(ap.getRemark());
                 }
@@ -1989,6 +2000,9 @@ public class ApplicationMiddleController {
             cellTitle9.setCellValue("联系电话");
             HSSFCell cellTitle10 = rowTitle.createCell(9);
             cellTitle10.setCellValue("学生地址");
+            HSSFCell cellTitle11 = rowTitle.createCell(10);
+            cellTitle11.setCellValue("插班生报名年级");
+
 
 //            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
 //            for(int i = 1; i < maxColumn; i++) {
@@ -1998,13 +2012,14 @@ public class ApplicationMiddleController {
 
             sheet.setColumnWidth(1, 20 * 256);
             sheet.setColumnWidth(2, 20 * 256);
-            sheet.setColumnWidth(3, 10 * 256);
+            sheet.setColumnWidth(3, 15 * 256);
             sheet.setColumnWidth(4, 15 * 256);
             sheet.setColumnWidth(5, 25 * 256);
             sheet.setColumnWidth(6, 20 * 256);
             sheet.setColumnWidth(7, 15 * 256);
             sheet.setColumnWidth(8, 20 * 256);
             sheet.setColumnWidth(9, 40 * 256);
+            sheet.setColumnWidth(10, 20 * 256);
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -2123,6 +2138,12 @@ public class ApplicationMiddleController {
                 //"学生地址"
                 HSSFCell cellContent10 = rowContent.createCell(9);
                 cellContent10.setCellValue(amDTO.getAddress());
+
+                //插班转学录取年级
+                HSSFCell cellContent11 = rowContent.createCell(10);
+                if(amDTO.getSchoolNumber() != null) {
+                    cellContent11.setCellValue(amDTO.getSchoolNumber().getGradeStr());
+                }
             }
 
             //todo 将wb保存到oss

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

@@ -1270,7 +1270,7 @@ public class ApplicationPrimaryController {
             HSSFCell cellTitle12 = rowTitle.createCell(11);
             cellTitle12.setCellValue("学生地址");
             HSSFCell cellTitle13 = rowTitle.createCell(12);
-            cellTitle13.setCellValue("");
+            cellTitle13.setCellValue("插班生报名年级");
             HSSFCell cellTitle14 = rowTitle.createCell(13);
             cellTitle14.setCellValue("");
             HSSFCell cellTitle15 = rowTitle.createCell(14);
@@ -1279,12 +1279,15 @@ public class ApplicationPrimaryController {
             cellTitle16.setCellValue("");
             HSSFCell cellTitle17 = rowTitle.createCell(16);
             cellTitle17.setCellValue("");
+            HSSFCell cellTitle18 = rowTitle.createCell(17);
+            cellTitle18.setCellValue("");
 
 //            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
 //            for(int i = 1; i < maxColumn; i++) {
 //                //int columnWidth = sheet.getColumnWidth(i) / 256;
 //                sheet.setColumnWidth(i, 12 * 256);
 //            }
+            sheet.setColumnWidth(1, 15 * 256);
             //学校
             sheet.setColumnWidth(2, 20 * 256);
             //身份证
@@ -1295,6 +1298,8 @@ public class ApplicationPrimaryController {
             sheet.setColumnWidth(10, 15 * 256);
             //地址
             sheet.setColumnWidth(11, 50 * 256);
+            //插班生报名年级
+            sheet.setColumnWidth(12, 20 * 256);
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -1305,7 +1310,12 @@ public class ApplicationPrimaryController {
                 searchParams.put("tabStatus",tabStatus);
             }
             if (StringUtils.isNotEmpty(type)) {
-                searchParams.put("type",type);
+                if("A".equals(type) || "B".equals(type) ||"C".equals(type) || "Y".equals(type) || "Z".equals(type)) {
+                    searchParams.put("type", type);
+                }else{
+                    searchParams.put("type", "C");
+                    searchParams.put("categoryId", type);
+                }
             }
             if (StringUtils.isNotEmpty(status)) {
                 searchParams.put("status",status);
@@ -1433,6 +1443,12 @@ public class ApplicationPrimaryController {
                 HSSFCell cellContent12 = rowContent.createCell(11);
                 cellContent12.setCellValue(apDTO.getAddress());
 
+                //插班生报名年级
+                HSSFCell cellContent13 = rowContent.createCell(12);
+                if(apDTO.getSchoolNumber() != null) {
+                    cellContent13.setCellValue(apDTO.getSchoolNumber().getGradeStr());
+                }
+
                 List<Sort> sortList2 = new ArrayList<>();
                 sortList2.add(new Sort("create_time","asc"));
                 Map<String,Object> searchParams2 = new HashMap<>();
@@ -1445,7 +1461,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+12);
+                    HSSFCell cellContent = rowContent.createCell(b+13);
                     ApprovalInfo ap = apList.get(b);
                     cellContent.setCellValue(ap.getRemark());
                 }
@@ -2324,6 +2340,8 @@ public class ApplicationPrimaryController {
             cellTitle9.setCellValue("联系电话");
             HSSFCell cellTitle10 = rowTitle.createCell(9);
             cellTitle10.setCellValue("学生地址");
+            HSSFCell cellTitle11 = rowTitle.createCell(10);
+            cellTitle11.setCellValue("插班生报名年级");
 
 //            int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
 //            for(int i = 1; i < maxColumn; i++) {
@@ -2333,13 +2351,14 @@ public class ApplicationPrimaryController {
 
             sheet.setColumnWidth(1, 20 * 256);
             sheet.setColumnWidth(2, 20 * 256);
-            sheet.setColumnWidth(3, 10 * 256);
+            sheet.setColumnWidth(3, 15 * 256);
             sheet.setColumnWidth(4, 15 * 256);
             sheet.setColumnWidth(5, 25 * 256);
             sheet.setColumnWidth(6, 20 * 256);
             sheet.setColumnWidth(7, 15 * 256);
             sheet.setColumnWidth(8, 20 * 256);
             sheet.setColumnWidth(9, 40 * 256);
+            sheet.setColumnWidth(10, 20 * 256);
 
             Map<String,Object> searchParams = new HashMap<>();
 
@@ -2354,7 +2373,7 @@ public class ApplicationPrimaryController {
                 searchParams.put("tabStatus",tabStatus);
             }
             if (StringUtils.isNotEmpty(type)) {
-                if("A".equals(type) || "B".equals(type) ||"C".equals(type)) {
+                if("A".equals(type) || "B".equals(type) ||"C".equals(type) || "Y".equals(type) || "Z".equals(type)) {
                     searchParams.put("type", type);
                 }else{
                     searchParams.put("type", "C");
@@ -2470,6 +2489,12 @@ public class ApplicationPrimaryController {
                 //"学生地址"
                 HSSFCell cellContent10 = rowContent.createCell(9);
                 cellContent10.setCellValue(apDTO.getAddress());
+
+                //插班转学录取年级
+                HSSFCell cellContent11 = rowContent.createCell(10);
+                if(apDTO.getSchoolNumber() != null) {
+                    cellContent11.setCellValue(apDTO.getSchoolNumber().getGradeStr());
+                }
             }
 
             //todo 将wb保存到oss