From eb792cd735b2fc820ab227ae94c95bbb5f8250fc Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 13 十一月 2024 17:29:37 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java index ba118b6..3b40503 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/issue/IssueCtrl.java @@ -4,8 +4,10 @@ import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrApp.issue.dto.DtoDeleteParam; import com.dy.pipIrrApp.issue.qo.QoIssueReport; import com.dy.pipIrrGlobal.pojoOp.OpeIssueReport; +import com.dy.pipIrrGlobal.pojoOp.OpeReportReply; import com.dy.pipIrrGlobal.voOp.VoIssueReport; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -59,6 +61,7 @@ * @return */ @GetMapping(path = "/getIssueReports") + @SsoAop() public BaseResponse<QueryResultVo<List<VoIssueReport>>> getIssueReports(QoIssueReport vo) { try { QueryResultVo<List<VoIssueReport>> res = issueSv.getIssueReports(vo); @@ -69,4 +72,47 @@ } } + /** + * 閫昏緫鍒犻櫎宸℃鍛橀棶棰樹笂鎶ワ紝鍒犻櫎鍓嶅厛鍒ゆ柇瑕佸垹闄ょ殑涓婃姤鏄惁瀛樺湪 + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "deleteIssueReport") + public BaseResponse<Boolean> deleteIssueReport(@RequestBody @Valid DtoDeleteParam po, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + String result = issueSv.deleteIssueReport(po); + if(!result.equals("success")) { + return BaseResponseUtils.buildErrorMsg(result); + } + + return BaseResponseUtils.buildSuccess(); + + } + + /** + * 鍥炲宸℃鍛橀棶棰樹笂鎶� + * @param po + * @param bindingResult + * @return + */ + @PostMapping(path = "replyReport") + @Transactional(rollbackFor = Exception.class) + public BaseResponse<Boolean> replyReport(@RequestBody @Valid OpeReportReply po, BindingResult bindingResult) { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + + String result = issueSv.replyReport(po); + if(!result.equals("sucess")) { + return BaseResponseUtils.buildErrorMsg(result); + } + + return BaseResponseUtils.buildSuccess() ; + } + + } -- Gitblit v1.8.0