添加年纪查询和展示

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

@@ -173,38 +173,46 @@
 	</select>
     <select id="search" parameterType="hashmap" resultMap="ApplicationMiddleMap">
         <![CDATA[
-			select * from base_application_middle
+			select
+			a.*
+			from
+			base_application_middle a
+			LEFT JOIN base_school_number g ON a.school_number_id = g.id_
 		]]>
         <where>
             <if test="searchParams.delFlag != null">
-                and del_flag like #{searchParams.delFlag}
+                and a.del_flag like #{searchParams.delFlag}
             </if>
             <if test="searchParams.type != null">
-                and type_ like #{searchParams.type}
+                and a.type_ like #{searchParams.type}
             </if>
             <if test="searchParams.name != null">
-                and name_ like #{searchParams.name}
+                and a.name_ like #{searchParams.name}
             </if>
             <if test="searchParams.idCard != null">
-                and id_card like #{searchParams.idCard}
+                and a.id_card like #{searchParams.idCard}
             </if>
             <if test="searchParams.schoolId != null">
-                and school_id = #{searchParams.schoolId}
+                and a.school_id = #{searchParams.schoolId}
             </if>
             <if test="searchParams.categoryId != null">
-                and category_id like #{searchParams.categoryId}
+                and a.category_id like #{searchParams.categoryId}
             </if>
             <if test="searchParams.status != null">
-                and status_ = #{searchParams.status}
+                and a.status_ = #{searchParams.status}
             </if>
             <if test="searchParams.startCreateTime != null">
-                and create_time >= #{searchParams.startCreateTime}
+                and a.create_time >= #{searchParams.startCreateTime}
             </if>
             <if test="searchParams.endCreateTime != null">
                 <![CDATA[
-                and create_time <= #{searchParams.endCreateTime}
+                and a.create_time <= #{searchParams.endCreateTime}
                 ]]>
             </if>
+
+            <if test="searchParams.grade != null">
+                and g.grade_ = #{searchParams.grade}
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
@@ -267,6 +275,7 @@
 			LEFT JOIN base_school_info d ON a.school_id = d.id_
 			LEFT JOIN base_school_info e ON a.offer_id = e.id_
 			LEFT JOIN base_person_info f ON a.person_id = f.id_
+			LEFT JOIN base_school_number g ON a.school_number_id = g.id_
 		]]>
         <where>
             <if test="searchParams.delFlag != null">
@@ -323,6 +332,9 @@
                     #{aId}
                 </foreach>
             </if>
+            <if test="searchParams.grade != null">
+                and g.grade_ = #{searchParams.grade}
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}

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

@@ -169,36 +169,41 @@
     </select>
     <select id="search" parameterType="hashmap" resultMap="ApplicationPrimaryMap">
         <![CDATA[
-			SELECT * FROM base_application_primary
+			SELECT a.*
+			 FROM base_application_primary a
+			LEFT JOIN base_school_number g ON a.school_number_id = g.id_
 		]]>
         <where>
-            and del_flag = 0
+            and a.del_flag = 0
             <if test="searchParams.type != null">
-                and type_ like #{searchParams.type}
+                and a.type_ like #{searchParams.type}
             </if>
             <if test="searchParams.name != null">
-                and name_ like #{searchParams.name}
+                and a.name_ like #{searchParams.name}
             </if>
             <if test="searchParams.idCard != null">
-                and id_card like #{searchParams.idCard}
+                and a.id_card like #{searchParams.idCard}
             </if>
             <if test="searchParams.schoolId != null">
-                and school_id = #{searchParams.schoolId}
+                and a.school_id = #{searchParams.schoolId}
             </if>
             <if test="searchParams.categoryId != null">
-                and category_id like #{searchParams.categoryId}
+                and a.category_id like #{searchParams.categoryId}
             </if>
             <if test="searchParams.status != null">
-                and status_ = #{searchParams.status}
+                and a.status_ = #{searchParams.status}
             </if>
             <if test="searchParams.startCreateTime != null">
