From 2196ba833d88c32dd0e26b526928d313cfea0d80 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 12 八月 2025 19:23:25 +0800
Subject: [PATCH] update
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index fd1686d..a1e1fd8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -25,9 +26,11 @@
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse;
import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.vo.EamThirdMaintenanceBaseVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -38,6 +41,7 @@
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
+import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.BeanUtils;
@@ -46,6 +50,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -90,6 +95,8 @@
private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;
@Resource
private IEamThirdMaintenanceSpareService eamThirdMaintenanceSpareService;
+ @Resource
+ private ISysDictService sysDictService;
@Override
public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
@@ -341,6 +348,7 @@
/**
* 鏌ヨ涓変繚宸ュ崟鍩烘湰淇℃伅
+ *
* @param id
* @return
*/
@@ -371,6 +379,68 @@
return update > 0;
}
+ @Override
+ public List<EamThirdMaintenanceOrder> selectWaitMaintenanceOrderList() {
+ LambdaQueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamThirdMaintenanceOrder::getMaintenanceStatus, ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ queryWrapper.isNotNull(EamThirdMaintenanceOrder::getFreezeOrderDate);
+ queryWrapper.eq(EamThirdMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+ LocalDate localDate = LocalDate.now();
+ queryWrapper.lt(EamThirdMaintenanceOrder::getFreezeOrderDate, localDate.toString());
+ return this.getBaseMapper().selectList(queryWrapper);
+ }
+
+ @Override
+ public List<EamThirdMaintenanceOrder> selectUnCompletedThirdMaintenanceOrderList() {
+ LambdaQueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> statusList = Arrays.asList(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name(),
+ ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name(),
+ ThirdMaintenanceStatusEnum.WAIT_CHECK.name(),
+ ThirdMaintenanceStatusEnum.UNDER_FIRST_ACCEPTANCE.name(),
+ ThirdMaintenanceStatusEnum.UNDER_SECOND_ACCEPTANCE.name(),
+ ThirdMaintenanceStatusEnum.OPERATOR_SIGNATURE.name(),
+ ThirdMaintenanceStatusEnum.REPAIRMAN_SIGNATURE.name(),
+ ThirdMaintenanceStatusEnum.REPAIR_MANAGER_SIGNATURE.name(),
+ ThirdMaintenanceStatusEnum.INSPECTOR_SIGNATURE.name(),
+ ThirdMaintenanceStatusEnum.FREEZE.name()
+ );
+ queryWrapper.in(EamThirdMaintenanceOrder::getMaintenanceStatus, statusList);
+ queryWrapper.isNotNull(EamThirdMaintenanceOrder::getOrderExpirationDate);
+ queryWrapper.eq(EamThirdMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+ LocalDate localDate = LocalDate.now();
+ queryWrapper.lt(EamThirdMaintenanceOrder::getOrderExpirationDate, localDate.toString());
+ return this.getBaseMapper().selectList(queryWrapper);
+ }
+
+ /**
+ * 鑾峰彇宸ュ崟鍩烘湰淇℃伅
+ *
+ * @param id 宸ュ崟id
+ * @return
+ */
+ @Override
+ public JSONObject exportThirdMaintenanceOrderBaseInfo(String id) {
+ // 鍒涘缓缁撴灉瀵硅薄
+ JSONObject result = new JSONObject();
+ EamThirdMaintenanceBaseResponse eamThirdMaintenanceBaseResponse = eamThirdMaintenanceOrderMapper.findThirdMaintenanceBaseInfo(id);
+ if (eamThirdMaintenanceBaseResponse == null) {
+ return result;
+ }
+ eamThirdMaintenanceBaseResponse.setOperatorSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getOperatorSignature()) + "," + eamThirdMaintenanceBaseResponse.getAssistantOperator());
+ eamThirdMaintenanceBaseResponse.setRepairmanSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getRepairmanSignature()) + "," + eamThirdMaintenanceBaseResponse.getAssistantRepairman());
+ eamThirdMaintenanceBaseResponse.setRepairManagerSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getRepairManagerSignature()));
+ eamThirdMaintenanceBaseResponse.setInspectorSignature(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamThirdMaintenanceBaseResponse.getInspectorSignature()));
+ eamThirdMaintenanceBaseResponse.setEquipmentCategory(sysDictService.queryDictTextByKey("equipment_category", eamThirdMaintenanceBaseResponse.getEquipmentCategory()));
+ //妫�鏌ヤ汉鍜屾鏌ユ椂闂�
+ EamThirdMaintenanceBaseVo vo = eamThirdMaintenanceOrderDetailService.selectCreatByAndTimeByOrderId(id);
+ if (vo != null) {
+ eamThirdMaintenanceBaseResponse.setCreateBy(sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", vo.getOperateBy()));
+ eamThirdMaintenanceBaseResponse.setCreateTime(vo.getOperateTime());
+ }
+ result.put("data",Collections.singletonList(eamThirdMaintenanceBaseResponse));
+ return result;
+ }
+
/**
* 璁剧疆娴佺▼鍙橀噺
*/
--
Gitblit v1.9.3