bug修复

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java

@@ -397,12 +397,10 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
             return null;
         }
 
-        Map<Long, WfTextbookSubscriptionItem> itemByIdMap = wfTextbookSubscriptionItemList
-                .stream()
-                .collect(Collectors.toMap(
-                        WfTextbookSubscriptionItem::getId,
-                        item -> item
-                ));
+        Map<Long, WfTextbookSubscriptionItem> itemByIdMap = new HashMap<>();
+        for (WfTextbookSubscriptionItem el : wfTextbookSubscriptionItemList) {
+            itemByIdMap.put(el.getId(), el);
+        }
 
         Map<String, WfTextbookSubscriptionItem> itemByIssnMap = new HashMap<>();
         for (WfTextbookSubscriptionItem el : wfTextbookSubscriptionItemList) {

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

@@ -55,26 +55,15 @@
         GROUP BY t1.resourcename
     </select>
     <select id="stduyStatusStat" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.StringCountVo">
-        SELECT t1.quartername 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
-        <if test="dto.gradeId != null">
-            and t3.grade_id = #{dto.gradeId}
-        </if>
-        GROUP BY t1.quartername
-    </select>
-    <select id="stduyStatusStat" parameterType="com.xjrsoft.module.student.dto.PbVXsxxsfytbStatDto" resultType="com.xjrsoft.module.student.vo.StringCountVo">
-        SELECT t1.quartername 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.stduy_status = t2.code and t2.item_id = 2023000000000000030
+        WHERE t3.delete_mark = 0
         <if test="dto.gradeId != null">
             and t3.grade_id = #{dto.gradeId}
         </if>
-        GROUP BY t1.quartername
+        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,
         (