zhubaomin
2024-11-01 662ced27d009a35ffb77312942953ab424ae2dda
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueCtrl.java
@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeReportReply;
import com.dy.pipIrrGlobal.voSe.VoIssueReport;
import com.dy.pipIrrGlobal.voSe.VoIssueReportReply;
import com.dy.pipIrrWechat.issue.dto.DtoDeleteParam;
import com.dy.pipIrrWechat.issue.dto.DtoIssueReport;
import com.dy.pipIrrWechat.issue.dto.DtoReportReply;
import com.dy.pipIrrWechat.issue.qo.QoIssueReport;
@@ -96,18 +97,25 @@
    }
    /**
     * 逻辑删除农户问题上报
     * @param issueReportId
     * 逻辑删除农户问题上报,删除前先判断要删除的上报是否存在
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "deleteIssueReport")
    public BaseResponse<Boolean> deleteIssueReport(@RequestParam("issueReportId") Long issueReportId) {
        if (issueReportId == null) {
            return BaseResponseUtils.buildErrorMsg("未选择要删除的农户问题上报");
    public BaseResponse<Boolean> deleteIssueReport(@RequestBody @Valid DtoDeleteParam po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        // 根据上报ID及农户ID获取未删除的上报,删除上报判断使用
        SeIssueReport seIssueReport = issueSv.getReport(po.getIssueReportId(), po.getClientId());
        if(seIssueReport == null) {
            return BaseResponseUtils.buildErrorMsg("您要删除的问题上报不存在");
        }
        try {
            Integer recordCount = Optional.ofNullable(issueSv.deleteIssueReport(issueReportId)).orElse(0);
            Integer recordCount = Optional.ofNullable(issueSv.deleteIssueReport(po.getIssueReportId())).orElse(0);
            if (recordCount == 0) {
                return BaseResponseUtils.buildErrorMsg("农户问题上报删除失败");
            }else {