-                and create_time >= #{searchParams.startCreateTime}
+                and a.create_time >= #{searchParams.startCreateTime}
             </if>
             <if test="searchParams.endCreateTime != null">
                 <![CDATA[
-                and create_time <= #{searchParams.endCreateTime}
+                and a.create_time <= #{searchParams.endCreateTime}
                 ]]>
             </if>
+            <if test="searchParams.grade != null">
+                and g.grade_ = #{searchParams.grade}
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
@@ -261,6 +266,7 @@
 			LEFT JOIN base_school_info d ON a.school_id = d.id_
 			LEFT JOIN base_school_info e ON a.offer_id = e.id_
 			LEFT JOIN base_person_info f ON a.person_id = f.id_
+			LEFT JOIN base_school_number g ON a.school_number_id = g.id_
 		]]>
         <where>
             <if test="searchParams.delFlag != null">
@@ -327,6 +333,9 @@
                     #{aId}
                 </foreach>
             </if>
+            <if test="searchParams.grade != null">
+                and g.grade_ = #{searchParams.grade}
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}

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

@@ -247,13 +247,14 @@ public class ApplicationMiddleController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
+            @RequestParam(value="tabStatus",defaultValue="") String tabStatus,
+            @RequestParam(value="type",defaultValue="") String type,
+            @RequestParam(value="nameOrIdCard",defaultValue="") String nameOrIdCard,
+            @RequestParam(value="status",defaultValue="") String status,
+            @RequestParam(value="cardType",defaultValue="") String cardType,
+            @RequestParam(value="schoolId",defaultValue="") String schoolId,
+            @RequestParam(value="offerId",defaultValue="") String offerId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="isSend",defaultValue="") String isSend,
             @RequestParam(value="startStatus",defaultValue="") String startStatus,
             @RequestParam(value="endStatus",defaultValue="") String endStatus,
@@ -305,6 +306,10 @@ public class ApplicationMiddleController {
             searchParams.put("offerId", offerId);
         }
 
+        if(StringUtils.isNotEmpty(grade)){
+            searchParams.put("grade",grade);
+        }
+
         searchParams.put("delFlag",delFlag);
 
         if(StringUtils.isNotEmpty(schoolId)){
@@ -580,6 +585,7 @@ public class ApplicationMiddleController {
             String type,
             String nameOrIdCard,
             String schoolId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="startStatus",defaultValue="") String startStatus,
             @RequestParam(value="endStatus",defaultValue="") String endStatus,
             @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
@@ -645,6 +651,10 @@ public class ApplicationMiddleController {
                 }
             }
 
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
+
 
             //根据用户和角色查询
             int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
@@ -1572,6 +1582,7 @@ public class ApplicationMiddleController {
             String cardType,
             String schoolId,
             String offerId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="nextStatus",defaultValue="") String nextStatus,
             @RequestParam(value="isSend",defaultValue="") String isSend,
             @RequestParam(value="categoryId",defaultValue="") String categoryId,
