wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

。。。

This commit is contained in:
wangliwen 2022-04-26 15:04:27 +08:00
parent 816ec82d45
commit 299d0cc19b
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/java/io/renren/modules/demanData/controller/TDemandDataController.java
View File

@ -33,13 +33,13 @@ import java.util.Map;
* @since 1.0 2022-04-25 * @since 1.0 2022-04-25
*/ */
@RestController @RestController
@RequestMapping("demanData/tdemanddata") @RequestMapping("demanData")
@Api(tags = "能力需求评审主体") @Api(tags = "能力需求评审主体")
public class TDemandDataController { public class TDemandDataController {
@Autowired @Autowired
private TDemandDataService tDemandDataService; private TDemandDataService tDemandDataService;
@GetMapping("page") @GetMapping("/page")
@ApiOperation("分页") @ApiOperation("分页")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @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); return new Result<PageData<TDemandDataDTO>>().ok(page);
} }
@GetMapping("{id}") @GetMapping("/{id}")
@ApiOperation("信息") @ApiOperation("信息")
// @RequiresPermissions("demanData:tdemanddata:info") // @RequiresPermissions("demanData:tdemanddata:info")
public Result<TDemandDataDTO> get(@PathVariable("id") Long id) { public Result<TDemandDataDTO> get(@PathVariable("id") Long id) {
@ -103,7 +103,7 @@ public class TDemandDataController {
return new Result(); return new Result();
} }
@GetMapping("export") @GetMapping("/export")
@ApiOperation("导出") @ApiOperation("导出")
@LogOperation("导出") @LogOperation("导出")
// @RequiresPermissions("demanData:tdemanddata:export") // @RequiresPermissions("demanData:tdemanddata:export")

5
renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java
View File

@ -37,10 +37,11 @@ public class TDemandDataServiceImpl extends CrudServiceImpl<TDemandDataDao, TDem
case "flag": case "flag":
wrapper.eq("flag", params.get("flag")); wrapper.eq("flag", params.get("flag"));
break; break;
default:
wrapper.eq("flag", 3); // 默认只出审核通过
} }
}); });
if (!params.containsKey("creator")) {
wrapper.eq("flag", 3); // 默认只出审核通过
}
return wrapper; return wrapper;
} }

3
renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java
View File

@ -58,6 +58,9 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
case EVENTNAME_CREATE: case EVENTNAME_CREATE:
createEvent(delegateTask); createEvent(delegateTask);
break; break;
case EVENTNAME_COMPLETE:
logger.error("----------------------大数据审批通过-complete------------------------------");
break;
default: default:
logger.info("未处理该事件：" + eventName); logger.info("未处理该事件：" + eventName);
} }

8
renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java
View File

@ -34,13 +34,13 @@ import java.util.Map;
* @since 3.0 2022-04-24 * @since 3.0 2022-04-24
*/ */
@RestController @RestController
@RequestMapping("resourceMountApply/tresourcemountapply") @RequestMapping("/resourceMountApply")
@Api(tags = "资源挂载申请表单") @Api(tags = "资源挂载申请表单")
public class TResourceMountApplyController { public class TResourceMountApplyController {
@Autowired @Autowired
private TResourceMountApplyService tResourceMountApplyService; private TResourceMountApplyService tResourceMountApplyService;
@GetMapping("page") @GetMapping("/page")
@ApiOperation("分页") @ApiOperation("分页")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @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); return new Result<PageData<TResourceMountApplyDTO>>().ok(page);
} }
@GetMapping("{id}") @GetMapping("/{id}")
@ApiOperation("信息") @ApiOperation("信息")
// @RequiresPermissions("resourceMountApply:tresourcemountapply:info") // @RequiresPermissions("resourceMountApply:tresourcemountapply:info")
public Result<TResourceMountApplyDTO> get(@PathVariable("id") Long id) { public Result<TResourceMountApplyDTO> get(@PathVariable("id") Long id) {
@ -106,7 +106,7 @@ public class TResourceMountApplyController {
return new Result(); return new Result();
} }
@GetMapping("export") @GetMapping("/export")
@ApiOperation("导出") @ApiOperation("导出")
@LogOperation("导出") @LogOperation("导出")
// @RequiresPermissions("resourceMountApply:tresourcemountapply:export") // @RequiresPermissions("resourceMountApply:tresourcemountapply:export")