From 009e3e6fe18e3229ef1a6b2a39c9de57dd9d34bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 31 七月 2024 15:58:38 +0800
Subject: [PATCH] 数据中心响应类调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index d284f95..3230e09 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -12,7 +12,6 @@
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
-import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
@@ -21,9 +20,11 @@
import com.ycl.system.Result;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.uuid.IdUtils;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
@@ -61,6 +62,7 @@
form.setUnitId(people.getBelongUnit());
Report entity = ReportForm.getEntityByForm(form, null);
entity.setStatus(0);
+ entity.setIdentify(IdUtils.timeAddRandomNO(3));
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -76,14 +78,25 @@
public Result update(ReportForm form) {
Report entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- if (baseMapper.updateById(entity) > 0) {
- return Result.ok("淇敼鎴愬姛");
+
+ if (0 == entity.getStatus()) {
+ // 寰呭鏍哥殑鐩存帴鏀�
+ BeanUtils.copyProperties(form, entity);
+ baseMapper.updateById(entity);
+ } else if (2 == entity.getStatus()) {
+ // 濡傛灉鏄湭瀹℃牳閫氳繃锛岃繘琛屼慨鏀癸紝閭ｄ箞鐩存帴鏂板锛堜负浜嗕繚瀛樺鏍歌褰曪級
+ Report report = new Report();
+ BeanUtils.copyProperties(entity, report);
+ BeanUtils.copyProperties(form, report);
+ report.setId(null);
+ report.setStatus(0);
+ report.setAuditingTime(null);
+ report.setAuditOpinion(null);
+ baseMapper.insert(report);
}
- return Result.error("淇敼澶辫触");
+ return Result.ok("淇敼鎴愬姛");
}
/**
@@ -174,8 +187,8 @@
IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
.eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
- .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
- .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
+// .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
+// .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
.in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
.in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
.orderByDesc(Report::getCreateTime)
@@ -200,9 +213,9 @@
@Override
- public Result examineRecord() {
-
- return null;
+ public Result auditingRecord(Integer id) {
+ List<ReportVO> reportList = baseMapper.examineRecord(id);
+ return Result.ok().data(reportList);
}
@Override
--
Gitblit v1.8.0