|
@@ -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");
|