问题修改

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

@@ -208,13 +208,6 @@
         select * from base_school_info a
         where find_in_set(#{enrollmentType},a.enrollment_type)
         and a.del_flag=0
-        and a.id_ in(
-            select b.school_id from base_enroll_control b
-            where b.school_type=#{enrollmentType}
-            and b.student_type = #{type}
-            and b.del_flag=0
-            and now()<b.end_time
-        )
         order by a.create_time asc
         ]]>
     </select>

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

@@ -1111,6 +1111,8 @@ public class ApplicationMiddleController {
             String status,
             String cardType,
             String schoolId,
+            String offerId,
+            @RequestParam(value="isSend",defaultValue="") String isSend,
             @RequestParam(value="categoryId",defaultValue="") String categoryId,
             @RequestParam(value="startStatus",defaultValue="") String startStatus,
             @RequestParam(value="endStatus",defaultValue="") String endStatus,
@@ -1222,6 +1224,14 @@ public class ApplicationMiddleController {
                 searchParams.put("categoryId",categoryId);
             }
 
+            if (StringUtils.isNotEmpty(isSend)) {
+                searchParams.put("isSend", isSend);
+            }
+
+            if (StringUtils.isNotEmpty(offerId)) {
+                searchParams.put("offerId", offerId);
+            }
+
             //根据用户和角色查询
             int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
             int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");

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

@@ -1223,6 +1223,8 @@ public class ApplicationPrimaryController {
             String status,
             String cardType,
             String schoolId,
+            String offerId,
+            @RequestParam(value="isSend",defaultValue="") String isSend,
             @RequestParam(value="categoryId",defaultValue="") String categoryId,
             @RequestParam(value="startStatus",defaultValue="") String startStatus,
             @RequestParam(value="endStatus",defaultValue="") String endStatus,
@@ -1346,11 +1348,20 @@ public class ApplicationPrimaryController {
             }else if(count3 > 0){
                 //工作人员只能查网上初审10和现场初审20
                 List statusList = new ArrayList();
+                statusList.add("5");
                 statusList.add("10");
                 statusList.add("20");
                 searchParams.put("orStatus",statusList);
             }
 
+            if (StringUtils.isNotEmpty(isSend)) {
+                searchParams.put("isSend", isSend);
+            }
+
+            if (StringUtils.isNotEmpty(offerId)) {
+                searchParams.put("offerId", offerId);
+            }
+
             Page<ApplicationPrimaryDTO> page = applicationPrimaryService.pageSearchDTO(searchParams,0,100000,true,sortList);
             List<DataDictionary> relationshipList = dataDictionaryService.findByCatalogName("学生关系");
             List<DataDictionary> typeNameList = dataDictionaryService.findByCatalogName("报名类型");
@@ -2358,6 +2369,14 @@ public class ApplicationPrimaryController {
                 searchParams.put("categoryId",categoryId);
             }
 
+            if (StringUtils.isNotEmpty(isSend)) {
+                searchParams.put("isSend", isSend);
+            }
+
+            if (StringUtils.isNotEmpty(offerId)) {
+                searchParams.put("offerId", offerId);
+            }
+
             //根据用户和角色查询
             int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
             int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/MiddleSchoolApiController.java

@@ -486,6 +486,7 @@ public class MiddleSchoolApiController {
                 studentInfo.setCardType(applicationMiddleDTO.getCardType());
                 studentInfo.setIdCard(applicationMiddleDTO.getIdCard());
                 studentInfo.setSex(applicationMiddleDTO.getSex());
+                studentInfo.setBirthday(applicationMiddleDTO.getBirthday());
                 studentInfo.setNation(applicationMiddleDTO.getNation());
                 studentInfo.setAddress(applicationMiddleDTO.getAddress());
                 studentInfo.setDocumentUrl(applicationMiddleDTO.getDocumentUrl());

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/PrimarySchoolApiController.java

@@ -450,6 +450,7 @@ public class PrimarySchoolApiController {
                 studentInfo.setCardType(applicationPrimaryDTO.getCardType());
                 studentInfo.setIdCard(applicationPrimaryDTO.getIdCard());
                 studentInfo.setSex(applicationPrimaryDTO.getSex());
+                studentInfo.setBirthday(applicationPrimaryDTO.getBirthday());
                 studentInfo.setNation(applicationPrimaryDTO.getNation());
                 studentInfo.setAddress(applicationPrimaryDTO.getAddress());
                 studentInfo.setDocumentUrl(applicationPrimaryDTO.getDocumentUrl());

web/src/main/resources/application.yml

@@ -10,6 +10,10 @@ spring:
     multipart:
       max-request-size: 20MB
       max-file-size: 20MB
+  http:
+    multipart:
+      max-request-size: 20MB
+      max-file-size: 20MB
   datasource:
     driver-class-name: net.sf.log4jdbc.DriverSpy
     type: com.alibaba.druid.pool.DruidDataSource