上报选择委托人,试验任务查看拼接委托单

blade-service/blade-business/src/main/java/org/springblade/business/controller/FixedFlowController.java

@@ -21,8 +21,12 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.dto.SaveUserInfoByProjectDTO;
 import org.springblade.manager.entity.SignPfxFile;
+import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ProjectAssignmentUserClient;
 import org.springblade.manager.vo.RoleSignPfxUserVO;
+import org.springblade.manager.vo.RoleSignPfxUserVO1;
+import org.springblade.manager.vo.RoleSignPfxUserVO2;
+import org.springblade.manager.vo.RoleSignPfxUserVO3;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -59,6 +63,8 @@ public class FixedFlowController extends BladeController {
 
     private final IUserClient userClient;
 
+    private final ContractClient contractClient;
+
     private final JdbcTemplate jdbcTemplate;
 
     /**
@@ -68,6 +74,7 @@ public class FixedFlowController extends BladeController {
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "获取系统所有角色划分")
     public R<List<RoleSignPfxUserVO>> queryAllRoleList(@RequestParam String contractId) {
+        RoleSignPfxUserVO1 vo1 = new RoleSignPfxUserVO1();
         //获取当前系统配置的角色划分
         List<RoleVO> roleVOS = this.sysClient.search().getData();
         //获取项目人员
@@ -130,10 +137,14 @@ public class FixedFlowController extends BladeController {
             //设置结果
             result.add(pfxUserVo);
         }
-
         return R.data(result);
     }
 
+    @GetMapping("/findAllUserAndRoleList")
+    public R<RoleSignPfxUserVO3> findAllUserAndRoleList(@RequestParam Long contractId, @RequestParam(required = false) Long roleId){
+      return R.data(contractClient.findAllUserAndRoleList(contractId,roleId));
+    }
+
     /**
      * 详情
      */