SOP模板编辑修复

fs-admin-saas/src/main/java/com/fs/live/controller/LiveController.java

@@ -231,4 +231,12 @@ public class LiveController extends BaseController {
         return liveService.clearLiveCache(liveId);
     }
 
+    @PreAuthorize("@ss.hasPermi('live:live:list')")
+    @GetMapping("/listToLiveNoEnd")
+    public TableDataInfo listToLiveNoEnd(Live live) {
+        startPage();
+        List<Live> list = liveService.listToLiveNoEnd(live);
+        return getDataTable(list);
+    }
+
 }

fs-admin-saas/src/main/java/com/fs/qw/controller/LuckyBagController.java

@@ -0,0 +1,63 @@
+package com.fs.qw.controller;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.course.domain.LuckyBag;
+import com.fs.qw.service.ILuckyBagService;
+import com.fs.tenant.mapper.TenantInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 福袋管理
+ *
+ * @author fs
+ * @date 2025-12-02
+ */
+@RestController
+@RequestMapping("/qw/luckyBag")
+public class LuckyBagController extends BaseController
+{
+    @Autowired
+    private ILuckyBagService luckyBagService;
+    @Autowired
+    private TenantInfoMapper tenantInfoMapper;
+
+    @GetMapping("/list")
+    public TableDataInfo list(LuckyBag reward, @RequestParam(required = false) Long companyId)
+    {
+        if (companyId != null) {
+            reward.setCompanyId(String.valueOf(companyId));
+        }
+        startPage();
+        List<LuckyBag> list = luckyBagService.selectLuckyBagList(reward);
+        return getDataTable(list);
+    }
+
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody LuckyBag reward) {
+        return toAjax(luckyBagService.add(reward));
+    }
+
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        LuckyBag reward = new LuckyBag();
+        reward.setId(id);
+        return AjaxResult.success(luckyBagService.selectLuckyBagList(reward));
+    }
+
+    @PutMapping
+    public AjaxResult edit(@RequestBody LuckyBag reward) {
+        return toAjax(luckyBagService.updateLuckyBag(reward));
+    }
+
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(luckyBagService.deleteLuckyBagByIds(ids));
+    }
+}

fs-admin-saas/src/main/java/com/fs/qw/controller/QwSopController.java

@@ -20,6 +20,7 @@ import com.fs.sop.domain.QwSop;
 import com.fs.sop.params.QwSopAutoTime;
 import com.fs.sop.params.QwSopEditQwUserParam;
 import com.fs.sop.service.IQwSopService;
+import com.fs.sop.service.ICompanySopRoleService;
 import com.fs.sop.vo.SopVoiceListVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -55,6 +56,8 @@ public class QwSopController extends BaseController
     private FsUserCourseMapper fsUserCourseMapper;
     @Autowired
     private FsUserCourseVideoMapper fsUserCourseVideoMapper;
+    @Autowired
+    private ICompanySopRoleService companySopRoleService;
 
 
     /**
@@ -246,4 +249,9 @@ public class QwSopController extends BaseController
         List<SopVoiceListVo> list = qwSopService.getSopVoiceList(id);
         return getDataTable(list);
     }
+
+    @GetMapping(value = "/getRoles")
+    public R getRoles(@RequestParam Long companyId) {
+        return R.ok().put("data", companySopRoleService.getRolesByCompanyId(companyId));
+    }
 }