1、今日安排视图调整

2、招生统计调整

src/main/java/com/xjrsoft/module/student/service/impl/PbCseFeeobjupdateServiceImpl.java

@@ -117,13 +117,18 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
         List<ProfessionalHeadCoun> professionalHeadCountRes = new ArrayList<>();
         for (Map.Entry<String, Long> entry : professionalHeadCount.entrySet()) {
+
             professionalHeadCountRes.add(new ProfessionalHeadCoun() {{
                 setKey(entry.getKey());
                 setValue(entry.getValue());
+                Integer paymentCount = 0;
+                if(specnameCountMap.containsKey(entry.getKey())){
+                    paymentCount = specnameCountMap.get(entry.getKey());
+                }
                 if (pbCseSpecplanSumMap.get(entry.getKey()) != null) {
                     setPlannedNumber(pbCseSpecplanSumMap.get(entry.getKey()));
-                    setRemainder(pbCseSpecplanSumMap.get(entry.getKey()) - specnameCountMap.get(entry.getKey()));
-                    setPaymentCount(specnameCountMap.get(entry.getKey()));
+                    setRemainder(pbCseSpecplanSumMap.get(entry.getKey()) - paymentCount);
+                    setPaymentCount(paymentCount);
                 }
                 if (specnameCountMap.get(entry.getKey()) != null) {
                     setPaymentCount(specnameCountMap.get(entry.getKey()));

src/main/resources/sqlScript/今日安排视图.sql

@@ -31,9 +31,10 @@ INNER JOIN base_classroom t2 ON t1.site_id = t2.id
 WHERE t1.schedule_date = DATE_FORMAT(NOW(), '%Y-%m-%d')
 UNION ALL
 SELECT t1.id,CONCAT(t1.meeting_apply_date, ' ', t1.meeting_apply_s),CONCAT(t1.meeting_apply_date, ' ',t1.meeting_apply_e),NULL,
-IFNULL(CONCAT(t4.name,t3.name), t1.meeting_apply_url),t5.name,t1.meeting_apply_theme,8,t2.user_id FROM wf_meeting_apply t1
-INNER JOIN meeting_conferee t2 ON t2.wf_meeting_apply_id = t1.id
+IFNULL(CONCAT(t4.name,t3.name), t1.meeting_apply_url),t5.name,t1.meeting_apply_theme,8,
+(SELECT GROUP_CONCAT(user_id) FROM meeting_conferee WHERE wf_meeting_apply_id = t1.id) FROM wf_meeting_apply t1
 LEFT JOIN meeting_room t3 ON t1.meeting_room_id = t3.id
 LEFT JOIN base_office_build t4 ON t3.office_build_id = t4.id
 LEFT JOIN xjr_dictionary_detail t5 ON t1.meeting_apply_format = t5.code
-WHERE t1.meeting_apply_date = DATE_FORMAT(NOW(), '%Y-%m-%d');
+WHERE t1.meeting_apply_date = DATE_FORMAT(NOW(), '%Y-%m-%d');
+