From 8918b2f8444db69be6887c9a0959d13e164bbddb Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 14:29:32 +0800
Subject: [PATCH] 设备二保定时服务开发，填充车间二保计划数据，三不放过批量导出接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index f7ae1c9..423acba 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -9,7 +9,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.Q;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
@@ -19,6 +19,7 @@
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
@@ -51,6 +52,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -62,12 +64,12 @@
* @Version: V1.0
*/
@Service("IEamSecondMaintenanceOrderService")
+@Slf4j
public class EamSecondMaintenanceOrderServiceImpl extends ServiceImpl<EamSecondMaintenanceOrderMapper, EamSecondMaintenanceOrder> implements IEamSecondMaintenanceOrderService, FlowCallBackServiceI {
@Resource
private EamSecondMaintenanceOrderMapper eamSecondMaintenanceOrderMapper;
@Autowired
private IEamSecondMaintenanceOrderDetailService secondMaintenanceOrderDetailService;
-
@Autowired
private FlowCommonService flowCommonService;
@Autowired
@@ -98,6 +100,10 @@
private BaseFactoryMapper baseFactoryMapper;
@Autowired
private IEamSecondMaintenanceOrderDetailService eamSecondMaintenanceOrderDetailService;
+ @Autowired
+ private EamSecondMaintenanceOrderAsyncService eamSecondMaintenanceOrderAsyncService;
+ @Autowired
+ private IEamFactorySecondMaintPlanService factorySecondMaintPlanService;
@Override
public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) {
@@ -341,6 +347,11 @@
});
secondMaintenanceOrderDetailService.saveBatch(requestTableDetailList);
}
+ // 鎻掑叆棣栭〉浜屼繚鍏昏鍒�
+ // 浣跨敤 SimpleDateFormat 鐩存帴鏍煎紡鍖栦负鈥測yyy骞碝M鏈堚�濇牸寮�
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈�");
+ String formattedDate = sdf.format(order.getMaintenanceDate());
+ factorySecondMaintPlanService.add(order.getEquipmentId(), formattedDate);
return true;
}
@@ -358,9 +369,14 @@
if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
}
+ // 缂栬緫棣栭〉浜屼繚鍏昏鍒�
+ // 浣跨敤 SimpleDateFormat 鐩存帴鏍煎紡鍖栦负鈥測yyy骞碝M鏈堚�濇牸寮�
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈�");
+ String oldFormattedDate = sdf.format(entity.getMaintenanceDate());
+ String newFormattedDate = sdf.format(request.getMaintenanceDate());
+ factorySecondMaintPlanService.dateChange(entity.getEquipmentId(), oldFormattedDate,newFormattedDate);
entity.setMaintenanceDate(request.getMaintenanceDate());
entity.setRemark(request.getRemark());
-
eamSecondMaintenanceOrderMapper.updateById(entity);
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(entity.getOperator())) {
@@ -390,7 +406,6 @@
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
return result.isSuccess();
}
-
}
return true;
}
@@ -666,6 +681,15 @@
}
//淇濆瓨宸ュ崟
eamSecondMaintenanceOrderMapper.updateById(entity);
+ //寮傛鐢熸垚涓嬫浜屼繚宸ュ崟
+ if (SecondMaintenanceStatusEnum.COMPLETE.name().equals(entity.getMaintenanceStatus())) {
+ try {
+ eamSecondMaintenanceOrderAsyncService.asyncGenerateNextMaintenanceOrder(entity.getId());
+ } catch (Exception e) {
+ log.error("瑙﹀彂寮傛鐢熸垚涓嬫宸ュ崟澶辫触锛屽伐鍗旾D: {}", entity.getId(), e);
+ }
+ }
+
return entity;
}
@@ -678,6 +702,7 @@
public List<EamSecondMaintenanceOrderExport> export(String ids){
QueryWrapper<EamSecondMaintenanceOrderExport> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("wmo.del_flag",CommonConstant.DEL_FLAG_0.toString());
+ queryWrapper.eq("wmo.maintenance_status",SecondMaintenanceStatusEnum.COMPLETE.name());
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
--
Gitblit v1.9.3