fix：[试验管理][物资列表]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java

@@ -38,6 +38,19 @@ public class GyzjController extends BaseController
     /**
      * 列表
      */
+    @RequiresPermissions({"business:studyGyzj:list","business:nonTrialGyzj:list","business:drugGyzj:list"})
+    @GetMapping("/studyList")
+    public TableDataInfo studyList(SearchForm form)
+    {
+        startPage();
+        List<ListDto> list = gyzjService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 列表
+     */
     @RequiresPermissions("business:resource:gyzj:list")
     @GetMapping("/list")
     public TableDataInfo list(SearchForm form)
@@ -159,7 +172,7 @@ public class GyzjController extends BaseController
      * 批量处置药剂
      */
     @PostMapping("/plczyj")
-    @RequiresPermissions("business:resource:gyzj:czyj")
+    @RequiresPermissions({"business:resource:gyzj:czyj","business:studyGyzj:czyj","business:nonTrialGyzj:czyj","business:drugGyzj:czyj"})
     public AjaxResult plczyj(@RequestBody PlczyjForm form)
     {
         form.setClrId(SecurityUtils.getUserId());
@@ -246,7 +259,7 @@ public class GyzjController extends BaseController
      * 编辑
      */
     @PostMapping("bj")
-    @RequiresPermissions("business:resource:gyzj:bj")
+    @RequiresPermissions({"business:resource:gyzj:bj","business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"})
     public AjaxResult bj(@RequestBody BjForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -273,7 +286,7 @@ public class GyzjController extends BaseController
      * 修改库存
      */
     @PostMapping("xgkc")
-    @RequiresPermissions("business:resource:gyzj:xgkc")
+    @RequiresPermissions({"business:resource:gyzj:xgkc","business:studyGyzj:xgkc","business:nonTrialGyzj:xgkc","business:drugGyzj:xgkc"})
     public AjaxResult xgkc(@RequestBody XgkcForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -298,7 +311,7 @@ public class GyzjController extends BaseController
      * 归还
      */
     @PostMapping("gh")
-    @RequiresPermissions("business:resource:gyzj:gh")
+    @RequiresPermissions({"business:resource:gyzj:gh","business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
     public AjaxResult gh(@RequestBody GhForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java

@@ -38,6 +38,18 @@ public class MjyController extends BaseController
     /**
      * 列表
      */
+    @RequiresPermissions({"business:studyMjy:list","business:nonTrialMjy:list","business:drugMjy:list"})
+    @GetMapping("/studyList")
+    public TableDataInfo studyList(SearchForm form)
+    {
+        startPage();
+        List<ListDto> list = mjyService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
+    /**
+     * 列表
+     */
     @RequiresPermissions("business:resource:mjy:list")
     @GetMapping("/list")
     public TableDataInfo list(SearchForm form)
@@ -159,7 +171,7 @@ public class MjyController extends BaseController
      * 批量处置药剂
      */
     @PostMapping("/plczyj")
-    @RequiresPermissions("business:resource:mjy:czyj")
+    @RequiresPermissions({"business:resource:mjy:czyj","business:studyMjy:czyj","business:nonTrialMjy:czyj","business:drugMjy:czyj"})
     public AjaxResult plczyj(@RequestBody PlczyjForm form)
     {
         form.setClrId(SecurityUtils.getUserId());
@@ -246,7 +258,7 @@ public class MjyController extends BaseController
      * 编辑
      */
     @PostMapping("bj")
-    @RequiresPermissions("business:resource:mjy:bj")
+    @RequiresPermissions({"business:resource:mjy:bj","business:studyMjy:bj","business:nonTrialMjy:bj","business:drugMjy:bj"})
     public AjaxResult bj(@RequestBody BjForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -273,7 +285,7 @@ public class MjyController extends BaseController
      * 修改库存
      */
     @PostMapping("xgkc")
-    @RequiresPermissions("business:resource:mjy:xgkc")
+    @RequiresPermissions({"business:resource:mjy:xgkc","business:studyMjy:xgkc","business:nonTrialMjy:xgkc","business:drugMjy:xgkc"})
     public AjaxResult xgkc(@RequestBody XgkcForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -298,7 +310,7 @@ public class MjyController extends BaseController
      * 归还
      */
     @PostMapping("gh")
-    @RequiresPermissions("business:resource:mjy:gh")
+    @RequiresPermissions({"business:resource:mjy:gh","business:studyMjy:gh","business:nonTrialMjy:gh","business:drugMjy:gh"})
     public AjaxResult gh(@RequestBody GhForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java

@@ -1,95 +0,0 @@
-package com.hxhq.business.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.hxhq.business.dto.gyzj.ListDto;
-import com.hxhq.business.form.gyzj.*;
-import com.hxhq.business.service.IGyzjService;
-import com.hxhq.common.security.annotation.RequiresPermissions;
-import com.hxhq.common.security.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.hxhq.business.domain.StudyGyzj;
-import com.hxhq.business.service.IStudyGyzjService;
-import com.hxhq.common.core.web.controller.BaseController;
-import com.hxhq.common.core.web.domain.AjaxResult;
-import com.hxhq.common.core.web.page.TableDataInfo;
-
-
-/**
- * 试验-物资信息-给药制剂Controller
- *
- * @author hxhq
- * @date 2026-01-09
- */
-@RestController
-@RequestMapping("/business/studyGyzj")
-public class StudyGyzjController extends BaseController
-{
-    @Autowired
-    private IGyzjService gyzjService;
-
-    /**
-     * 列表
-     */
-    @RequiresPermissions({"business:studyGyzj:list","business:nonTrialGyzj:list","business:drugGyzj:list"})
-    @GetMapping("/list")
-    public TableDataInfo list(SearchForm form)
-    {
-        startPage();
-        List<ListDto> list = gyzjService.queryStudyList(form);
-        return getDataTable(list);
-    }
-
-    /**
-     * 处置药剂
-     */
-    @PostMapping("/czyj")
-    @RequiresPermissions({"business:studyGyzj:czyj","business:nonTrialGyzj:czyj","business:drugGyzj:czyj"})
-    public AjaxResult czyj(@RequestBody CzyjForm form)
-    {
-        form.setClrId(SecurityUtils.getUserId());
-        gyzjService.czyj(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 编辑
-     */
-    @PostMapping("bj")
-    @RequiresPermissions({"business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"})
-    public AjaxResult bj(@RequestBody BjForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjService.bj(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 归还
-     */
-    @PostMapping("gh")
-    @RequiresPermissions({"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
-    public AjaxResult gh(@RequestBody GhForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        form.setJsr1Id(SecurityUtils.getUserId());
-        gyzjService.gh(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 修改库存
-     */
-    @PostMapping("xgkc")
-    @RequiresPermissions({"business:studyGyzj:xgkc","business:nonTrialGyzj:xgkc","business:drugGyzj:xgkc"})
-    public AjaxResult xgkc(@RequestBody XgkcForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjService.xgkc(form);
-        return AjaxResult.success("操作成功");
-    }
-
-
-}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMjyController.java

@@ -1,95 +0,0 @@
-package com.hxhq.business.controller;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.hxhq.business.dto.mjy.ListDto;
-import com.hxhq.business.form.mjy.*;
-import com.hxhq.business.service.IMjyService;
-import com.hxhq.common.security.annotation.RequiresPermissions;
-import com.hxhq.common.security.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.hxhq.business.domain.StudyMjy;
-import com.hxhq.business.service.IStudyMjyService;
-import com.hxhq.common.core.web.controller.BaseController;
-import com.hxhq.common.core.web.domain.AjaxResult;
-import com.hxhq.common.core.web.page.TableDataInfo;
-
-
-/**
- * 试验-物资信息-麻精药Controller
- *
- * @author hxhq
- * @date 2026-01-09
- */
-@RestController
-@RequestMapping("/business/studyMjy")
-public class StudyMjyController extends BaseController
-{
-    @Autowired
-    private IMjyService mjyService;
-
-    /**
-     * 列表
-     */
-    @RequiresPermissions({"business:studyMjy:list","business:nonTrialMjy:list","business:drugMjy:list"})
-    @GetMapping("/list")
-    public TableDataInfo list(SearchForm form)
-    {
-        startPage();
-        List<ListDto> list = mjyService.queryStudyList(form);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 处置药剂
-     */
-    @PostMapping("/czyj")
-    @RequiresPermissions({"business:studyMjy:czyj","business:nonTrialMjy:czyj","business:drugMjy:czyj"})
-    public AjaxResult czyj(@RequestBody CzyjForm form)
-    {
-        form.setClrId(SecurityUtils.getUserId());
-        mjyService.czyj(form);
-        return AjaxResult.success("操作成功");
-    }
-
-
-    /**
-     * 编辑
-     */
-    @PostMapping("bj")
-    @RequiresPermissions({"business:studyMjy:bj","business:nonTrialMjy:bj","business:drugMjy:bj"})
-    public AjaxResult bj(@RequestBody BjForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyService.bj(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 修改库存
-     */
-    @PostMapping("xgkc")
-    @RequiresPermissions({"business:studyMjy:xgkc","business:nonTrialMjy:xgkc","business:drugMjy:xgkc"})
-    public AjaxResult xgkc(@RequestBody XgkcForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyService.xgkc(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 归还
-     */
-    @PostMapping("gh")
-    @RequiresPermissions({"business:studyMjy:gh","business:nonTrialMjy:gh","business:drugMjy:gh"})
-    public AjaxResult gh(@RequestBody GhForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyService.gh(form);
-        return AjaxResult.success("操作成功");
-    }
-
-}