From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null，为前端添加数据默认为0
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 95 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 1 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 45b302c..80dd2b3 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
@@ -60,6 +60,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import pojo.CascadeOption;
+import utils.file.FileUtils;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -215,6 +216,7 @@
}
List<String> willAddSerialNumber = waitAddList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
//鍙敓鎴愯�冩牳璁惧銆佷笖鏈夎繍缁村崟浣嶇殑宸ュ崟
+
List<YwPoint> pointList = new LambdaQueryChainWrapper<>(ywPointService.getBaseMapper())
.select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getImportantCommandImageTag)
.in(YwPoint::getSerialNumber, willAddSerialNumber)
@@ -287,6 +289,7 @@
}
log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}", workOrder);
}
+
redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
// 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
@@ -536,7 +539,7 @@
ywPointService.updateRecovery(serialNumbers, 0);
//绛涢�夊嚭绂荤嚎宸ュ崟ip骞朵慨鏀瑰湪绾跨姸鎬�
if (!CollectionUtils.isEmpty(serialNumbers)) {
- Map<String, List<String>> errorTypes = workOrderErrorTypeMapper.getErrorListByNumbers(serialNumbers).stream().collect(Collectors.groupingBy(
+ Map<String, List<String>> errorTypes = workOrderErrorTypeMapper.getErrorListByNumbers(workOrderNoList).stream().collect(Collectors.groupingBy(
WorkOrderVO::getIp,
Collectors.mapping(
WorkOrderVO::getErrorType,
@@ -605,6 +608,30 @@
img.setWorkOrderNo(workOrder.getWorkOrderNo());
img.setImgUrl(frameImg);
img.setCreateTime(new Date());
+ //鍒ゆ柇璇ュ伐鍗曠殑鍥剧墖鏄惁宸茬粡澶т簬5寮犱簡
+ LambdaQueryChainWrapper<WorkOrderCheckImg> qw = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper);
+
+ //鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
+ List<WorkOrderCheckImg> workOrderList = workOrderCheckImgMapper.selectList(
+ new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
+ .eq(WorkOrderCheckImg::getWorkOrderNo, workOrder.getWorkOrderNo())
+ .orderByDesc(WorkOrderCheckImg::getCreateTime)
+ );
+ //淇濈暀鏈�鏂扮殑5寮�
+ if (workOrderList.size()>=5){
+ List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+ List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
+ //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
+
+// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
+ for (String filePath: imgList){
+ delImgFormClient(filePath);
+ }
+ workOrderCheckImgMapper.deleteBatchIds(idList);
+
+ }
+
+
workOrderCheckImgMapper.insert(img);
}
}
@@ -650,9 +677,28 @@
@Override
public Result remove(List<String> ids) {
if (baseMapper.deleteBatchIds(ids) > 0) {
+ //鎵归噺鍒犻櫎鏄惁琚敤鍒�?
+
return Result.ok("鍒犻櫎鎴愬姛");
}
return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /***
+ * 閫氳繃url鍒犻櫎鏈嶅姟鍣ㄥ唴鐨勫浘鐗�
+ * @param url
+ */
+ public void delImgFormClient(String url){
+ //鎻愬彇鏂囦欢鍚� /profile/2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+ // 杩欓儴鍒�2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+ String imgPath = FileUtils.getImgName(url);
+ if (imgPath.isEmpty()){
+ log.error("url閿欒锛歿}",imgPath);
+ }else{
+ //鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath + / + yyyy-MM-dd +
+ String pathName = PlatformConfig.getUploadPath() + "/" + FileUtils.extractDateFromString(url);
+ FileUtils.deleteFile(pathName+"/" + imgPath);
+ }
}
/**
@@ -667,6 +713,18 @@
String workOrderNo = workOrder.getWorkOrderNo();
//鍒犻櫎宸ュ崟瀹℃牳璁板綍
workOrderAuditingRecordMapper.delete(new QueryWrapper<WorkOrderAuditingRecord>().eq("work_order_no", workOrderNo));
+ //闇�瑕佺墿鐞嗗垹闄ゆ湇鍔″櫒涓殑鍥剧墖
+ //鏌ヨ鍒板伐鍗曠収鐗囬泦鍚�
+ List<String> workOrderImg = workOrderCheckImgMapper
+ .selectList(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo))
+ .stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+ log.error("鍒犻櫎宸ュ崟鍥剧墖闆嗗悎:{}",workOrderImg);
+ log.error("鍒犻櫎璺緞:{}",PlatformConfig.getUploadPath());
+
+ for (String filePath: workOrderImg){
+ delImgFormClient(filePath);
+ }
+
//鍒犻櫎宸ュ崟鍥剧墖璁板綍
workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo));
//鍒犻櫎宸ュ崟涓嬪彂璁板綍
@@ -681,6 +739,9 @@
}
return Result.error("鍒犻櫎澶辫触");
}
+
+
+
/**
* 鍒嗛〉鏌ヨ
@@ -1147,6 +1208,11 @@
@Override
public Result detailByNo(String workOrderNo) {
WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
+ //鎶ョ┖鍘熷洜1. sql 涓� inner join 琛� t_work_order_distribute_record 涓� 鏃犱笌璇ヨ〃鍏宠仈鐨勮褰� wo.work_order_no = dr.work_order_no
+ if(workOrder == null){
+ workOrder = baseMapper.detailByNoButNoDistributeRecord(workOrderNo);
+ }
+
// 鏄惁鎶ュ
boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
.eq(Report::getSerialNumber, workOrder.getSerialNumber())
@@ -1165,6 +1231,9 @@
workOrder.setImgList(imgList);
return Result.ok().data(workOrder);
}
+
+ @Autowired
+ private WorkOrderMapper workOrderMapper;
/**
* 宸ュ崟瀵煎嚭鐨勯�昏緫
@@ -1195,6 +1264,30 @@
query.setErrorTypeList(errorTypeList);
}
List<WorkOrderVO> export = baseMapper.export(query);
+
+
+ List<String> workOrderNos = export.stream().map(WorkOrderVO::getWorkOrderNo).collect(Collectors.toList());
+ List<WorkOrderVO> auditTimeList = workOrderMapper.getAuditTimeList(workOrderNos);
+ Map<String, List<Date>> auditTimeMap = auditTimeList.stream()
+ .collect(Collectors.groupingBy(
+ WorkOrderVO::getWorkOrderNo, // 鍒嗙粍鐨勯敭
+ Collectors.mapping(WorkOrderVO::getAuditTime, Collectors.toList())));
+ if (!CollectionUtils.isEmpty(workOrderNos)){
+ export.forEach(workOrderVO -> {
+ List<Date> auditTimes = auditTimeMap.get(workOrderVO.getWorkOrderNo());
+ if (!CollectionUtils.isEmpty(auditTimes)){
+ //瀹℃牳閫氳繃鏃堕棿
+ Date passTime = Collections.max(auditTimes);
+ ZoneId zoneId = ZoneId.systemDefault();
+ workOrderVO.setPassTime(passTime.toInstant().atZone(zoneId).toLocalDateTime());
+ }
+ });
+ }
+
+
+
+
+
if (CollectionUtils.isEmpty(export)) return new ArrayList<WorkOrderVO>();
List<String> ips = export.stream().map(WorkOrderVO::getIp).collect(Collectors.toList());
//鏌ュ嚭鐩稿悓ip鐨勮澶囥�佸苟鏌ュ嚭鏍囩
--
Gitblit v1.8.0