From b68cf299e68473295dba11d94cc2e70a19dc673a Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期一, 31 三月 2025 15:50:06 +0800 Subject: [PATCH] Merge branch 'front' into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java index 112b6f7..5bd9c60 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java @@ -4,15 +4,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.IsptOrderParam; +import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.QlyInspect; import com.vincent.rsf.server.manager.service.QlyInspectService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -20,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; -@Api(tags = "璐ㄦ") +@Api(tags = "璐ㄦ淇℃伅") @RestController public class QlyInspectController extends BaseController { @@ -34,6 +38,44 @@ PageParam<QlyInspect, BaseParam> pageParam = new PageParam<>(baseParam, QlyInspect.class); return R.ok().add(qlyInspectService.page(pageParam, pageParam.buildWrapper(true))); } + + @PostMapping("/qlyInspect/all/save") + @PreAuthorize("'manager:qlyInspect:save'") + @ApiOperation("鍗曟嵁鍙婃槑缁嗕繚瀛�") + public R allSvae(@RequestBody QlyInspectAndItem params) { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return R.ok(qlyInspectService.allSave(params)); + } + + @PostMapping("/qlyInspect/reports") + @ApiOperation("鑾峰彇宸蹭笂鎶ュ崟鎹槑缁�") + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") + public R listByAsnCode(@RequestBody Map<String, Object> map) { + if (Objects.isNull(map)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return R.ok(qlyInspectService.listByAsn(map)); + } + + @GetMapping("/qlyInspect/asn/list") + @ApiOperation("鑾峰彇寰呰川妫�鍗�") + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") + public R getUnInspect() { + return R.ok(qlyInspectService.getUnInspect()); + } + + @PostMapping("/qlyInspect/selected") + @ApiOperation("閫夋嫨璐ㄦ鍗曟嵁") + @PreAuthorize("hasAuthority('manager:qlyInspect:update')") + public R selectedOrder(IsptOrderParam param) { + if (Objects.isNull(param)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return qlyInspectService.saveSelected(param); + } + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/qlyInspect/list") @@ -109,4 +151,5 @@ ExcelUtil.build(ExcelUtil.create(qlyInspectService.list(), QlyInspect.class), response); } + } -- Gitblit v1.9.1