From 731088b65667ec3d00ae7d14b851d53831552ac3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 06 三月 2024 15:01:01 +0800
Subject: [PATCH] 违约审核完善
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
index 0e4dda4..000eadd 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.platform.service.impl;
+import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.DefaultAuditing;
+import com.ycl.platform.domain.form.DefaultAuditForm;
import com.ycl.platform.mapper.DefaultAuditingMapper;
import com.ycl.platform.service.DefaultAuditingService;
import com.ycl.system.Result;
@@ -8,6 +10,9 @@
import com.ycl.platform.domain.form.DefaultAuditingForm;
import com.ycl.platform.domain.vo.DefaultAuditingVO;
import com.ycl.platform.domain.query.DefaultAuditingQuery;
+
+import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -101,17 +107,10 @@
*/
@Override
public Result page(DefaultAuditingQuery query) {
-
- IPage<DefaultAuditing> page = new LambdaQueryChainWrapper<>(baseMapper)
- .orderByDesc(DefaultAuditing::getCreateTime)
- .page(PageUtil.getPage(query, DefaultAuditing.class));
-
- List<DefaultAuditingVO> vos = page.getRecords().stream()
- .map(
- entity -> DefaultAuditingVO.getVoByEntity(entity, null)
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ query.setTime();
+ IPage page = PageUtil.getPage(query, DefaultAuditing.class);
+ baseMapper.page(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
}
/**
@@ -142,4 +141,21 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result auditing(DefaultAuditForm form) {
+ DefaultAuditing defaultAuditing = baseMapper.selectById(form.getId());
+ if (Objects.isNull(defaultAuditing)) {
+ throw new ServiceException("璇ヨ繚绾︿笉瀛樺湪");
+ }
+ if ("pass".equals(form.getAuditingResult())) {
+ defaultAuditing.setAuditingStatus("瀹℃牳閫氳繃");
+ } else {
+ defaultAuditing.setAuditingStatus("瀹℃牳鏈�氳繃");
+ }
+ BeanUtils.copyProperties(form, defaultAuditing);
+ defaultAuditing.setAuditingTime(LocalDateTime.now());
+ baseMapper.updateById(defaultAuditing);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.8.0