|
@@ -53,7 +53,7 @@ public class EVisaTaskCheckController {
|
|
|
* 检查当前审批人是否存在证书
|
|
|
*/
|
|
|
@GetMapping("/checkFlowUserIsExistPfxFile")
|
|
|
- @ApiOperationSupport(order = 3)
|
|
|
+ @ApiOperationSupport(order = 4)
|
|
|
@ApiOperation(value = "检查当前审批人是否存在证书")
|
|
|
public R<Boolean> checkTaskUserIsExistPfxFile(){
|
|
|
//获取当前审批人的证书
|
|
@@ -75,17 +75,34 @@ public class EVisaTaskCheckController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 检查所选的流程环节处理人是否具有审批权限
|
|
|
+ * 检查所选的流程环节处理人是否具有审批权限(资料查询批量上报)
|
|
|
+ */
|
|
|
+ @PostMapping("/batchCheckFlowUserIsEVisaPermissions")
|
|
|
+ @ApiOperationSupport(order = 3)
|
|
|
+ @ApiOperation(value = "检查所选的流程环节处理人是否具有审批权限(资料查询批量上报)")
|
|
|
+ @ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(name = "flowId", value = "所选的流程ID", required = true),
|
|
|
+ @ApiImplicitParam(name = "contractId", value = "合同段ID", required = true),
|
|
|
+ @ApiImplicitParam(name = "queryId", value = "资料查询列表中的记录ID,以数组的形式")
|
|
|
+ })
|
|
|
+ public R<Boolean> batchCheckFlowUserIsEVisaPermissions(@RequestBody JSONObject json){
|
|
|
+
|
|
|
+ return R.data(300, false, "未找到流程");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 检查所选的流程环节处理人是否具有审批权限(三大填报页、日志列表的批量上报、首件列表的批量上报)
|
|
|
*/
|
|
|
@PostMapping("/checkFlowUserIsEVisaPermissions")
|
|
|
- @ApiOperation(value = "检查当前合同段是否开启电签")
|
|
|
+ @ApiOperation(value = "检查所选的流程环节处理人是否具有审批权限(三大填报页、日志列表的批量上报、首件列表的批量上报)")
|
|
|
@ApiOperationSupport(order = 2)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "flowId", value = "所选的流程ID", required = true),
|
|
|
@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true),
|
|
|
@ApiImplicitParam(name = "privatePKeyId", value = "表单列表中的isTypePrivatePid字段,集合形式"),
|
|
|
@ApiImplicitParam(name = "theLogPrimaryKeyId", value = "日志左侧所选的填报类型ID"),
|
|
|
- @ApiImplicitParam(name = "firstId", value = "首件记录ID")
|
|
|
+ @ApiImplicitParam(name = "firstId", value = "首件记录ID,列表批量上报时传任意一个即可")
|
|
|
})
|
|
|
public R<Boolean> checkFlowUserIsEVisaPermissions(@RequestBody JSONObject json){
|
|
|
if(json.containsKey("flowId")){
|
|
@@ -116,7 +133,7 @@ public class EVisaTaskCheckController {
|
|
|
}
|
|
|
|
|
|
if(jsonList == null){
|
|
|
- return R.data(300, false, "当前表格均未配置电签关键字,请联系管理员处理");
|
|
|
+ return R.data(300, false, "当前表格均未配置电签关键字,请联系维护人员处理");
|
|
|
}
|
|
|
//汇总电签配置的审批角色
|
|
|
List<String> eVisaRoleList = jsonList.stream().map(jsonObject -> jsonObject.getString("sigRoleId")).distinct().collect(Collectors.toList());
|
|
@@ -125,7 +142,7 @@ public class EVisaTaskCheckController {
|
|
|
for(JSONObject userRole : userRoleList){
|
|
|
if(!eVisaRoleList.contains(userRole.getString("roleId"))){
|
|
|
User user = this.userClient.userInfoById(userRole.getLong("userId")).getData();
|
|
|
- return R.data(300, false, "所选流程中的用户【" + user.getRealName() + "】不具有相关审批角色,请联系管理员处理或更换审批流程");
|
|
|
+ return R.data(300, false, "所选流程中的用户【" + user.getRealName() + "】不具有相关审批角色,请联系维护人员处理或更换审批流程");
|
|
|
}
|
|
|
}
|
|
|
|