Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/vo/PbVXssfdetailPageVo.java

@@ -45,4 +45,7 @@ public class PbVXssfdetailPageVo {
     @ApiModelProperty("类型")
     private String category;
 
+    @ApiModelProperty("学籍状态")
+    private String state;
+
 }

src/main/resources/mapper/student/PbVXssfdetailMapper.xml

@@ -4,13 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.student.mapper.PbVXssfdetailMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.PbVXssfdetailPageDto" resultType="com.xjrsoft.module.student.vo.PbVXssfdetailPageVo">
-        SELECT t2.user_id,t2.student_id,t1.name,t4.name AS gender_cn,t6.name AS semester_name,t3.feeitemname,t3.paytype,t3.paydate,t3.payorder,t3.mny FROM xjr_user t1
+        SELECT t2.user_id,t2.student_id,t1.name,t4.name AS gender_cn,t6.name AS semester_name,t3.feeitemname,t3.paytype,t3.paydate,t3.payorder,t3.mny, t8.state FROM xjr_user t1
         INNER JOIN base_student t2 ON t1.id = t2.user_id
         INNER JOIN pb_v_xssfdetail t3 ON t1.credential_number = t3.personalid
         LEFT JOIN xjr_dictionary_detail t4 ON t1.gender = t4.code AND t4.item_id = 2023000000000000004
         LEFT JOIN pb_semester_config t5 ON t3.beltcode = t5.beltcode AND t5.delete_mark = 0
         LEFT JOIN base_semester t6 ON t6.id = t5.base_semester_id
         LEFT JOIN base_student_school_roll t7 ON t7.user_id = t1.id
+        LEFT join pb_cse_feeobjupdate t8 on t8.studentcode = t2.student_id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name},'%')