From 299d0cc19b6d7dffca5bf968980682bd03b89be9 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 26 Apr 2022 15:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demanData/controller/TDemandDataController.java       | 8 ++++----
 .../demanData/service/impl/TDemandDataServiceImpl.java    | 5 +++--
 .../modules/processForm/listener/DataCenterListener.java  | 3 +++
 .../controller/TResourceMountApplyController.java         | 8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/demanData/controller/TDemandDataController.java b/renren-admin/src/main/java/io/renren/modules/demanData/controller/TDemandDataController.java
index f0a1bd95..5d930337 100644
--- a/renren-admin/src/main/java/io/renren/modules/demanData/controller/TDemandDataController.java
+++ b/renren-admin/src/main/java/io/renren/modules/demanData/controller/TDemandDataController.java
@@ -33,13 +33,13 @@ import java.util.Map;
  * @since 1.0 2022-04-25
  */
 @RestController
-@RequestMapping("demanData/tdemanddata")
+@RequestMapping("demanData")
 @Api(tags = "能力需求评审主体")
 public class TDemandDataController {
     @Autowired
     private TDemandDataService tDemandDataService;
 
-    @GetMapping("page")
+    @GetMapping("/page")
     @ApiOperation("分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@@ -55,7 +55,7 @@ public class TDemandDataController {
         return new Result<PageData<TDemandDataDTO>>().ok(page);
     }
 
-    @GetMapping("{id}")
+    @GetMapping("/{id}")
     @ApiOperation("信息")
 //    @RequiresPermissions("demanData:tdemanddata:info")
     public Result<TDemandDataDTO> get(@PathVariable("id") Long id) {
@@ -103,7 +103,7 @@ public class TDemandDataController {
         return new Result();
     }
 
-    @GetMapping("export")
+    @GetMapping("/export")
     @ApiOperation("导出")
     @LogOperation("导出")
 //    @RequiresPermissions("demanData:tdemanddata:export")
diff --git a/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java
index 6e24b21c..ec3152c9 100644
--- a/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java
@@ -37,10 +37,11 @@ public class TDemandDataServiceImpl extends CrudServiceImpl<TDemandDataDao, TDem
                 case "flag":
                     wrapper.eq("flag", params.get("flag"));
                     break;
-                default:
-                    wrapper.eq("flag", 3); // 默认只出审核通过
             }
         });
+        if (!params.containsKey("creator")) {
+            wrapper.eq("flag", 3); // 默认只出审核通过
+        }
         return wrapper;
     }
 
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java
index eb62ca16..fe818c32 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java
@@ -58,6 +58,9 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
             case EVENTNAME_CREATE:
                 createEvent(delegateTask);
                 break;
+            case EVENTNAME_COMPLETE:
+                logger.error("----------------------大数据审批通过-complete------------------------------");
+                break;
             default:
                 logger.info("未处理该事件：" + eventName);
         }
diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java
index f9210281..aee4cee4 100644
--- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java
+++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java
@@ -34,13 +34,13 @@ import java.util.Map;
  * @since 3.0 2022-04-24
  */
 @RestController
-@RequestMapping("resourceMountApply/tresourcemountapply")
+@RequestMapping("/resourceMountApply")
 @Api(tags = "资源挂载申请表单")
 public class TResourceMountApplyController {
     @Autowired
     private TResourceMountApplyService tResourceMountApplyService;
 
-    @GetMapping("page")
+    @GetMapping("/page")
     @ApiOperation("分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@@ -55,7 +55,7 @@ public class TResourceMountApplyController {
         return new Result<PageData<TResourceMountApplyDTO>>().ok(page);
     }
 
-    @GetMapping("{id}")
+    @GetMapping("/{id}")
     @ApiOperation("信息")
 //    @RequiresPermissions("resourceMountApply:tresourcemountapply:info")
     public Result<TResourceMountApplyDTO> get(@PathVariable("id") Long id) {
@@ -106,7 +106,7 @@ public class TResourceMountApplyController {
         return new Result();
     }
 
-    @GetMapping("export")
+    @GetMapping("/export")
     @ApiOperation("导出")
     @LogOperation("导出")
 //    @RequiresPermissions("resourceMountApply:tresourcemountapply:export")