From c16ca04b474d445cde54332045db19458863709e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 八月 2024 19:42:11 +0800
Subject: [PATCH] 设备增加厂商类型
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 178 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 119 insertions(+), 59 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 6e8b5db..a668898 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
@@ -29,6 +29,7 @@
import com.ycl.system.Result;
import com.ycl.system.domain.SysConfig;
import com.ycl.system.mapper.SysConfigMapper;
+import com.ycl.system.mapper.SysDictDataMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
@@ -36,7 +37,10 @@
import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
-import enumeration.general.*;
+import enumeration.general.NotifyTypeEnum;
+import enumeration.general.UrgentLevelEnum;
+import enumeration.general.WorkOrderDistributeWayEnum;
+import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
@@ -80,10 +84,11 @@
private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
private final NotifyService notifyService;
private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
- private final WorkOrderErrorTypeMapper workOrderErrorTypeMapper;
+ private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService;
private final SysConfigMapper configMapper;
private final ServerConfig serverConfig;
private final ReportMapper reportMapper;
+ private final SysDictDataMapper dictDataMapper;
@Value("${rtsp.server:http://127.0.0.1:7788}")
private String rtspServer;
@@ -107,48 +112,73 @@
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
- .select(WorkOrder::getId, WorkOrder::getSerialNumber, WorkOrder::getStatus, WorkOrder::getErrorType)
+ .select(WorkOrder::getId, WorkOrder::getSerialNumber, WorkOrder::getStatus, WorkOrder::getWorkOrderNo)
.in(WorkOrder::getSerialNumber, serialNumberList)
.ne(WorkOrder::getStatus, WorkOrderStatusEnum.AUDITING_SUCCESS)
.list();
Map<String, WorkOrder> mapping = inDatabaseWorkOrderList.stream().collect((Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder)));
List<WorkOrder> waitAddList = new ArrayList<>(48);
+ List<WorkOrderErrorType> waitAddErrorTypeList = new ArrayList<>(48);
Integer updateNum = 0;
-
+ Date now = new Date();
+ // 鍥犳晠闅滅被鍨嬩笉涓�鑷磋�岃鏇存柊鐘舵�佺殑宸ュ崟
+ List<WorkOrder> willUpdateStatusWorkOrderList = new ArrayList<>(48);
+ // 鏇存敼宸ュ崟绫诲瀷鑰岃澧炲姞鐨勭郴缁熻繍缁村鐞嗕俊鎭�
+ List<WorkOrderYwConditionRecord> willAddMsg = new ArrayList<>(48);
+ // 鍗冲皢瑕佹坊鍔犵殑閿欒绫诲瀷
+ List<WorkOrderErrorType> willAddErrorType = new ArrayList<>(96);
for (WorkOrder workOrder : workOrderList) {
WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
if (Objects.nonNull(databaseWorkOrder)) {
- String errorType = databaseWorkOrder.getErrorType();
- if (workOrder.getErrorType().equals(errorType)) {
+ List<String> errorNameList = workOrderErrorTypeService.getBaseMapper().getNotFinishWorkOrderErrors(workOrder.getWorkOrderNo());
+ List<String> errorTypes = workOrder.getErrorTypeList();
+ if (errorNameList.containsAll(errorTypes)) {
// 濡傛灉锛屽浗鏍囩爜銆佹晠闅滅被鍨嬮兘涓�鏍凤紝鍒欒烦杩囦笉澶勭悊
continue;
} else {
- // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨洿鏂伴敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
- errorType = errorType + "," + workOrder.getErrorType();
- databaseWorkOrder.setErrorType(errorType);
+ for (String errorType : errorTypes) {
+ if (! errorNameList.contains(errorType)) {
+ // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨柊澧炰竴涓敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
+ WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
+ workOrderErrorType.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
+ workOrderErrorType.setCreateTime(now);
+ workOrderErrorType.setUpdateTime(now);
+ workOrderErrorType.setErrorName(errorType);
+ willAddErrorType.add(workOrderErrorType);
+ }
+ }
databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
- Date now = new Date();
databaseWorkOrder.setUpdateTime(now);
- baseMapper.updateById(databaseWorkOrder);
+ willUpdateStatusWorkOrderList.add(databaseWorkOrder);
updateNum++;
// 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣
WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();
- ywRecord.setWorkOrderId(databaseWorkOrder.getId());
+ ywRecord.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
ywRecord.setCommitUser(1);
ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
ywRecord.setCreateTime(new Date());
- workOrderYwConditionRecordMapper.insert(ywRecord);
+ ywRecord.setSysMsg(Boolean.TRUE);
+ willAddMsg.add(ywRecord);
}
} else {
workOrder.setCreateTime(new Date());
workOrder.setUpdateTime(new Date());
- // 濡傛灉鎶ュ杩囷紝浣跨敤鏈�鏂版姤澶囩殑閿欒绫诲瀷
- Report report = reportMapper.checkPointReported(workOrder.getSerialNumber());
- if (Objects.nonNull(report)) {
- workOrder.setErrorType(report.getErrorType());
- }
+// // 濡傛灉鎶ュ杩囷紝浣跨敤鏈�鏂版姤澶囩殑閿欒绫诲瀷
+// Report report = reportMapper.checkPointReported(workOrder.getSerialNumber());
+// if (Objects.nonNull(report)) {
+// workOrder.setErrorType(report.getErrorType());
+// }
waitAddList.add(workOrder);
}
+ }
+ if (willAddErrorType.size() > 0) {
+ workOrderErrorTypeService.getBaseMapper().addMany(willAddErrorType);
+ }
+ if (willAddMsg.size() > 0) {
+ workOrderYwConditionRecordMapper.insertMany(willAddMsg);
+ }
+ if (willUpdateStatusWorkOrderList.size() > 0) {
+ this.baseMapper.updateMany(willUpdateStatusWorkOrderList);
}
if (CollectionUtils.isEmpty(waitAddList)) {
return Boolean.TRUE;
@@ -170,32 +200,50 @@
notAddList.add(workOrder);
continue;
}
- workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
- workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
+ workOrder.setWorkOrderNo(IdUtils.randomNO());
+ if (Objects.nonNull(point.getUnitId())) {
+ workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
+ }
if (point.getImportantTag() || point.getImportantCommandImageTag()) {
workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue()));
} else {
workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
+ }
+ // 淇濆瓨閿欒绫诲瀷
+ for (String errorType : workOrder.getErrorTypeList()) {
+ WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
+ workOrderErrorType.setWorkOrderNo(workOrder.getWorkOrderNo());
+ workOrderErrorType.setCreateTime(now);
+ workOrderErrorType.setUpdateTime(now);
+ workOrderErrorType.setErrorName(errorType);
+ waitAddErrorTypeList.add(workOrderErrorType);
}
}
waitAddList.removeAll(notAddList);
if (CollectionUtils.isEmpty(waitAddList)) {
return Boolean.TRUE;
}
- this.saveBatch(waitAddList);
+ // 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
+ baseMapper.addMany(waitAddList);
+ if (! CollectionUtils.isEmpty(waitAddErrorTypeList)) {
+ workOrderErrorTypeService.getBaseMapper().addMany(waitAddErrorTypeList);
+ }
// 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) {
+ ArrayList<String> list = new ArrayList<>();
List<WorkOrderDistributeRecord> distributedRecordList = waitAddList.stream().map(item -> {
+ list.add(item.getSerialNumber());
WorkOrderDistributeRecord workOrderDistributeRecord = new WorkOrderDistributeRecord();
- workOrderDistributeRecord.setWorkOrderId(item.getId());
+ workOrderDistributeRecord.setWorkOrderNo(item.getWorkOrderNo());
workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
workOrderDistributeRecord.setUserId(1L);
- Date now = new Date();
workOrderDistributeRecord.setCreateTime(now);
workOrderDistributeRecord.setUpdateTime(now);
return workOrderDistributeRecord;
}).collect(Collectors.toList());
workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
+ // 鍚屾鐐逛綅鐘舵��
+ ywPointService.updateRecovery(list, 1);
}
log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
return Boolean.TRUE;
@@ -209,15 +257,15 @@
@Override
public Result add(WorkOrderForm form) {
WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
- entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+ entity.setWorkOrderNo(IdUtils.randomNO());
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
- entity.setErrorType(form.getErrorType().stream().map(ErrorTypeEnum::getValue).collect(Collectors.joining(",")));
- List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType.getValue())).toList();
- workOrderErrorTypeMapper.insertWorkOrderErrorTypeList(workOrderErrorTypes);
+ entity.setErrorType(String.join(",", form.getErrorType()));
+ List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
+ workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -253,7 +301,7 @@
baseMapper.updateById(workOrder);
// 娣诲姞涓�鏉″鏍歌褰�
WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
- workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
+ workOrderAuditingRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
workOrderAuditingRecord.setRemark(form.getAuditingRemark());
@@ -267,7 +315,7 @@
notifyService.save(notify);
// 鍚屾鐐逛綅鐘舵��
if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
- ywPointService.updateRecovery(Arrays.asList(workOrder.getSerialNumber()), 0);
+ ywPointService.updateRecovery(Collections.singletonList(workOrder.getSerialNumber()), 0);
}
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -279,22 +327,23 @@
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
.in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())
.in(WorkOrder::getErrorType, form.getErrorTypes())
- .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo)
+ .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo, WorkOrder::getSerialNumber)
.list();
if (list.isEmpty()) {
return Result.error("娌℃湁宸ュ崟鍙互瀹℃牳");
}
- List<Integer> ids = list.stream().map(WorkOrder::getId).collect(Collectors.toList());
+ List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).collect(Collectors.toList());
+ List<String> serialNumbers = list.stream().map(WorkOrder::getSerialNumber).toList();
// 宸ュ崟鐘舵��
LambdaUpdateWrapper<WorkOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- lambdaUpdateWrapper.in(WorkOrder::getId, ids);
+ lambdaUpdateWrapper.in(WorkOrder::getWorkOrderNo, workOrderNoList);
lambdaUpdateWrapper.set(WorkOrder::getStatus, form.getAuditingResult());
baseMapper.update(lambdaUpdateWrapper);
// 娣诲姞澶氭潯瀹℃牳璁板綍
List<WorkOrderAuditingRecord> workOrderAuditingRecords = new ArrayList<>();
- for (Integer id : ids) {
+ for (String workOrderNo : workOrderNoList) {
WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
- workOrderAuditingRecord.setWorkOrderId(id);
+ workOrderAuditingRecord.setWorkOrderNo(workOrderNo);
workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
workOrderAuditingRecord.setRemark(form.getAuditingRemark());
@@ -310,6 +359,10 @@
UrgentLevelEnum.WARNING,
workOrder.getWorkOrderNo());
notifies.add(notify);
+ }
+ // 鍚屾鐐逛綅鐘舵��
+ if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
+ ywPointService.updateRecovery(serialNumbers, 0);
}
notifyService.saveBatch(notifies);
return Result.ok("鎿嶄綔鎴愬姛");
@@ -328,7 +381,7 @@
baseMapper.updateById(workOrder);
// 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
- workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());
+ workOrderYwConditionRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
@@ -338,8 +391,8 @@
}
@Override
- public Result selectYwConditionByYwId(Integer id) {
- List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+ public Result selectYwConditionByYwId(String workOrderNo) {
+ List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
ywConditionList.stream().forEach(item -> {
if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
item.setCommitUserName("绯荤粺娑堟伅");
@@ -349,10 +402,10 @@
}
@Override
- public Result selectYwAuditingListByYwId(String id) {
+ public Result selectYwAuditingListByYwId(String workOrderNo) {
return Result.ok().data(
new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
- .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+ .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
.orderByAsc(WorkOrderAuditingRecord::getCreateTime)
.list());
}
@@ -402,6 +455,13 @@
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.page(page, query);
+ if (! CollectionUtils.isEmpty(page.getRecords())) {
+ page.getRecords().stream().forEach(item -> {
+ if (StringUtils.hasText(item.getErrorType())) {
+ item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ }
+ });
+ }
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -435,7 +495,7 @@
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
- .select(WorkOrder::getSerialNumber, WorkOrder::getSerialNumber)
+ .select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
.eq(WorkOrder::getErrorType, data.getErrorType())
@@ -443,20 +503,20 @@
.orderByDesc(WorkOrder::getCreateTime)
.last("limit " + data.getFastNumLimit())
.list();
- List<Integer> ids = list.stream().map(WorkOrder::getId).toList();
+ List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).toList();
List<String> serialNumberList = list.stream().map(WorkOrder::getSerialNumber).toList();
- if (ids.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
+ if (workOrderNoList.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
try {
new LambdaUpdateChainWrapper<>(baseMapper)
.set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
- .in(WorkOrder::getId, ids)
+ .in(WorkOrder::getWorkOrderNo, workOrderNoList)
.update();
- addDistributeRecord(ids, WorkOrderDistributeWayEnum.FAST_DISTRIBUTE);
+ addDistributeRecord(workOrderNoList, WorkOrderDistributeWayEnum.FAST_DISTRIBUTE);
// 鍚屾鐐逛綅鐘舵��
ywPointService.updateRecovery(serialNumberList, 1);
- return Result.ok("鎴愬姛涓嬪彂" + ids.size() + "鏉″伐鍗�");
+ return Result.ok("鎴愬姛涓嬪彂" + workOrderNoList.size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
} finally {
@@ -470,27 +530,27 @@
WorkOrderDistributeWayEnum distributeWayEnum = WorkOrderDistributeWayEnum.SELECTED_DISTRIBUTE;
if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
try {
- if (query.getIds().isEmpty()) {
- query.setIds(new LambdaQueryChainWrapper<>(baseMapper)
+ if (query.getWorkOrderNOList().isEmpty()) {
+ query.setWorkOrderNOList(new LambdaQueryChainWrapper<>(baseMapper)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(query.getUnitId()), WorkOrder::getUnitId, query.getUnitId())
- .select(WorkOrder::getId)
+ .select(WorkOrder::getWorkOrderNo)
.list()
.stream()
- .map(WorkOrder::getId)
+ .map(WorkOrder::getWorkOrderNo)
.collect(Collectors.toList()));
distributeWayEnum = WorkOrderDistributeWayEnum.ALL_DISTRIBUTE;
}
- if (query.getIds().isEmpty()) { return Result.error("娌℃湁宸ュ崟寰呬笅鍙�"); }
+ if (query.getWorkOrderNOList().isEmpty()) { return Result.error("娌℃湁宸ュ崟寰呬笅鍙�"); }
new LambdaUpdateChainWrapper<>(baseMapper)
.set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
- .in(WorkOrder::getId, query.getIds())
+ .in(WorkOrder::getWorkOrderNo, query.getWorkOrderNOList())
.update();
- addDistributeRecord(query.getIds(), distributeWayEnum);
+ addDistributeRecord(query.getWorkOrderNOList(), distributeWayEnum);
// 鍚屾鐐逛綅鐘舵��
- List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getSerialNumber).toList();
+ List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getWorkOrderNo, query.getWorkOrderNOList()).list().stream().map(WorkOrder::getSerialNumber).toList();
ywPointService.updateRecovery(serialNumberList, 1);
- return Result.ok("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
+ return Result.ok("鎴愬姛涓嬪彂" + query.getWorkOrderNOList().size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
} finally {
@@ -520,13 +580,13 @@
/**
* 娣诲姞宸ュ崟涓嬪彂璁板綍
- * @param ids 宸ュ崟id
+ * @param workOrderNoList 宸ュ崟id
*/
- private void addDistributeRecord(List<Integer> ids, WorkOrderDistributeWayEnum distributeWay) {
+ private void addDistributeRecord(List<String> workOrderNoList, WorkOrderDistributeWayEnum distributeWay) {
LoginUser loginUser = SecurityUtils.getLoginUser();
workOrderDistributeRecordMapper.insertBatch(
- ids.stream()
- .map(id -> new WorkOrderDistributeRecord(id, loginUser.getUserId(), distributeWay))
+ workOrderNoList.stream()
+ .map(no -> new WorkOrderDistributeRecord(no, loginUser.getUserId(), distributeWay))
.toList()
);
}
@@ -645,6 +705,6 @@
public void updateImgById(Integer workOrderId, String imgPath) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(WorkOrder::getId, workOrderId)
- .set(WorkOrder::getYwCheckCondition, imgPath);
+ .set(WorkOrder::getYwCheckResult, imgPath);
}
}
--
Gitblit v1.8.0