|
@@ -7,6 +7,7 @@ import jakarta.validation.constraints.NotEmpty;
|
|
|
import jakarta.validation.constraints.NotNull;
|
|
import jakarta.validation.constraints.NotNull;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.dromara.common.core.domain.R;
|
|
import org.dromara.common.core.domain.R;
|
|
|
|
|
+import org.dromara.common.core.utils.StringUtils;
|
|
|
import org.dromara.common.core.validate.AddGroup;
|
|
import org.dromara.common.core.validate.AddGroup;
|
|
|
import org.dromara.common.core.validate.EditGroup;
|
|
import org.dromara.common.core.validate.EditGroup;
|
|
|
import org.dromara.common.excel.utils.ExcelUtil;
|
|
import org.dromara.common.excel.utils.ExcelUtil;
|
|
@@ -15,6 +16,7 @@ import org.dromara.common.log.annotation.Log;
|
|
|
import org.dromara.common.log.enums.BusinessType;
|
|
import org.dromara.common.log.enums.BusinessType;
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
+import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
import org.dromara.common.web.core.BaseController;
|
|
import org.dromara.common.web.core.BaseController;
|
|
|
import org.dromara.risk.domain.bo.RiskWorkReportBo;
|
|
import org.dromara.risk.domain.bo.RiskWorkReportBo;
|
|
|
import org.dromara.risk.domain.vo.RiskWorkReportVo;
|
|
import org.dromara.risk.domain.vo.RiskWorkReportVo;
|
|
@@ -104,7 +106,11 @@ public class RiskWorkReportController extends BaseController {
|
|
|
@RepeatSubmit()
|
|
@RepeatSubmit()
|
|
|
@PutMapping("/review")
|
|
@PutMapping("/review")
|
|
|
public R<Void> review(@Validated @RequestBody RiskWorkReportBo bo) {
|
|
public R<Void> review(@Validated @RequestBody RiskWorkReportBo bo) {
|
|
|
- return toAjax(workReportService.reviewWorkReport(bo.getId(), bo.getAuditStatus(), bo.getAuditorName(), bo.getAuditOpinion()));
|
|
|
|
|
|
|
+ // 前端未传审核人时,自动取当前登录用户
|
|
|
|
|
+ String reviewer = StringUtils.isBlank(bo.getAuditorName())
|
|
|
|
|
+ ? LoginHelper.getUsername()
|
|
|
|
|
+ : bo.getAuditorName();
|
|
|
|
|
+ return toAjax(workReportService.reviewWorkReport(bo.getId(), bo.getAuditStatus(), reviewer, bo.getAuditOpinion()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|