bug修复

src/main/java/com/xjrsoft/module/student/controller/BaseStudentScholarshipReleaseController.java

@@ -152,7 +152,6 @@ public class BaseStudentScholarshipReleaseController {
                             setCreateDate(new Date());
                             setAmount(applicantVo.getAmount());
                             setBaseStudentScholarshipApplicantId(applicantVo.getId());
-                            setReleaseDate(new Date());
                         }}
                 );
             }

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

@@ -10,7 +10,7 @@
         (SELECT release_date FROM base_student_scholarship_release WHERE base_student_scholarship_applicant_id = t1.id
         AND delete_mark = 0 ORDER BY release_date DESC LIMIT 0, 1) AS release_date FROM base_student_scholarship_applicant t1
         LEFT JOIN base_semester t2 ON t1.base_semester_id = t2.id
-        LEFT JOIN xjr_user t3 ON t1.applicant_user_id = t2.id
+        LEFT JOIN xjr_user t3 ON t1.applicant_user_id = t3.id
         LEFT JOIN xjr_dictionary_detail t4 ON t3.gender = t4.code AND t4.item_id = 2023000000000000004
         LEFT JOIN base_student_school_roll t5 ON t3.id = t5.user_id
         LEFT JOIN base_class t6 ON t5.class_id = t6.id

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

@@ -45,14 +45,14 @@
 
 
     <select id="studentCategoryStat" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.StringCountVo">
-        SELECT t1.resourcename as name,COUNT(t1.studentcode) as count FROM pb_cse_feeobjupdate t1
-        INNER JOIN xjr_user t2 ON t1.studentcode = t2.credential_number
-        INNER JOIN base_student_school_roll t3 ON t2.id = t3.user_id
-        WHERE t2.delete_mark = 0 AND t3.delete_mark = 0
+        SELECT t2.name,COUNT(t1.credential_number) as count FROM xjr_user t1
+        INNER JOIN base_student_school_roll t3 ON t1.id = t3.user_id
+        left JOIN xjr_dictionary_detail t2 ON t3.student_type = t2.code and t2.item_id = 2023000000000000028
+        WHERE t3.delete_mark = 0
         <if test="dto.gradeId != null">
             and t3.grade_id = #{dto.gradeId}
         </if>
-        GROUP BY t1.resourcename
+        GROUP BY t2.name
     </select>
     <select id="stduyStatusStat" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.StringCountVo">
         SELECT t2.name,COUNT(t1.credential_number) as count FROM xjr_user t1
@@ -65,7 +65,7 @@
         GROUP BY t2.name
     </select>
     <select id="getClassQfPage" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.ClassQfPageVo">
-        SELECT t1.id, t2.name AS grade_name,t2.name AS class_name,t3.name AS teacher_name,
+        SELECT t1.id, t1.name AS grade_name,t2.name AS class_name,t3.name AS teacher_name,
         (
         SELECT SUM(qfje) FROM pb_v_xsxxsfytb a1
         INNER JOIN xjr_user a2 ON a1.studentcode = a2.credential_number