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 | 341 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 311 insertions(+), 30 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 ff87920..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
@@ -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.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -14,33 +15,39 @@
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
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.*;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.vo.RepairmanRankingVO;
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;
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.vo.UserSelector;
+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;
@@ -48,6 +55,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 缁翠慨宸ュ崟
@@ -82,31 +90,97 @@
private IFlowTaskService flowTaskService;
@Resource
- private ISysUserService sysUserService;
+ private IEamEquipmentExtendService eamEquipmentExtendService;
@Resource
- private IEamEquipmentExtendService eamEquipmentExtendService;
+ private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+
+ @Resource
+ private ISysUserService sysUserService;
+
+ @Value("${wechatEnterprise.cardActionUrl}")
+ private String cardActionUrl;
/**
* 鍒嗛〉鍒楄〃
*
* @param page
- * @param eamRepairOrderQuery
+ * @param query
* @return
*/
@Override
- public IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrderQuery eamRepairOrderQuery) {
+ public IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, EamRepairOrderQuery query) {
+// //鐢ㄦ埛鏁版嵁鏉冮檺
+// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+// if (sysUser == null) {
+// return page;
+// }
+// List<String> equipmentIds = new ArrayList<>();
+// if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+// //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+// equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
+// }
+// return this.baseMapper.pageList(page, eamRepairOrderQuery, sysUser.getId(), equipmentIds);
+ QueryWrapper<EamRepairOrder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
return page;
}
- List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
}
- return this.baseMapper.pageList(page, eamRepairOrderQuery, sysUser.getId(), equipmentIds);
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentCode())) {
+ queryWrapper.like("e.equipment_code", query.getEquipmentCode());
+ }
+ if (StringUtils.isNotBlank(query.getEquipmentName())) {
+ queryWrapper.like("e.equipment_name", query.getEquipmentName());
+ }
+ if (StringUtils.isNotBlank(query.getRepairStatus())) {
+ queryWrapper.eq("wmo.repair_status", query.getRepairStatus());
+ }
+ if (StringUtils.isNotBlank(query.getRepairer())) {
+ queryWrapper.like("wmo.repairer", query.getRepairer());
+ }
+ if (StringUtils.isNotBlank(query.getRepairCode())) {
+ queryWrapper.like("wmo.repair_code", query.getRepairCode());
+ }
+ if (StringUtils.isNotBlank(query.getSparePartDescription())) {
+ queryWrapper.like("wmo.spare_part_description", query.getSparePartDescription());
+ }
+// if(query.getStartTime() != null && query.getEndTime() != null) {
+// queryWrapper.between("wmo.fault_start_time", query.getStartTime(), query.getEndTime());
+// }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return baseMapper.queryPageList(page, queryWrapper);
}
@Override
@@ -121,11 +195,11 @@
eamRepairOrder.setActualStartTime(DateUtils.getNow());
eamRepairOrder.setIsUseSpare(0);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- eamRepairOrder.setRepairer(user.getRealname());
+ eamRepairOrder.setRepairer(user.getUsername());
super.save(eamRepairOrder);
EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
// 鍚姩缁翠慨娴佺▼
- flowCommonService.initActBusiness("缁翠慨宸ュ崟鍙凤細" + codeSeq + ", 璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + "寮�濮嬬淮淇�",
+ flowCommonService.initActBusiness("宸ュ崟鍙凤細" + codeSeq + ", 璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + ";瀹夎浣嶇疆: " + eamEquipment.getInstallationPosition(),
eamRepairOrder.getId(),
"IEamRepairOrderService",
"eam_repair",
@@ -146,7 +220,176 @@
eamReportRepairService.updateById(eamReportRepair);
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+ sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
}
+ }
+
+ /**
+ * 鎸囨淳
+ * @param eamReportRepairQuery
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void assign(EamReportRepairQuery eamReportRepairQuery) {
+ EamRepairOrder eamRepairOrder = new EamRepairOrder();
+ 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());
+ eamRepairOrder.setActualStartTime(DateUtils.getNow());
+ eamRepairOrder.setIsUseSpare(0);
+ eamRepairOrder.setRepairer(eamReportRepairQuery.getRepairer());
+ super.save(eamRepairOrder);
+ EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
+ // 鍚姩缁翠慨娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + codeSeq + ";璁惧缂栧彿: " + eamEquipment.getEquipmentCode() + ";瀹夎浣嶇疆: " + eamEquipment.getInstallationPosition(),
+ eamRepairOrder.getId(),
+ "IEamRepairOrderService",
+ "eam_repair",
+ null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", eamRepairOrder.getId());
+ variables.put("organization", "缁翠慨宸ュ崟鍚姩娴佺▼");
+ variables.put("comment", "缁翠慨宸ュ崟鍚姩娴佺▼");
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
+ usernames.add(eamReportRepairQuery.getRepairer());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("eam_repair", variables);
+ if (!result.isSuccess()) {
+ super.removeById(eamRepairOrder);
+ } else {
+ eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ 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
+ public List<RepairmanRankingVO> repairmanRanking(String start, String end) {
+ return this.baseMapper.repairmanRanking(start, end);
}
/**
@@ -160,6 +403,7 @@
@EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.REPAIRED, businessTable = "eam_repair_order")
public EamRepairOrder perform(EamRepairOrderRequest request) {
EamRepairOrder eamRepairOrder = this.baseMapper.selectById(request.getId());
+ EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
if (eamRepairOrder == null) {
throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
}
@@ -187,7 +431,7 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
}
- ReportRepairEnum status = ReportRepairEnum.getInstance(request.getRepairStatus());
+ ReportRepairEnum status = ReportRepairEnum.getInstance(eamRepairOrder.getRepairStatus());
if (status == null) {
return null;
}
@@ -196,30 +440,59 @@
switch (status) {
case UNDER_REPAIR:
//缁翠慨涓細涓嬩竴姝� 鍒ゆ柇鏄惁闇�瑕佸浠�, 闇�瑕佸浠惰浆璁惧绠＄悊鍛橀鐢ㄥ浠�, 涓嶉渶瑕佸垯杞埌璁惧鎶ヤ慨鍛樼‘璁ょ淮淇畬鎴�
- if (request.getStatus() == 1) {
+ if (request.getIsUseSpare() == 1) {
// 闇�瑕�
- List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
- if (CollectionUtil.isEmpty(userSelectors)) {
+ if (StringUtils.isBlank(equipment.getEquipmentManager())) {
throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
- values.put("dataId", eamRepairOrder.getId());
- values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- values.put("NextAssignee", userSelectors);
- values.put("status", 1);
- request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
- eamRepairOrder.setIsUseSpare(1);
+ if (StringUtils.isBlank(eamRepairOrder.getSparePartDescription())) {
+ values.put("dataId", eamRepairOrder.getId());
+ values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ //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());
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_SPARES.name());
+ eamRepairOrder.setIsUseSpare(1);
+ } else {
+ values.put("dataId", eamRepairOrder.getId());
+ values.put("organization", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
+ values.put("comment", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
+ values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
+ request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_CONFIRM.name());
+ eamRepairOrder.setFaultReason(request.getFaultReason());
+ eamRepairOrder.setRepairDescription(request.getRepairDescription());
+ // 澶勭悊闄勪欢
+ if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
+ List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+ eamRepairOrder.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ //鏇存柊璁惧缁翠慨鐘舵��
+ eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.WAIT_CONFIRM.name());
+ }
} else {
// 涓嶉渶瑕�
- EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
values.put("comment", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
- values.put("NextAssignee", eamReportRepair.getCreateBy());
+ values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_CONFIRM.name());
eamRepairOrder.setFaultReason(request.getFaultReason());
eamRepairOrder.setRepairDescription(request.getRepairDescription());
eamRepairOrder.setIsUseSpare(0);
@@ -243,22 +516,23 @@
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
values.put("comment", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
- values.put("NextAssignee", eamRepairOrder.getRepairer());
+ values.put("NextAssignee", Arrays.asList(eamRepairOrder.getRepairer().split(",")));
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
eamRepairOrder.setSparePartDescription(request.getSparePartDescription());
break;
case WAIT_CONFIRM:
// 寰呯‘璁�, 缁翠慨鍛樼淮淇畬鎴愶紝鎶ヤ慨浜虹‘璁ょ粨鏉熸祦绋�
- EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
values.put("dataId", eamRepairOrder.getId());
values.put("organization", "缁翠慨宸ュ崟娴佺▼缁撴潫");
values.put("comment", "缁翠慨宸ュ崟娴佺▼缁撴潫");
- values.put("NextAssignee", eamReportRepair.getCreateBy());
+ values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.COMPLETE.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.COMPLETE.name());
eamRepairOrder.setActualEndTime(new Date());
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.NORMAL.name());
@@ -273,6 +547,12 @@
}
//淇濆瓨宸ュ崟
this.baseMapper.updateById(eamRepairOrder);
+ // 鍚屾鏇存柊鎶ヤ慨琛ㄧ姸鎬�
+ eamReportRepairService.updateById(eamReportRepair);
+ if (!ReportRepairEnum.COMPLETE.name().equals(eamRepairOrder.getRepairStatus())) {
+ //鎺ㄩ�佷紒涓氬井淇℃秷鎭紙娴佺▼瀹岀粨涓嶅彂閫佹秷鎭級
+ sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
+ }
return eamRepairOrder;
}
@@ -285,6 +565,7 @@
BeanUtils.copyProperties(eamReportRepair, eamRepairOrderResponse);
eamRepairOrderResponse.setReportImageFiles(eamReportRepair.getImageFiles());
eamRepairOrderResponse.setImageFiles(eamRepairOrder.getImageFiles());
+ eamRepairOrderResponse.setReporter(eamReportRepair.getCreateBy());
return eamRepairOrderResponse;
}
--
Gitblit v1.9.3