fix：[试验管理][预填表单，填报表单]完善

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

@@ -48,6 +48,7 @@ public class StudyFormFillController extends BaseController {
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
+    @RequiresPermissions("business:studyFormFill:xq")
     public TableDataInfo jcgjList(StudyFormFillJcgj form) {
         startPage();
         List<StudyFormFillJcgj> list = studyFormFillJcgjService.queryList(form);
@@ -58,6 +59,7 @@ public class StudyFormFillController extends BaseController {
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
+    @RequiresPermissions("business:studyFormFill:xq")
     public TableDataInfo qmxxList(StudyFormFillQmxx form) {
         startPage();
         List<StudyFormFillQmxx> list = studyFormFillQmxxService.queryList(form);
@@ -68,6 +70,7 @@ public class StudyFormFillController extends BaseController {
      * 详细
      */
     @GetMapping(value = "/info")
+    @RequiresPermissions("business:studyFormFill:xq")
     public AjaxResult getInfo(Long id) {
         return AjaxResult.success(studyFormFillService.queryInfo(id));
     }
@@ -117,7 +120,7 @@ public class StudyFormFillController extends BaseController {
     /**
      * 保存
      */
-    @RequiresPermissions("business:studyFormFill:bc")
+    @RequiresPermissions("business:studyFormFill:bj")
     @PostMapping("/bc")
     public AjaxResult bc(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.bc(studyFormFill);
@@ -128,7 +131,7 @@ public class StudyFormFillController extends BaseController {
     /**
      * 提交
      */
-    @RequiresPermissions("business:studyFormFill:tj")
+    @RequiresPermissions("business:studyFormFill:bj")
     @PostMapping("/tj")
     public AjaxResult tj(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.tj(studyFormFill);
@@ -150,7 +153,7 @@ public class StudyFormFillController extends BaseController {
     /**
      * 复核通过
      */
-    @RequiresPermissions("business:studyFormFill:fhtg")
+    @RequiresPermissions("business:studyFormFill:fh")
     @PostMapping("/fhtg")
     public AjaxResult fhtg(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fhtg(studyFormFill);
@@ -161,7 +164,7 @@ public class StudyFormFillController extends BaseController {
     /**
      * 复核拒绝
      */
-    @RequiresPermissions("business:studyFormFill:fhjj")
+    @RequiresPermissions("business:studyFormFill:fh")
     @PostMapping("/fhjj")
     public AjaxResult fhjj(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.fhjj(studyFormFill);
@@ -171,7 +174,7 @@ public class StudyFormFillController extends BaseController {
     /**
      * 通过
      */
-    @RequiresPermissions("business:studyFormFill:tg")
+    @RequiresPermissions("business:studyFormFill:fh")
     @PostMapping("/tg")
     public AjaxResult tg(@RequestBody StudyFormFill studyFormFill) {
         studyFormFillService.tg(studyFormFill);

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

@@ -51,6 +51,7 @@ public class StudyFormPreController extends BaseController
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
+    @RequiresPermissions("business:studyFormPre:xq")
     public TableDataInfo jcgjList(StudyFormPreJcgj form)
     {
         startPage();
@@ -62,6 +63,7 @@ public class StudyFormPreController extends BaseController
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
+    @RequiresPermissions("business:studyFormPre:xq")
     public TableDataInfo qmxxList(StudyFormPreQmxx form)
     {
         startPage();
@@ -73,6 +75,7 @@ public class StudyFormPreController extends BaseController
      * 详细
      */
     @GetMapping(value = "/info")
+    @RequiresPermissions("business:studyFormPre:xq")
     public AjaxResult getInfo(Long id)
     {
         return AjaxResult.success(studyFormPreService.queryInfo(id));
@@ -82,6 +85,7 @@ public class StudyFormPreController extends BaseController
      * 保存
      */
     @PostMapping("/bc")
+    @RequiresPermissions("business:studyFormPre:bj,business:studyFormPre:xz")
     public AjaxResult bc(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.bc(studyFormPre);
@@ -92,6 +96,7 @@ public class StudyFormPreController extends BaseController
      * 提交
      */
     @PostMapping("/tj")
+    @RequiresPermissions("business:studyFormPre:bj")
     public AjaxResult tj(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.tj(studyFormPre);
@@ -103,6 +108,7 @@ public class StudyFormPreController extends BaseController
      * 填报
      */
     @PostMapping("/tb")
+    @RequiresPermissions("business:studyFormPre:bj")
     public AjaxResult tb(@RequestBody StudyFormPre studyFormPre)
     {
         studyFormPreService.tb(studyFormPre);
@@ -112,7 +118,7 @@ public class StudyFormPreController extends BaseController
     /**
      * 通过
      */
-    @RequiresPermissions("business:studyFormPre:audit")
+    @RequiresPermissions("business:studyFormPre:sh")
     @PostMapping("/tg")
     public AjaxResult tg(@RequestBody StudyFormPreAuditForm form)
     {
@@ -123,7 +129,7 @@ public class StudyFormPreController extends BaseController
     /**
      * 拒绝
      */
-    @RequiresPermissions("business:studyFormPre:audit")
+    @RequiresPermissions("business:studyFormPre:sh")
     @PostMapping("/jj")
     public AjaxResult jj(@RequestBody StudyFormPreAuditForm form)
     {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java

@@ -50,7 +50,7 @@ public class StudyFormFill extends MpBaseEntity
     /** 是否补录：1：否；10：是 */
     private Integer sfbl;
 
-    /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9已废止；11：待废止 */
+    /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 */
     private Integer bdzt;
 
     /** 提交时间 */