feat:审批
This commit is contained in:
parent
1563f94964
commit
546cf13f34
|
@ -19,6 +19,7 @@ import com.ruoyi.system.service.ISysDeptService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
@ -180,13 +181,19 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
|
||||||
|
|
||||||
@ApiOperation("审批非工作日饮酒报备单")
|
@ApiOperation("审批非工作日饮酒报备单")
|
||||||
@PostMapping("/approval")
|
@PostMapping("/approval")
|
||||||
public AjaxResult approval(ApprovaltDto dto) {
|
@Transactional
|
||||||
|
public AjaxResult approval(@RequestBody ApprovaltDto dto) {
|
||||||
SysUser user = getLoginUser().getUser();
|
SysUser user = getLoginUser().getUser();
|
||||||
Long id = dto.getId();
|
Long id = dto.getId();
|
||||||
Integer state = dto.getState();
|
Integer state = dto.getState();
|
||||||
NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport = nonWorkingDayDrinkingReportService.getById(id);
|
NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport = nonWorkingDayDrinkingReportService.getById(id);
|
||||||
nonWorkingDayDrinkingReport.setState(state);
|
nonWorkingDayDrinkingReport.setState(state);
|
||||||
boolean result = nonWorkingDayDrinkingReportService.updateById(nonWorkingDayDrinkingReport);
|
boolean result = nonWorkingDayDrinkingReportService.updateById(nonWorkingDayDrinkingReport);
|
||||||
|
ApprovalProcess one = approvalsProcessService.lambdaQuery()
|
||||||
|
.eq(ApprovalProcess::getApprovalNo, nonWorkingDayDrinkingReport.getApplyNo())
|
||||||
|
.one();
|
||||||
|
one.setApprovalStatus(state);
|
||||||
|
boolean result2 = approvalsProcessService.updateById(one);
|
||||||
gwglLog gwglLog = new gwglLog();
|
gwglLog gwglLog = new gwglLog();
|
||||||
gwglLog.setApplyNo(nonWorkingDayDrinkingReport.getApplyNo());
|
gwglLog.setApplyNo(nonWorkingDayDrinkingReport.getApplyNo());
|
||||||
gwglLog.setDeptId(nonWorkingDayDrinkingReport.getDeptId());
|
gwglLog.setDeptId(nonWorkingDayDrinkingReport.getDeptId());
|
||||||
|
|
Loading…
Reference in New Issue