更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/scene/RoleSceneInfoController.java

@@ -40,7 +40,7 @@ public class RoleSceneInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到角色所有已启用的场景列表", description = "得到角色所有已启用的场景列表")
     @RequestMapping(value = {"getRoleAllEnableScenes"}, method = {RequestMethod.POST})
-    public ResultContent<List<SceneInfoModel>> getRoleAllEnableScenes(@RequestBody IDParam param) {
+    public ResultContent<List<SceneInfoAboutComModel>> getRoleAllEnableScenes(@RequestBody IDParam param) {
         return ResultContent.buildSuccess(roleSceneInfoService.getAllEnableScenes(param.getId()));
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -169,10 +169,40 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_151_Menu")
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.School, remark = "资金管理_支付订单_151_Menu")
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_151_Menu")
-    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_151_Menu")
+    @ResourceAuth(value = "projectWithdrawal", type = AuthType.Project, remark = "资金管理_提现_151_Menu")
+    @ResourceAuth(value = "projectWithdrawal", type = AuthType.School, remark = "资金管理_提现_151_Menu")
+    @ResourceAuth(value = "projectWithdrawal", type = AuthType.BusinessMain, remark = "资金管理_提现_151_Menu")
+    @ResourceAuth(value = "projectWithdrawal", type = AuthType.CommonOrg, remark = "资金管理_提现_151_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "projectWithdrawal", method = {RequestMethod.GET})
+    public ResultContent projectWithdrawal() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "projectFundManagerAudit", type = AuthType.Project, remark = "资金管理_提现审核_152_Menu")
+    @ResourceAuth(value = "projectFundManagerAudit", type = AuthType.School, remark = "资金管理_提现审核_152_Menu")
+    @ResourceAuth(value = "projectFundManagerAudit", type = AuthType.BusinessMain, remark = "资金管理_提现审核_152_Menu")
+    @ResourceAuth(value = "projectFundManagerAudit", type = AuthType.CommonOrg, remark = "资金管理_提现审核_152_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "projectFundManagerAudit", method = {RequestMethod.GET})
+    public ResultContent projectFundManagerAudit() {
+        return ResultContent.buildSuccess();
+    }
+
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.Project, remark = "资金管理_支付订单_153_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.School, remark = "资金管理_支付订单_153_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.BusinessMain, remark = "资金管理_支付订单_153_Menu")
+    @ResourceAuth(value = "projectPayOrderManager", type = AuthType.CommonOrg, remark = "资金管理_支付订单_153_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -184,10 +214,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.Project, remark = "资金管理_分账单_152_Menu")
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.School, remark = "资金管理_分账单_152_Menu")
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_152_Menu")
-    @ResourceAuth(value = "projectPayShareManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_152_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.Project, remark = "资金管理_分账单_154_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.School, remark = "资金管理_分账单_154_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.BusinessMain, remark = "资金管理_分账单_154_Menu")
+    @ResourceAuth(value = "projectPayShareManager", type = AuthType.CommonOrg, remark = "资金管理_分账单_154_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
@@ -199,10 +229,10 @@ public class OrgMenuController {
         return ResultContent.buildSuccess();
     }
 
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.Project, remark = "资金管理_对账单_153_Menu")
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.School, remark = "资金管理_对账单_153_Menu")
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_153_Menu")
-    @ResourceAuth(value = "projectPayReconManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_153_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.Project, remark = "资金管理_对账单_155_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.School, remark = "资金管理_对账单_155_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.BusinessMain, remark = "资金管理_对账单_155_Menu")
+    @ResourceAuth(value = "projectPayReconManager", type = AuthType.CommonOrg, remark = "资金管理_对账单_155_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/scene/RoleSceneInfoService.java

@@ -5,7 +5,10 @@ import com.github.microservice.net.ResultMessage;
 import com.google.common.collect.Lists;
 import com.zhongshu.card.client.model.base.SortParam;
 import com.zhongshu.card.client.model.org.role.RoleSimpleModel;
-import com.zhongshu.card.client.model.scene.*;
+import com.zhongshu.card.client.model.scene.RoleBindAllParam;
+import com.zhongshu.card.client.model.scene.RoleBindSceneParam;
+import com.zhongshu.card.client.model.scene.RoleSceneInfoModel;
+import com.zhongshu.card.client.model.scene.SceneInfoAboutComModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.org.RoleDao;
 import com.zhongshu.card.server.core.dao.scene.ProjectSceneInfoDao;
@@ -142,8 +145,9 @@ public class RoleSceneInfoService extends SuperService {
      * @param roleId
      * @return
      */
-    public List<SceneInfoModel> getAllEnableScenes(String roleId) {
-        List<SceneInfoModel> models = new ArrayList<>();
+    public List<SceneInfoAboutComModel> getAllEnableScenes(String roleId) {
+        List<SceneInfoAboutComModel> models = new ArrayList<>();
+
         if (StringUtils.isNotEmpty(roleId)) {
             // 角色关联的场景数据
             List<RoleSceneInfo> list = roleSceneInfoDao.findByRoleIdOrderBySortAsc(roleId);
@@ -153,7 +157,7 @@ public class RoleSceneInfoService extends SuperService {
                     ProjectSceneInfo projectSceneInfo = it.getProjectSceneInfo();
                     if (ObjectUtils.isNotEmpty(projectSceneInfo) && ObjectUtils.isNotEmpty(sceneInfo)) {
                         if (projectSceneInfo.getState() == DataState.Enable && sceneInfo.getState() == DataState.Enable) {
-                            models.add(sceneInfoService.toModel(sceneInfo));
+                            models.add(sceneInfoService.toAboutComModel(sceneInfo));
                         }
                     }
                 });