From 036af8cd158f5768c83cd98ad6dd6256a22feec6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 23 八月 2024 16:33:37 +0800
Subject: [PATCH] fix：调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 108 insertions(+), 12 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 46aee9b..0e45a4b 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
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.dto.ReportImportDTO;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.form.ReportAuditingForm;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
@@ -18,15 +20,23 @@
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
import com.ycl.system.page.PageUtil;
+import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.poi.ExcelUtil;
+import com.ycl.utils.uuid.IdUtils;
+import enumeration.general.ErrorTypeEnum;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -52,14 +62,63 @@
*/
@Override
public Result add(ReportForm form) {
+ if (Objects.isNull(form.getPointId())) {
+ throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖");
+ }
Long userId = SecurityUtils.getUserId();
YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
form.setPeopleId(people.getId());
form.setUnitId(people.getBelongUnit());
Report entity = ReportForm.getEntityByForm(form, null);
+ entity.setSerialNumber(form.getPointId());
+ entity.setErrorType(String.join(",", form.getErrorType()));
entity.setStatus(0);
+ entity.setIdentify(IdUtils.timeAddRandomNO(3));
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ @Override
+ @SneakyThrows
+ public void importTemplate(HttpServletResponse response) {
+ ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
+ excelUtil.exportExcel(response, null, "鎶ュ瀵煎叆妯℃澘");
+ }
+
+ @Override
+ @SneakyThrows
+ @Transactional
+ public Result importData(ReportForm form) {
+ if (Objects.isNull(form.getImportPointId())) {
+ throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖");
+ }
+ Long userId = SecurityUtils.getUserId();
+ YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
+ form.setPeopleId(people.getId());
+ form.setUnitId(people.getBelongUnit());
+ // 璇诲彇excel鏁版嵁
+ ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
+ List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
+ // 鎵归噺鎻掑叆
+ ArrayList<Report> reports = new ArrayList<>();
+ long l = System.currentTimeMillis();
+ list.forEach( item -> {
+ Report entity = ReportForm.getEntityByForm(form, null);
+ entity.setImportBatchNumber(String.valueOf(l));
+ entity.setSerialNumber(item.getSerialNumber());
+ entity.setStatus(0);
+ entity.setIdentify(IdUtils.timeAddRandomNO(3));
+ entity.setCreateTime(DateUtils.getNowDate());
+ entity.setUpdateTime(DateUtils.getNowDate());
+ reports.add(entity);
+ });
+ if (saveBatch(reports)) {
+ return Result.ok("瀵煎叆鎴愬姛");
}
return Result.error("娣诲姞澶辫触");
}
@@ -73,14 +132,26 @@
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("淇敼鎴愬姛");
+ Date now = new Date();
+ entity.setUpdateTime(now);
+ 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("淇敼鎴愬姛");
}
/**
@@ -116,8 +187,10 @@
*/
@Override
public Result page(ReportQuery query) {
- List<ReportVO> page = baseMapper.page(query);
- return Result.ok().data(page).total(page.size());
+ IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
+ baseMapper.page(page, query);
+ page.getRecords().forEach(item -> item.setErrorType(ErrorTypeEnum.getEnumValue(item.getErrorType())));
+ return Result.ok().data(page).total(page.getTotal());
}
/**
@@ -170,9 +243,9 @@
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())
- .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
+// .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)
.page(PageUtil.getPage(query, Report.class));
@@ -185,8 +258,8 @@
vo.setUnitName(unit.getUnitName());
YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
vo.setPeopleName(ywPeople.getYwPersonName());
- YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
- vo.setPointName(ywPoint.getPointName());
+ // YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
+ // vo.setPointName(ywPoint.getPointName());
return vo;
}
)
@@ -194,4 +267,27 @@
return vos;
}
+
+ @Override
+ public Result auditingRecord(Integer id) {
+ List<ReportVO> reportList = baseMapper.examineRecord(id);
+ return Result.ok().data(reportList);
+ }
+
+ @Override
+ public Result auditing(ReportAuditingForm form) {
+ Report report = baseMapper.selectById(form.getId());
+ if (Objects.isNull(report)) {
+ throw new RuntimeException("瀹℃牳鐨勬姤澶囦笉瀛樺湪");
+ }
+ if (form.getAuditingResult()) {
+ report.setStatus(1);
+ } else {
+ report.setStatus(2);
+ }
+ report.setAuditOpinion(form.getAuditOpinion());
+ report.setAuditingTime(new Date());
+ baseMapper.updateById(report);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.8.0