diff --git a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java index 13c0526..0b6e0ce 100644 --- a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java +++ b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java @@ -1262,11 +1262,13 @@ public class SpmkController { .approveName(spmkApproveSummaryDto.getApproveName()) .assoType(spmkApproveSummaryDto.getAssoType()) .sts(ApproveSummarySts.IN.ordinal()) + .digest(spmkApproveSummaryDto.getDigest()) + .updateTime(new Date()) .currentApprover(currentApprover).isUrgent(spmkApproveSummaryDto.getIsUrgent()) .build(); if(spmkApproveSummaryDto.getId()!=null){ as.setId(spmkApproveSummaryDto.getId()); - as.setUpdateTime(new Date()); + } if (!as.insertOrUpdate()) { diff --git a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java index 372e973..ea311c1 100644 --- a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java +++ b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java @@ -168,7 +168,7 @@ public class SpmkServiceImpl implements SpmkService{ SpmkApproveDetailDrafts ad = spmkApproveDetailDraftsMapper.selectOne(new QueryWrapper<SpmkApproveDetailDrafts>().lambda().eq(SpmkApproveDetailDrafts::getApproveSummaryId, asId)); SpmkApproveDrafts sum = null; if(ad != null) { - sum = SpmkApproveDrafts.builder().build().selectOne(new QueryWrapper<SpmkApproveDrafts>().lambda().select(SpmkApproveDrafts::getId,SpmkApproveDrafts::getEmpNum,SpmkApproveDrafts::getSts,SpmkApproveDrafts::getCreateTime) + sum = SpmkApproveDrafts.builder().build().selectOne(new QueryWrapper<SpmkApproveDrafts>().lambda().select(SpmkApproveDrafts::getId,SpmkApproveDrafts::getEmpNum,SpmkApproveDrafts::getSts,SpmkApproveDrafts::getCreateTime,SpmkApproveDrafts::getDigest) .eq(SpmkApproveDrafts::getId, ad.getApproveSummaryId())); }