From d52343fb31a1cad2fb58c53be10cab15fc843e5f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 22 七月 2025 14:58:46 +0800
Subject: [PATCH] 处理设备维修指派时工单未关联报修记录问题
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 148 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 9f28cc2..5bbc1af 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -25,10 +25,7 @@
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.mapper.EamRepairOrderMapper;
-import org.jeecg.modules.eam.request.EamRepairOrderQuery;
-import org.jeecg.modules.eam.request.EamRepairOrderRequest;
-import org.jeecg.modules.eam.request.EamRepairOrderResponse;
-import org.jeecg.modules.eam.request.EamReportRepairQuery;
+import org.jeecg.modules.eam.request.*;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
@@ -38,11 +35,19 @@
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.qywx.message.vo.TemplateCard;
+import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,6 +55,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 缁翠慨宸ュ崟
@@ -85,6 +91,15 @@
@Resource
private IEamEquipmentExtendService eamEquipmentExtendService;
+
+ @Resource
+ private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+
+ @Resource
+ private ISysUserService sysUserService;
+
+ @Value("${wechatEnterprise.cardActionUrl}")
+ private String cardActionUrl;
/**
* 鍒嗛〉鍒楄〃
@@ -205,6 +220,8 @@
eamReportRepairService.updateById(eamReportRepair);
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
}
}
@@ -219,6 +236,7 @@
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
eamRepairOrder.setRepairCode(codeSeq);
EamReportRepair eamReportRepair = eamReportRepairService.getById(eamReportRepairQuery.getId());
+ eamRepairOrder.setReportId(eamReportRepairQuery.getId());
eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -249,7 +267,124 @@
eamReportRepairService.updateById(eamReportRepair);
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamRepairOrder, null, null);
}
+ }
+
+ private void sendQywxTemplateCardMessage(EamRepairOrder eamRepairOrder, EamReportRepair reportRepair, EamRepairOrderRequest request) {
+ TemplateCard templateCard = new TemplateCard();
+ String repairStatus = eamRepairOrder.getRepairStatus();
+ EamEquipment equipment = eamEquipmentService.getById(eamRepairOrder.getEquipmentId());
+ eamRepairOrder.setEquipmentCode(equipment.getEquipmentCode());
+ if (ReportRepairEnum.UNDER_REPAIR.name().equals(repairStatus)) {
+ //宸ュ崟宸叉寚娲撅紝鎺ㄩ�佹秷鎭粰缁翠慨宸�
+ String repairer = eamRepairOrder.getRepairer();
+ String touser = wechatEnterpriseService.getTouser(repairer, false);
+ templateCard.setTouser(touser);
+ }
+ if (ReportRepairEnum.WAIT_SPARES.name().equals(repairStatus)) {
+ //宸ュ崟杩涘叆绛夊緟澶囦欢鐘舵�侊紝鎺ㄩ�佹秷鎭粰璁惧绠＄悊鍛�
+ List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
+ String nextAssigneeStr = nextAssignee.stream()
+ .filter(Objects::nonNull) // 鍙�夛細杩囨护 null 鍊�
+ .collect(Collectors.joining(","));
+ String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
+ templateCard.setTouser(touser);
+ }
+ if (ReportRepairEnum.WAIT_CONFIRM.name().equals(repairStatus)) {
+ //宸ュ崟杩涘叆寰呯‘璁ょ姸鎬侊紝鎺ㄩ�佹秷鎭粰鎶ヤ慨鍛�
+ String touser = wechatEnterpriseService.getTouser(reportRepair.getCreateBy(), false);
+ templateCard.setTouser(touser);
+ }
+
+ TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+ templateCard.setTemplate_card(templateCardEntity);
+ templateCardEntity.setTask_id(eamRepairOrder.getId());
+ TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+ mainTitle.setTitle("璁惧缁翠慨");
+ templateCardEntity.setMain_title(mainTitle);
+
+ if (ReportRepairEnum.UNDER_REPAIR.name().equals(repairStatus)) {
+ if (Objects.isNull(reportRepair) && Objects.isNull(request)) {
+ templateCardEntity.setSub_title_text("鏀跺埌鎸囨淳宸ュ崟: " + eamRepairOrder.getRepairCode() + " 璇峰紑濮嬭繘琛岀淮淇�");
+ } else if (Objects.isNull(request)) {
+ templateCardEntity.setSub_title_text("宸查鍙栫淮淇伐鍗�: " + eamRepairOrder.getRepairCode() + " 寮�濮嬭繘琛岀淮淇�");
+ }
+ else {
+ templateCardEntity.setSub_title_text("缁翠慨宸ュ崟: " + eamRepairOrder.getRepairCode() + " 澶囦欢宸插埌浣嶏紝璇风户缁繘琛岀淮淇�");
+ }
+ }
+ if (ReportRepairEnum.WAIT_SPARES.name().equals(repairStatus)) {
+ templateCardEntity.setSub_title_text("缁翠慨宸ュ崟: " + eamRepairOrder.getRepairCode() + " 闇�瑕侀鐢ㄥ浠�");
+ }
+ if (ReportRepairEnum.WAIT_CONFIRM.name().equals(repairStatus)) {
+ templateCardEntity.setSub_title_text("宸ュ崟: " + eamRepairOrder.getRepairCode() + " 宸插畬鎴愯澶囩淮淇紝璇疯繘鍏ョ郴缁熺‘璁�");
+ }
+
+ List<TemplateCardEntity.HorizontalContent> horizontalContentList = CollectionUtil.newArrayList();
+ TemplateCardEntity.HorizontalContent content1 = new TemplateCardEntity.HorizontalContent();
+ content1.setKeyname("宸ュ崟鍙�");
+ content1.setValue(eamRepairOrder.getRepairCode());
+ horizontalContentList.add(content1);
+ TemplateCardEntity.HorizontalContent content2 = new TemplateCardEntity.HorizontalContent();
+ content2.setKeyname("璁惧缂栧彿");
+ content2.setValue(eamRepairOrder.getEquipmentCode());
+ horizontalContentList.add(content2);
+
+ //濡傛灉宸ュ崟鐘舵�佷负寰呯淮淇紙娌℃寚娲剧淮淇汉锛夛紝娴佺▼鏄病鏈夊惎鍔ㄧ殑锛屾棤娉曡幏鍙栬妭鐐逛俊鎭�
+ if (!ReportRepairEnum.WAIT_REPAIR.name().equals(repairStatus)) {
+ WorkTaskDataVo previousFlowInfo = flowTaskService.getPreviousFlowInfo(eamRepairOrder.getId());
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ content3.setKeyname("鍓嶉┍鑺傜偣");
+ content3.setValue(previousFlowInfo.getPreNode());
+ horizontalContentList.add(content3);
+ TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
+ content4.setKeyname("褰撳墠鑺傜偣");
+ if (InspectionStatus.COMPLETE.name().equals(repairStatus)) {
+ content4.setValue("宸插畬鎴�");
+ } else {
+ content4.setValue(previousFlowInfo.getName());
+ }
+ horizontalContentList.add(content4);
+ }
+
+ if (ReportRepairEnum.UNDER_REPAIR.name().equals(repairStatus)) {
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ SysUser sysUser = sysUserService.getUserByName(eamRepairOrder.getRepairer());
+ if (Objects.isNull(reportRepair) && Objects.isNull(request)) {
+ content3.setKeyname("鎸囨淳浜�");
+ SysUser assignUser = sysUserService.getUserByName(eamRepairOrder.getCreateBy());
+ content3.setValue(assignUser.getRealname());
+ horizontalContentList.add(content3);
+ } else if (Objects.isNull(request)) {
+ TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
+ content.setKeyname("棰嗗彇浜�");
+ content.setValue(sysUser.getRealname());
+ horizontalContentList.add(content);
+ } else {
+ content3.setKeyname("澶囦欢棰嗗彇浜�");
+ SysUser assignUser = sysUserService.getUserByName(request.getAssignee());
+ content3.setValue(assignUser.getRealname());
+ horizontalContentList.add(content3);
+ }
+ }
+ if (ReportRepairEnum.WAIT_SPARES.name().equals(repairStatus) || ReportRepairEnum.WAIT_CONFIRM.name().equals(repairStatus)) {
+ TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
+ content3.setKeyname("缁翠慨浜�");
+ SysUser repairUser = sysUserService.getUserByName(eamRepairOrder.getRepairer());
+ content3.setValue(repairUser.getRealname());
+ horizontalContentList.add(content3);
+ }
+
+ templateCardEntity.setHorizontal_content_list(horizontalContentList);
+
+ TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+ cardAction.setType(1);
+ cardAction.setUrl(cardActionUrl);
+ templateCardEntity.setCard_action(cardAction);
+
+ wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
}
@Override
@@ -314,7 +449,11 @@
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
+ //values.put("NextAssignee", equipment.getEquipmentManager().split(","));
+ //璁惧鍙拌处琛ㄧ淮鎶ょ殑璁惧绠＄悊鍛樺伐鍙锋槸甯� WK鍓嶇紑鐨�
+ values.put("NextAssignee", Arrays.stream(equipment.getEquipmentManager().split(","))
+ .map(s -> s.substring(2))
+ .collect(Collectors.toList()));
values.put("status", 1);
request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
@@ -410,6 +549,10 @@
this.baseMapper.updateById(eamRepairOrder);
// 鍚屾鏇存柊鎶ヤ慨琛ㄧ姸鎬�
eamReportRepairService.updateById(eamReportRepair);
+ if (!ReportRepairEnum.COMPLETE.name().equals(eamRepairOrder.getRepairStatus())) {
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭紙娴佺▼瀹岀粨涓嶅彂閫佹秷鎭級
+ sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
+ }
return eamRepairOrder;
}
--
Gitblit v1.9.3