From 3403a2462434da327d89311b4b9a75ab7a9b5c0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 十一月 2024 18:38:22 +0800
Subject: [PATCH] OSD宇视bug，工单删除、工单导出时间bug等等
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 241e65b..86f83a0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -114,14 +114,20 @@
private RedisCache redisCache;
@Override
- @Transactional(rollbackFor = Exception.class)
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ //閬垮厤鍧�(浜嬪姟鍔犻攣浼氬け鏁堛�佹柟娉曞唴閮ㄨ皟鐢ㄤ簨鍔′細澶辨晥)
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ return self.batchAddWorkOrder(workOrderList);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean batchAddWorkOrder(List<WorkOrder> workOrderList){
int total = workOrderList.size();
// 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
// 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
workOrderList = workOrderList.stream().filter(item -> !serialNumbers.contains(item.getSerialNumber()))
- .collect(Collectors.toList());
+ .collect(Collectors.toList());
workOrderList = workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
}).collect(Collectors.toList());
@@ -317,7 +323,6 @@
log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
return Boolean.TRUE;
}
-
/**
* 娣诲姞
*
@@ -563,6 +568,9 @@
*/
@Override
public Result removeById(String id) {
+ WorkOrder workOrder = baseMapper.selectById(id);
+ String workOrderNo = workOrder.getWorkOrderNo();
+ workOrderDistributeRecordMapper.deleteByWorkOrder(workOrderNo);
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -581,8 +589,8 @@
if(query.getUnitId()==null) {
query.setUnitId(SecurityUtils.getUnitId());
}
- query.setStart(DateUtils.getDayStart(query.getStart()));
- query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.page(page, query);
if (!CollectionUtils.isEmpty(page.getRecords())) {
page.getRecords().stream().forEach(item -> {
@@ -600,6 +608,8 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
}
@@ -1028,22 +1038,10 @@
@Override
public List<WorkOrderVO> export (WorkOrderExportQuery query){
query.setUnitId(SecurityUtils.getUnitId());
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if (query.getStart() == null) {
- query.setStart(format.format(DateUtils.getDayStart(new Date())));
- } else {
- query.setStart(query.getStart() + " 00:00:00");
- }
- if (query.getEnd() == null) {
- query.setEnd(format.format(DateUtils.getDayEnd(new Date())));
- } else {
- query.setEnd(query.getEnd() + " 23:59:59");
- }
+ if (query.getStart() != null) query.setStart(query.getStart() + " 00:00:00");
+ if (query.getEnd() != null) query.setEnd(query.getEnd() + " 23:59:59");
- List<WorkOrderVO> export = baseMapper.export(query);
-
- System.out.println(export);
- return export;
+ return baseMapper.export(query);
}
/**
--
Gitblit v1.8.0