From 1800c05a61a53d528e4f137fa42413cb0bf26734 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 16:21:15 +0800
Subject: [PATCH] art: 设备管理-周保工单-自动生成周保，周保过期未保养标记过期
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index b5396f5..3b16ddb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -367,6 +368,9 @@
}
break;
case WAIT_CONFIRM:
+ if(StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
//鐝粍闀跨‘璁�
userApprovalList = new ArrayList<>();
userApprovalList.add(equipment.getEquipmentManager());
@@ -381,6 +385,7 @@
entity.setConfirmUser(user.getUsername());
entity.setConfirmComment(request.getConfirmComment());
entity.setConfirmTime(new Date());
+ entity.setConfirmDealType(request.getConfirmDealType());
if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
//椹冲洖
userApprovalList = new ArrayList<>();
@@ -397,7 +402,7 @@
case WAIT_INITIAL_ACCEPTANCE:
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0005);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁捐兘閮ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("dataId", entity.getId());
@@ -457,6 +462,18 @@
return true;
}
+ @Override
+ public List<EamWeekMaintenanceOrder> selectUnCompleteOrder(String expiredDate) {
+ LambdaQueryWrapper<EamWeekMaintenanceOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.lt(EamWeekMaintenanceOrder::getMaintenanceDate, expiredDate);
+ List<String> unCompleteStatus = new ArrayList<>();
+ unCompleteStatus.add(WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ unCompleteStatus.add(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ queryWrapper.in(EamWeekMaintenanceOrder::getMaintenanceStatus, unCompleteStatus);
+ queryWrapper.orderByAsc(EamWeekMaintenanceOrder::getMaintenanceDate);
+ return eamWeekMaintenanceOrderMapper.selectList(queryWrapper);
+ }
+
private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
return todoUsers != null && todoUsers.contains(user.getUsername());
--
Gitblit v1.9.3