feat:审批

This commit is contained in:
李京通 2025-06-09 15:57:50 +08:00
parent bb94fcc4d4
commit 58b434d16e
1 changed files with 5 additions and 3 deletions

View File

@ -10,8 +10,11 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.database.domain.*; import com.ruoyi.database.domain.ApprovalProcess;
import com.ruoyi.database.domain.BaseAddressInfo;
import com.ruoyi.database.domain.BusinessTripApproval;
import com.ruoyi.database.domain.dto.ApprovaltDto; import com.ruoyi.database.domain.dto.ApprovaltDto;
import com.ruoyi.database.domain.gwglLog;
import com.ruoyi.database.service.ApprovalProcessService; import com.ruoyi.database.service.ApprovalProcessService;
import com.ruoyi.database.service.BaseAddressInfoService; import com.ruoyi.database.service.BaseAddressInfoService;
import com.ruoyi.database.service.BusinessTripApprovalService; import com.ruoyi.database.service.BusinessTripApprovalService;
@ -24,7 +27,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -230,7 +232,7 @@ public class BusinessTripApprovalController extends BaseController {
gwglLog.setType(1); gwglLog.setType(1);
gwglLog.setApplyNo(businessTripApproval.getApplyNo()); gwglLog.setApplyNo(businessTripApproval.getApplyNo());
gwglLog.setChecker(user.getNickName()); gwglLog.setChecker(user.getNickName());
gwglLog.setCheckTime(LocalDateTime.now()); gwglLog.setCheckTime(System.currentTimeMillis());
gwglLog.setCheckState(state); gwglLog.setCheckState(state);
boolean result1 = gwglLogService.save(gwglLog); boolean result1 = gwglLogService.save(gwglLog);
if (!result || !result1) { if (!result || !result1) {