合并线上

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

@@ -61,8 +61,6 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
 
     private final WfTextbookSubscriptionItemMapper wfTextbookSubscriptionWfTextbookSubscriptionItemMapper;
 
-    private final TextbookSubscriptionRecordMapper textbookTextbookSubscriptionRecordMapper;
-
     private final WfTextbookSubscriptionItemHistoryMapper wfTextbookSubscriptionItemHistoryMapper;
 
     private final TextbookSubscriptionMapper textbookSubscriptionMapper;

src/main/resources/sqlScript/update_sql.sql

@@ -4,3 +4,10 @@
 -- ----------------------------
 alter table xjr_oa_news_relation
     modify reply_content varchar(256) null comment '回复内容';
+
+
+
+
+alter table textbook_subscription
+    modify base_class_ids longtext null comment '按班级征订征订的班级主键(base_class)';
+

src/main/resources/sqlScript/views_sql.sql

@@ -68,7 +68,7 @@ select 1001                                                    AS `pk_corp`,
             else '其他' end)                                   AS `state`,
        NULL                                                    AS `Userdef2`,
        NULL                                                    AS `Userdef1`,
-       NULL                                                    AS `Resourcecode`,
+       t10.name                                                    AS `Resourcecode`,
        NULL                                                    AS `Birthday`,
        NULL                                                    AS `Account`,
        NULL                                                    AS `bank`,
@@ -85,6 +85,7 @@ from `smart_campus`.`base_student` `t`
          left join `smart_campus`.`base_major_set` `t7` on `t7`.`id` = `t2`.`major_set_id`
          left join `smart_campus`.`base_student_graduate` `t8` on `t8`.`user_id` = `t1`.`id`
          left join `smart_campus`.`xjr_dictionary_detail` `t9` on `t9`.`code` = `t2`.`stduy_status`
+         left join `smart_campus`.`xjr_dictionary_detail` `t10` on `t10`.`code` = `t2`.`student_type`
 where t.delete_mark = 0
   and t1.delete_mark = 0
   and t2.delete_mark = 0