fix：[试验管理][预填，填报，申请，计划]权限控制

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

@@ -38,6 +38,7 @@ public class StudyFormApplyController extends BaseController {
      * 列表
      */
     @GetMapping("/list")
+    @RequiresPermissions("business:drugFormApply:list")
     public TableDataInfo list(StudyFormApplySearchForm form) {
         startPage();
         List<StudyFormApplyListDto> list = studyFormApplyService.queryList(form);
@@ -48,7 +49,7 @@ public class StudyFormApplyController extends BaseController {
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    @RequiresPermissions("business:studyFormApply:xq")
+    @RequiresPermissions("business:drugFormApply:xq")
     public TableDataInfo jcgjList(StudyFormApplyJcgj form) {
         startPage();
         List<StudyFormApplyJcgj> list = studyFormApplyJcgjService.queryList(form);
@@ -59,7 +60,7 @@ public class StudyFormApplyController extends BaseController {
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
-    @RequiresPermissions("business:studyFormApply:xq")
+    @RequiresPermissions("business:drugFormApply:xq")
     public TableDataInfo qmxxList(StudyFormApplyQmxx form) {
         startPage();
         List<StudyFormApplyQmxx> list = studyFormApplyQmxxService.queryList(form);
@@ -70,7 +71,7 @@ public class StudyFormApplyController extends BaseController {
      * 详细
      */
     @GetMapping(value = "/info")
-    @RequiresPermissions("business:studyFormApply:xq")
+    @RequiresPermissions("business:drugFormApply:xq")
     public AjaxResult getInfo(Long id) {
         return AjaxResult.success(studyFormApplyService.queryInfo(id));
     }
@@ -78,7 +79,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 加签
      */
-    @RequiresPermissions("business:studyFormApply:jq")
+    @RequiresPermissions("business:drugFormApply:jq")
     @PostMapping("/jq")
     public AjaxResult jq(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.jq(studyFormApply);
@@ -88,7 +89,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 废止
      */
-    @RequiresPermissions("business:studyFormApply:fz")
+    @RequiresPermissions("business:drugFormApply:fz")
     @PostMapping("/fz")
     public AjaxResult fz(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.fz(studyFormApply);
@@ -99,7 +100,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 确认废止
      */
-    @RequiresPermissions("business:studyFormApply:qrfz")
+    @RequiresPermissions("business:drugFormApply:qrfz")
     @PostMapping("/qrfz")
     public AjaxResult qrfz(@RequestBody StudyFormApplyShfzForm form) {
         studyFormApplyService.qrfz(form);
@@ -110,7 +111,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 更换归属人
      */
-    @RequiresPermissions("business:studyFormApply:ghgsr")
+    @RequiresPermissions("business:drugFormApply:ghgsr")
     @PostMapping("/ghgsr")
     public AjaxResult ghgsr(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.ghgsr(studyFormApply);
@@ -120,8 +121,8 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 保存
      */
-    @RequiresPermissions("business:studyFormApply:bj")
     @PostMapping("/bc")
+    @RequiresPermissions({"business:drugFormApply:bj","business:drugFormApply:xz"})
     public AjaxResult bc(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.bc(studyFormApply);
         return AjaxResult.success("操作成功");
@@ -131,7 +132,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 提交
      */
-    @RequiresPermissions("business:studyFormApply:bj")
+    @RequiresPermissions("business:drugFormApply:bj")
     @PostMapping("/tj")
     public AjaxResult tj(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.tj(studyFormApply);
@@ -142,7 +143,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 观察
      */
-    @RequiresPermissions("business:studyFormApply:gc")
+    @RequiresPermissions("business:drugFormApply:gc")
     @PostMapping("/gc")
     public AjaxResult gc(@RequestBody StudyFormApplyGcForm form) {
         studyFormApplyService.gc(form);
@@ -153,7 +154,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 复核通过
      */
-    @RequiresPermissions("business:studyFormApply:fh")
+    @RequiresPermissions("business:drugFormApply:fh")
     @PostMapping("/fhtg")
     public AjaxResult fhtg(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.fhtg(studyFormApply);
@@ -164,7 +165,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 复核拒绝
      */
-    @RequiresPermissions("business:studyFormApply:fh")
+    @RequiresPermissions("business:drugFormApply:fh")
     @PostMapping("/fhjj")
     public AjaxResult fhjj(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.fhjj(studyFormApply);
@@ -174,7 +175,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 通过
      */
-    @RequiresPermissions("business:studyFormApply:fh")
+    @RequiresPermissions("business:drugFormApply:fh")
     @PostMapping("/tg")
     public AjaxResult tg(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.tg(studyFormApply);
@@ -184,7 +185,7 @@ public class StudyFormApplyController extends BaseController {
     /**
      * 审阅
      */
-    @RequiresPermissions("business:studyFormApply:sy")
+    @RequiresPermissions("business:drugFormApply:sy")
     @PostMapping("/sy")
     public AjaxResult sy(@RequestBody StudyFormApply studyFormApply) {
         studyFormApplyService.sy(studyFormApply);

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

@@ -38,6 +38,7 @@ public class StudyFormFillController extends BaseController {
      * 列表
      */
     @GetMapping("/list")
+    @RequiresPermissions({"business:studyFormPFill:list","business:nonTrialFormFill:list","business:drugFormFill:list"})
     public TableDataInfo list(StudyFormFillSearchForm form) {
         startPage();
         List<StudyFormFillListDto> list = studyFormFillService.queryList(form);
@@ -48,7 +49,7 @@ public class StudyFormFillController extends BaseController {
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    @RequiresPermissions("business:studyFormFill:xq")
+    @RequiresPermissions({"business:studyFormPFill:bj","business:nonTrialFormFill:bj","business:drugFormFill:bj"})
     public TableDataInfo jcgjList(StudyFormFillJcgj form) {
         startPage();
         List<StudyFormFillJcgj> list = studyFormFillJcgjService.queryList(form);
@@ -59,7 +60,7 @@ public class StudyFormFillController extends BaseController {
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
-    @RequiresPermissions("business:studyFormFill:xq")
+    @RequiresPermissions({"business:studyFormPFill:xq","business:nonTrialFormFill:xq","business:drugFormFill:xq"})
     public TableDataInfo qmxxList(StudyFormFillQmxx form) {
         startPage();
         List<StudyFormFillQmxx> list = studyFormFillQmxxService.queryList(form);
@@ -70,7 +71,7 @@ public class StudyFormFillController extends BaseController {
      * 详细
      */
     @GetMapping(value = "/info")
-    @RequiresPermissions("business:studyFormFill:xq")
+    @RequiresPermissions({"business:studyFormPFill:xq","business:nonTrialFormFill:xq","business:drugFormFill:xq"})
     public AjaxResult getInfo(Long id) {
         return AjaxResult.success(studyFormFillService.queryInfo(id));
     }
@@ -78,8 +79,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 加签
      */
-    @RequiresPermissions("business:studyFormFill:jq")
     @PostMapping("/jq")
+    @RequiresPermissions({"business:studyFormPFill:jq","business:nonTrialFormFill:jq","business:drugFormFill:jq"})
     public AjaxResult jq(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.jq(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -88,8 +89,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 废止
      */
-    @RequiresPermissions("business:studyFormFill:fz")
     @PostMapping("/fz")
+    @RequiresPermissions({"business:studyFormPFill:fz","business:nonTrialFormFill:fz","business:drugFormFill:fz"})
     public AjaxResult fz(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fz(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -99,8 +100,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 确认废止
      */
-    @RequiresPermissions("business:studyFormFill:qrfz")
     @PostMapping("/qrfz")
+    @RequiresPermissions({"business:studyFormPFill:qrfz","business:nonTrialFormFill:qrfz","business:drugFormFill:qrfz"})
     public AjaxResult qrfz(@RequestBody StudyFormFillShfzForm form) {
         studyFormFillService.qrfz(form);
         return AjaxResult.success("操作成功");
@@ -110,8 +111,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 更换归属人
      */
-    @RequiresPermissions("business:studyFormFill:ghgsr")
     @PostMapping("/ghgsr")
+    @RequiresPermissions({"business:studyFormPFill:ghgsr","business:nonTrialFormFill:ghgsr","business:drugFormFill:ghgsr"})
     public AjaxResult ghgsr(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.ghgsr(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -120,8 +121,10 @@ public class StudyFormFillController extends BaseController {
     /**
      * 保存
      */
-    @RequiresPermissions("business:studyFormFill:bj")
     @PostMapping("/bc")
+    @RequiresPermissions({"business:studyFormFill:bj","business:studyFormFill:xz",
+            "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz",
+            "business:drugFormFill:bj","business:drugFormFill:xz"})
     public AjaxResult bc(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.bc(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -131,8 +134,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 提交
      */
-    @RequiresPermissions("business:studyFormFill:bj")
     @PostMapping("/tj")
+    @RequiresPermissions({"business:studyFormPFill:bj","business:nonTrialFormFill:bj","business:drugFormFill:bj"})
     public AjaxResult tj(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.tj(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -142,8 +145,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 观察
      */
-    @RequiresPermissions("business:studyFormFill:gc")
     @PostMapping("/gc")
+    @RequiresPermissions({"business:studyFormPFill:gc","business:nonTrialFormFill:gc","business:drugFormFill:gc"})
     public AjaxResult gc(@RequestBody StudyFormFillGcForm form) {
         studyFormFillService.gc(form);
         return AjaxResult.success("操作成功");
@@ -153,8 +156,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 复核通过
      */
-    @RequiresPermissions("business:studyFormFill:fh")
     @PostMapping("/fhtg")
+    @RequiresPermissions({"business:studyFormPFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
     public AjaxResult fhtg(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fhtg(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -164,8 +167,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 复核拒绝
      */
-    @RequiresPermissions("business:studyFormFill:fh")
     @PostMapping("/fhjj")
+    @RequiresPermissions({"business:studyFormPFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
     public AjaxResult fhjj(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fhjj(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -174,8 +177,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 通过
      */
-    @RequiresPermissions("business:studyFormFill:fh")
     @PostMapping("/tg")
+    @RequiresPermissions({"business:studyFormPFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
     public AjaxResult tg(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.tg(studyFormFill);
         return AjaxResult.success("操作成功");
@@ -184,8 +187,8 @@ public class StudyFormFillController extends BaseController {
     /**
      * 审阅
      */
-    @RequiresPermissions("business:studyFormFill:sy")
     @PostMapping("/sy")
+    @RequiresPermissions({"business:studyFormPFill:sy","business:nonTrialFormFill:sy","business:drugFormFill:sy"})
     public AjaxResult sy(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.sy(studyFormFill);
         return AjaxResult.success("操作成功");

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

@@ -38,6 +38,7 @@ public class StudyFormPlanController extends BaseController
      * 列表
      */
     @GetMapping("/list")
+    @RequiresPermissions("business:studyFormPlan:list")
     public TableDataInfo list(StudyFormPlanSearchForm form) {
         startPage();
         List<StudyFormPlanListDto> list = studyFormPlanService.queryList(form);
@@ -89,8 +90,8 @@ public class StudyFormPlanController extends BaseController
     /**
      * 保存
      */
-    @RequiresPermissions("business:studyFormPlan:bj")
     @PostMapping("/bc")
+    @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:xz"})
     public AjaxResult bc(@RequestBody StudyFormPlan studyFormPlan) {
         studyFormPlanService.bc(studyFormPlan);
         return AjaxResult.success("操作成功");

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

@@ -40,6 +40,7 @@ public class StudyFormPreController extends BaseController
      * 列表
      */
     @GetMapping("/list")
+    @RequiresPermissions({"business:studyFormPre:list","business:nonTrialFormPre:list","business:drugFormPre:list"})
     public TableDataInfo list(StudyFormPreSearchForm form)
     {
         startPage();
@@ -51,7 +52,7 @@ public class StudyFormPreController extends BaseController
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    @RequiresPermissions("business:studyFormPre:xq")
+    @RequiresPermissions({"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"})
     public TableDataInfo jcgjList(StudyFormPreJcgj form)
     {
         startPage();
@@ -63,7 +64,7 @@ public class StudyFormPreController extends BaseController
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
-    @RequiresPermissions("business:studyFormPre:xq")
+    @RequiresPermissions({"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"})
     public TableDataInfo qmxxList(StudyFormPreQmxx form)
     {
         startPage();
@@ -75,7 +76,7 @@ public class StudyFormPreController extends BaseController
      * 详细
      */
     @GetMapping(value = "/info")
-    @RequiresPermissions("business:studyFormPre:xq")
+    @RequiresPermissions({"business:studyFormPre:xq","business:nonTrialFormPre:xq","business:drugFormPre:xq"})
     public AjaxResult getInfo(Long id)
     {
         return AjaxResult.success(studyFormPreService.queryInfo(id));
@@ -85,7 +86,9 @@ public class StudyFormPreController extends BaseController
      * 保存
      */
     @PostMapping("/bc")
-    @RequiresPermissions({"business:studyFormPre:bj","business:studyFormPre:xz"})
+    @RequiresPermissions({"business:studyFormPre:bj","business:studyFormPre:xz",
+            "business:nonTrialFormPre:bj","business:nonTrialFormPre:xz",
+            "business:drugFormPre:bj","business:drugFormPre:xz"})
     public AjaxResult bc(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.bc(studyFormPre);
@@ -96,7 +99,7 @@ public class StudyFormPreController extends BaseController
      * 提交
      */
     @PostMapping("/tj")
-    @RequiresPermissions("business:studyFormPre:bj")
+    @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:bj","business:drugFormPre:bj"})
     public AjaxResult tj(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.tj(studyFormPre);
@@ -108,7 +111,7 @@ public class StudyFormPreController extends BaseController
      * 填报
      */
     @PostMapping("/tb")
-    @RequiresPermissions("business:studyFormPre:bj")
+    @RequiresPermissions({"business:studyFormPre:bj","business:nonTrialFormPre:bj","business:drugFormPre:bj"})
     public AjaxResult tb(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.tb(studyFormPre);
@@ -118,8 +121,8 @@ public class StudyFormPreController extends BaseController
     /**
      * 通过
      */
-    @RequiresPermissions("business:studyFormPre:sh")
     @PostMapping("/tg")
+    @RequiresPermissions({"business:studyFormPre:sh","business:nonTrialFormPre:sh","business:drugFormPre:sh"})
     public AjaxResult tg(@RequestBody StudyFormPreAuditForm form)
     {
         studyFormPreService.tg(form);
@@ -129,8 +132,8 @@ public class StudyFormPreController extends BaseController
     /**
      * 拒绝
      */
-    @RequiresPermissions("business:studyFormPre:sh")
     @PostMapping("/jj")
+    @RequiresPermissions({"business:studyFormPre:sh","business:nonTrialFormPre:sh","business:drugFormPre:sh"})
     public AjaxResult jj(@RequestBody StudyFormPreAuditForm form)
     {
         studyFormPreService.jj(form);