问卷 新闻 消息推送

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApportionDetail.java

@@ -88,4 +88,6 @@ public class ApportionDetail {
 	private String studentName;
 	@ApiModelProperty(value = "学生证件号")
 	private String studentCard;
+	@ApiModelProperty(value = "家长姓名")
+	private String personName;
 }

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

@@ -19,6 +19,7 @@
 			<result property="studentName" column="student_name" />
 			<result property="studentCard" column="student_card" />
 			<result property="schoolName" column="school_name" />
+			<result property="personName" column="person_name" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.campus.modules.base.entity.ApportionDetail">
 	<!--
@@ -103,13 +104,18 @@
 					t1.*,
 					t2.name_ AS student_name,
 					t3.name_ AS school_name,
-					t2.id_card as student_card
+					t2.id_card as student_card,
+					t4.name_ as person_name
 				FROM
 				base_apportion_detail t1
 				LEFT JOIN base_student_info t2 ON t1.student_id = t2.id_
 				LEFT JOIN base_school_info t3 ON t1.school_id = t3.id_
+				LEFT JOIN base_person_info t4 ON t1.person_id = t4.id_
 		]]>
 		<where>
+			t2.del_flag = 0
+			and t3.del_flag = 0
+			and t4.del_flag = 0
 			<if test="searchParams.apportionId != null">
 				and t1.apportion_id = #{searchParams.apportionId}
 			</if>

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

@@ -307,7 +307,14 @@ public class ApportionController {
             //必中
             bzSearchParams.put("hit","1");
             bzSearchParams.put("delFlag","0");
-            Page<ApplicationPrimary> bzPage = applicationPrimaryService.pageSearch(bzSearchParams,1,100000,false,sortList);
+            Page<ApplicationPrimary> bzPage = applicationPrimaryService.pageSearch(bzSearchParams,1,1000000,false,sortList);
+
+            if(bzPage.size() == 0 ){
+                bzSearchParams.put("hit","2");
+                bzSearchParams.put("delFlag","0");
+                bzPage = applicationPrimaryService.pageSearch(bzSearchParams,1,100000,false,sortList);
+            }
+
             //随机
             searchParams.put("hit","0");
             searchParams.put("delFlag","0");