@@ -1653,6 +1664,10 @@ public class ApplicationMiddleController {
                 searchParams.put("categoryId", categoryId);
             }
 
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
+
             List<String> idsList = new ArrayList<>();
             if("1".equals(isSelect)) {
                 if (StringUtils.isNotEmpty(idList)) {

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

@@ -265,14 +265,15 @@ public class ApplicationPrimaryController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String tabStatus,
-            String type,
-            String nameOrIdCard,
-            String status,
-            String cardType,
-            String schoolId,
-            String offerId,
+            @RequestParam(value="tabStatus",defaultValue="") String tabStatus,
+            @RequestParam(value="type",defaultValue="") String type,
+            @RequestParam(value="nameOrIdCard",defaultValue="") String nameOrIdCard,
+            @RequestParam(value="status",defaultValue="") String status,
+            @RequestParam(value="cardType",defaultValue="") String cardType,
+            @RequestParam(value="schoolId",defaultValue="") String schoolId,
+            @RequestParam(value="offerId",defaultValue="") String offerId,
             @RequestParam(value="isSend",defaultValue="") String isSend,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="categoryId",defaultValue="") String categoryId,
             @RequestParam(value="startStatus",defaultValue="") String startStatus,
             @RequestParam(value="endStatus",defaultValue="") String endStatus,
@@ -350,6 +351,10 @@ public class ApplicationPrimaryController {
             searchParams.put("categoryId",categoryId);
         }
 
+        if(StringUtils.isNotEmpty(grade)){
+            searchParams.put("grade",grade);
+        }
+
         //根据用户和角色查询
         int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
         int count2 = userRoleService.findCountByAIdAndRName(subject,"XFLD");
@@ -503,6 +508,7 @@ public class ApplicationPrimaryController {
             String type,
             String nameOrIdCard,
             String schoolId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="startStatus",defaultValue="") String startStatus,
             @RequestParam(value="endStatus",defaultValue="") String endStatus,
             @RequestParam(value="delFlag",defaultValue="false") Boolean delFlag,
@@ -562,6 +568,10 @@ public class ApplicationPrimaryController {
                 searchParams.put("endStatus",endStatus);
             }
 
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
+
             searchParams.put("delFlag",delFlag);
 
             if(StringUtils.isNotEmpty(schoolId)){
@@ -1697,6 +1707,7 @@ public class ApplicationPrimaryController {
             String cardType,
             String schoolId,
             String offerId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="nextStatus",defaultValue="") String nextStatus,
             @RequestParam(value="isSend",defaultValue="") String isSend,
             @RequestParam(value="categoryId",defaultValue="") String categoryId,
@@ -1774,6 +1785,10 @@ public class ApplicationPrimaryController {
                 searchParams.put("categoryId", categoryId);
             }
 
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
+
             //根据用户和角色查询
             int count1 = userRoleService.findCountByAIdAndRName(subject, "SYSADMIN");
             int count2 = userRoleService.findCountByAIdAndRName(subject, "XFLD");

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

@@ -276,7 +276,9 @@ public class ApportionController {
 
     @ApiOperation(value="开始派位-小学")
     @PostMapping("startApportionPrimary")
-    public MessageResult<Map> startApportionPrimary(String schoolId,String type,Integer amount,@RequestAttribute String subject){
+    public MessageResult<Map> startApportionPrimary(String schoolId,
+                                                    @RequestParam(value="grade",defaultValue="") String grade,
+                                                    String type,Integer amount,@RequestAttribute String subject){
         MessageResult<Map> msgResult = new MessageResult<>();
         Map<String,Object> map = new HashMap<>();
 
@@ -287,12 +289,15 @@ public class ApportionController {
             if (StringUtils.isNotEmpty(schoolId)) {
                 searchParams.put("schoolId",schoolId);
             }
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
             if (StringUtils.isNotEmpty(type)) {
                 DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("C类生证明",type);
                 searchParams.put("categoryId",dataDictionary.getId());
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
+            sortList.add(new Sort("a.create_time","desc"));
             Page<ApplicationPrimary> applicationPrimaryPage = applicationPrimaryService.pageSearch(searchParams,1,100000,false,sortList);
 
             //随机抽取
@@ -374,7 +379,9 @@ public class ApportionController {
 
     @ApiOperation(value="开始派位-小学-测试")
     @PostMapping("startApportionPrimaryTest")
-    public MessageResult<Map> startApportionPrimaryTest(String schoolId,String type,Integer amount,@RequestAttribute String subject){
+    public MessageResult<Map> startApportionPrimaryTest(String schoolId,
+                                                        @RequestParam(value="grade",defaultValue="") String grade,
+                                                        String type,Integer amount,@RequestAttribute String subject){
         MessageResult<Map> msgResult = new MessageResult<>();
         Map<String,Object> map = new HashMap<>();
 
@@ -385,6 +392,9 @@ public class ApportionController {
             if (StringUtils.isNotEmpty(schoolId)) {
                 searchParams.put("schoolId",schoolId);
             }
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
             if (StringUtils.isNotEmpty(type)) {
                 DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("C类生证明",type);
                 searchParams.put("categoryId",dataDictionary.getId());
@@ -462,6 +472,7 @@ public class ApportionController {
     @RequestMapping(value = "pageListPrimary",method = RequestMethod.POST)
     public MessageResult<Map> pageListPrimary(
             @RequestParam(value="schoolId",defaultValue="") String schoolId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="type",defaultValue="") String type,
             @RequestParam(value="types",defaultValue="") String types,
             @RequestParam(value="categoryValue",defaultValue="") String categoryValue,
@@ -522,6 +533,10 @@ public class ApportionController {
             }
         }
 
+        if (StringUtils.isNotEmpty(grade)) {
+            searchParams.put("grade",grade);
+        }
+
 
         //根据用户和角色查询
         int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");
@@ -565,7 +580,9 @@ public class ApportionController {
 
     @ApiOperation(value="开始派位-中学")
     @PostMapping("startApportionMiddle")
-    public MessageResult<Map> startApportionMiddle(String schoolId,String type,Integer amount,@RequestAttribute String subject){
+    public MessageResult<Map> startApportionMiddle(String schoolId,
+                                                   @RequestParam(value="grade",defaultValue="") String grade,
+                                                   String type,Integer amount,@RequestAttribute String subject){
         MessageResult<Map> msgResult = new MessageResult<>();
         Map<String,Object> map = new HashMap<>();
 
@@ -576,6 +593,9 @@ public class ApportionController {
             if (StringUtils.isNotEmpty(schoolId)) {
                 searchParams.put("schoolId",schoolId);
             }
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
             if (StringUtils.isNotEmpty(type)) {
                 searchParams.put("type",type);
             }
@@ -662,7 +682,9 @@ public class ApportionController {
 
     @ApiOperation(value="开始派位-中学-测试")
     @PostMapping("startApportionMiddleTest")
-    public MessageResult<Map> startApportionMiddleTest(String schoolId,String type,Integer amount,@RequestAttribute String subject){
+    public MessageResult<Map> startApportionMiddleTest(String schoolId,
+                                                       @RequestParam(value="grade",defaultValue="") String grade,
+                                                       String type,Integer amount,@RequestAttribute String subject){
         MessageResult<Map> msgResult = new MessageResult<>();
         Map<String,Object> map = new HashMap<>();
 
@@ -673,11 +695,14 @@ public class ApportionController {
             if (StringUtils.isNotEmpty(schoolId)) {
                 searchParams.put("schoolId",schoolId);
             }
+            if (StringUtils.isNotEmpty(grade)) {
+                searchParams.put("grade",grade);
+            }
             if (StringUtils.isNotEmpty(type)) {
                 searchParams.put("type",type);
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("create_time","desc"));
+            sortList.add(new Sort("a.create_time","desc"));
             Page<ApplicationMiddle> ApplicationMiddlePage = applicationMiddleService.pageSearch(searchParams,1,100000,false,sortList);
 
             //随机抽取
@@ -749,6 +774,7 @@ public class ApportionController {
     @RequestMapping(value = "pageListMiddle",method = RequestMethod.POST)
     public MessageResult<Map> pageListMiddle(
             @RequestParam(value="schoolId",defaultValue="") String schoolId,
+            @RequestParam(value="grade",defaultValue="") String grade,
             @RequestParam(value="type",defaultValue="") String type,
             @RequestParam(value="categoryValue",defaultValue="") String categoryValue,
             @RequestParam(value="status",defaultValue="") String status,
@@ -802,6 +828,10 @@ public class ApportionController {
             }
         }
 
+        if (StringUtils.isNotEmpty(grade)) {
+            searchParams.put("grade",grade);
+        }
+
 
         //根据用户和角色查询
         int count1 = userRoleService.findCountByAIdAndRName(subject,"SYSADMIN");