From 7fbb8dedb1112e1d87b8ccfb8d9df9bb763ec024 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 22 七月 2025 17:48:17 +0800
Subject: [PATCH] 点检、周保执行中设备异常报修消息推送
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 bb05add..d4b6af2 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
@@ -47,6 +47,7 @@
import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -93,6 +94,9 @@
private IMdcProductionService mdcProductionService;
@Autowired
private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+
+ @Value("${wechatEnterprise.cardActionUrl}")
+ private String cardActionUrl;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -491,7 +495,7 @@
TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
cardAction.setType(1);
- cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+ cardAction.setUrl(cardActionUrl);
templateCardEntity.setCard_action(cardAction);
wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
@@ -577,7 +581,7 @@
}
//鐝粍闀跨‘璁�
userApprovalList = new ArrayList<>();
- userApprovalList.add(equipment.getEquipmentManager());
+ userApprovalList.add(equipment.getEquipmentManager().substring(2));//璁惧鍙拌处琛ㄧ淮鎶ょ殑璁惧绠＄悊鍛樺伐鍙锋槸甯� WK鍓嶇紑鐨�
values.put("dataId", entity.getId());
values.put("organization", request.getConfirmComment());
values.put("comment", request.getConfirmComment());
@@ -707,6 +711,11 @@
return list;
}
+ @Override
+ public List<EamWeekMaintenanceOrder> selectUnReceivedMaintenanceOrder() {
+ return this.baseMapper.selectUnReceivedMaintenanceOrder();
+ }
+
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