修改一下 审核状态修改接口，前端好接

src/main/java/cn/wisenergy/chnmuseum/party/common/vo/AuditStatusParam.java

+package cn.wisenergy.chnmuseum.party.common.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 审核修改参数封装对象
+ *
+ * @author jiawei
+ */
+@Data
+@ApiModel
+public class AuditStatusParam implements Serializable {
+
+    @ApiModelProperty("审核ID")
+    @NotNull(message = "审核ID不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "审核状态,驳回：REFUSED,通过：APPROVED_FINAL", allowableValues = "REFUSED,APPROVED_FINAL")
+    @NotBlank(message = "审核状态不能为空")
+    private String status;
+
+    @ApiModelProperty("审核状态为驳回时，填写的审核意见")
+    private String remarks;
+
+}

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -4,6 +4,7 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
+import cn.wisenergy.chnmuseum.party.common.vo.AuditStatusParam;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.model.Audit;
 import cn.wisenergy.chnmuseum.party.model.TUser;
@@ -95,7 +96,7 @@ public class AuditController extends BaseController {
             if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
                 audit.setFirstRemarks("");
             }
-        }else{
+        } else {
             //如果层级是复审，设置复审时间
             audit.setSecondTime(LocalDateTime.now());
             //如果审核状态不是驳回，清空驳回原因
@@ -117,7 +118,7 @@ public class AuditController extends BaseController {
                 //无论初审复审，及时更新审核状态
                 user.setAuditStatus(audit.getStatus());
                 //如果复审通过，真正禁用用户
-                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())&&AuditStatusEnum.TBCA.name().equals(audit.getLevel())) {
+                if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) && AuditStatusEnum.TBCA.name().equals(audit.getLevel())) {
                     user.setStatus(AuditOperationEnum.DISABLE.name());
                 }
                 userService.updateById(user);
@@ -265,7 +266,27 @@ public class AuditController extends BaseController {
     @PutMapping("/updateAuditAllById")
     @RequiresPermissions("/audit/update")
     @ApiOperation(value = "审核管理===根据id修改审核信息", notes = "审核管理===根据id修改审核信息")
-    public Map<String, Object> updateAuditAllById(@RequestBody @Validated(value = {Update.class}) Audit audit) {
+    public Map<String, Object> updateAuditAllById(@RequestBody @Validated AuditStatusParam auditStatusParam) {
+
+        String id = auditStatusParam.getId();
+        Audit audit = auditService.getById(id);
+        if (audit == null) {
+            return getFailResult("id参数有误");
+        }
+        //设置修改的审核状态
+        audit.setStatus(auditStatusParam.getStatus());
+        //为啥数据库有null值
+        if (StringUtils.isBlank(audit.getLevel())) {
+            audit.setLevel(AuditStatusEnum.TBC.name());
+        }
+        //初审
+        if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
+            audit.setFirstRemarks(auditStatusParam.getRemarks());
+        }
+        //复审
+        if (AuditStatusEnum.TBCA.name().equals(audit.getLevel())) {
+            audit.setSecondRemarks(auditStatusParam.getRemarks());
+        }
 
         boolean update = auditService.updateAuditAllById(audit);