From 0e4aa8d08a3bf8e8683d05081baefdbf96ce080f Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Wed, 08 Nov 2023 11:45:08 +0800 Subject: [PATCH] fix:小程序添加流程状态变更 --- screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java index 02165ba..e1d9d2f 100644 --- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java +++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java @@ -1,6 +1,12 @@ package com.moral.api.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.moral.api.pojo.ext.allocation.AllocationPageExt; +import com.moral.api.pojo.query.app.AppAllocationFileCond; +import com.moral.api.pojo.query.app.AppAllocationPageCond; +import com.moral.api.pojo.vo.app.AppAllocationFindVo; +import com.moral.constant.PageResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -13,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.validation.Valid; @@ -44,6 +52,26 @@ return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos); } + @PostMapping("/page") + @ApiOperation("���������������������") + public ResultMessage<PageResult<AppAllocationFindVo>> page(@Valid @RequestBody AppAllocationPageCond allocationPageCond){ + Page<AllocationPageExt> allocationFindVos = allocationService.pageApp(allocationPageCond); + PageResult<AppAllocationFindVo> result = new PageResult<>(allocationFindVos); + result.setList(AppAllocationFindVo.convert(allocationFindVos.getRecords())); + return ResultMessage.ok(result); + } + + public static void main(String[] args) { + List<String> list = Arrays.asList("aaa", "bbb","aaa"); + System.out.println("num;" + Collections.frequency(list, "aaa")); + } + + @PostMapping("appFile") + @ApiOperation("������������������or������") + public ResultMessage appFile(@Valid @RequestBody AppAllocationFileCond appAllocationFileCond){ + allocationService.saveFile(appAllocationFileCond); + return ResultMessage.ok(); + } @PostMapping("changeRoutine") @ApiOperation("���������������") @@ -60,4 +88,13 @@ return ResultMessage.ok(); } + + @GetMapping("authority") + @ApiOperation(value = "������������") + public ResultMessage authority(@RequestParam @ApiParam(value = "allocationNum",name = "������") String allocationNum, + @RequestParam @ApiParam(value = "userId",name = "������Id") Integer userId){ + boolean authority = allocationService.authority(allocationNum,userId); + return ResultMessage.ok(authority); + } + } -- Gitblit v1.8.0