From 76ba5585aaa5bf486a1313f29ad36f96ab64de42 Mon Sep 17 00:00:00 2001
From: Dai <test@test.com>
Date: Fri, 16 May 2025 15:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=90=88=E5=B9=B6=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/SubjectHomeworkService.php |  1 +
 .../controller/SubjectHomeworkController.php  |  3 ++
 .../app/view/subject-homework/index.html      | 33 +++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/app/common/service/SubjectHomeworkService.php b/app/common/service/SubjectHomeworkService.php
index 2dccba7..cfb8624 100644
--- a/app/common/service/SubjectHomeworkService.php
+++ b/app/common/service/SubjectHomeworkService.php
@@ -103,6 +103,7 @@ class SubjectHomeworkService
                 'last_homework_feedback_url' => $last_homework_feedback_url,
                 'subject_report_url' => $subject_report_url,
                 'subject_file_url' => $subject_file_url,
+                'is_merge_report' => isset($data['is_merge_report']) && $data['is_merge_report']? 1 :0,
             ]);
 
             return [
diff --git a/plugin/admin/app/controller/SubjectHomeworkController.php b/plugin/admin/app/controller/SubjectHomeworkController.php
index d9e0e11..c7b20d5 100644
--- a/plugin/admin/app/controller/SubjectHomeworkController.php
+++ b/plugin/admin/app/controller/SubjectHomeworkController.php
@@ -71,6 +71,9 @@ class SubjectHomeworkController extends Crud
             if (isset($data['is_publish']) && $data['is_publish'] !== '') {
                 $homework->where('sh.is_publish', $data['is_publish']);
             }
+            if (isset($data['is_merge_report']) && $data['is_merge_report'] !== '') {
+                $homework->where('sh.is_merge_report', $data['is_merge_report']);
+            }
             if (isset($data['student_id']) && $data['student_id']) {
                 $homework->where(['sth.student_id'=> $data['student_id']]);
             }
diff --git a/plugin/admin/app/view/subject-homework/index.html b/plugin/admin/app/view/subject-homework/index.html
index 3712635..389992f 100644
--- a/plugin/admin/app/view/subject-homework/index.html
+++ b/plugin/admin/app/view/subject-homework/index.html
@@ -86,6 +86,12 @@
                     <div name="is_publish" id="is_publish" value=""></div>
                 </div>
             </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">合并报告</label>
+                <div class="layui-input-block">
+                    <div name="is_merge_report" id="is_merge_report" value=""></div>
+                </div>
+            </div>
 
             <div class="layui-form-item layui-inline">
                 <label class="layui-form-label"></label>
@@ -194,6 +200,22 @@
         })
     });
 
+    // 字段 是否发布 is_merge_report
+    layui.use(["jquery", "xmSelect"], function () {
+        let value = layui.$("#is_merge_report").attr("value");
+        let initValue = value ? value.split(",") : [];
+        layui.xmSelect.render({
+            el: "#is_merge_report",
+            name: "is_merge_report",
+            filterable: true,
+            initValue: initValue,
+            data: [{"value": "1", "name": "是"}, {"value": "0", "name": "否"}],
+            model: {"icon": "hidden", "label": {"type": "text"}},
+            clickClose: true,
+            radio: true,
+        })
+    });
+
     // 表格渲染
     layui.use(["table", "form", "common", "popup", "util"], function () {
         let table = layui.table;
@@ -262,6 +284,17 @@
                     let checked = d[field] === 1 ? "checked" : "";
                     return '<input type="checkbox" value="' + util.escape(d[PRIMARY_KEY]) + '" lay-filter="' + util.escape(field) + '" lay-skin="switch" lay-text="' + util.escape('') + '" ' + checked + '/>';
                 }
+            }, {
+                title: "合并报告", align: "center",
+                field: "is_merge_report",
+                templet: function (d) {
+                    let field = "is_merge_report";
+                    if(d[field]){
+                        return '<span class="layui-bg-green">是</span>'
+                    }else{
+                        return '<span class="layui-badge">否</span>'
+                    }
+                }
             }, {
                 title: "创建时间", align: "center",
                 field: "created_at",