From 6a3591c42a84b36d24d75f4584f0eeb145bb4de7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:00:24 +0800
Subject: [PATCH] xg
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkOrderServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkOrderServiceImpl.java
index d2ca4c5..628a225 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkOrderServiceImpl.java
@@ -11,6 +11,7 @@
import org.jeecg.modules.eam.mapper.SpecialtyMaintenanceOrderMapper;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,11 +22,13 @@
@Service
public class PredictiveWorkOrderServiceImpl extends ServiceImpl<PredictiveWorkOrderMapper, PredictiveWorkOrder> implements IPredictiveWorkOrderService {
+ @Autowired
+ @Lazy
+ private IdentityService sysIdentityService;
@Override
- public IPage<Map<String, Object>> pageOrderList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
- IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- return super.getBaseMapper().pageOrderList(pageData, params) ;
+ public IPage<PredictiveWorkOrder> pageOrderList(Page<PredictiveWorkOrder> page, PredictiveWorkOrder predictiveWorkOrder) {
+ return page.setRecords(baseMapper.pageList(page,predictiveWorkOrder.getNum(),predictiveWorkOrder.getStatus(),predictiveWorkOrder.getEquipmentNum(),predictiveWorkOrder.getEquipmentName()));
}
// @Autowired
@@ -42,8 +45,7 @@
//
@Override
public boolean add(PredictiveWorkOrder predictiveWorkOrder) {
- String predictiveWorkOrderStr = super.getBaseMapper().getOrderNum("PredictiveWorkOrder") ;
- String num = "YCWH" + DateUtils.date2Str(DateUtils.yyyyMMdd.get()) + predictiveWorkOrderStr;
+ String num = sysIdentityService.getNumByTypeAndLength("PredictiveWorkOrder",4);
predictiveWorkOrder.setNum(num);
predictiveWorkOrder.setCreateType("2");
return super.save(predictiveWorkOrder);
@@ -158,14 +160,14 @@
// return true;
// }
-// @Override
-// public boolean assign(SpecialtyMaintenanceOrder specialtyMaintenanceOrder) {
-// specialtyMaintenanceOrder.setStatus("3");
-// boolean b1 = super.updateById(specialtyMaintenanceOrder);
-// if(!b1){
-// return false;
-// }
-// return true;
-// }
+ @Override
+ public boolean assign(PredictiveWorkOrder predictiveWorkOrder) {
+ predictiveWorkOrder.setStatus("3");
+ boolean b1 = super.updateById(predictiveWorkOrder);
+ if(!b1){
+ return false;
+ }
+ return true;
+ }
}
--
Gitblit v1.9.3