From 58020f3d711d4baa16ef092c2ea826071c7d23b9 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 16 七月 2025 18:26:35 +0800
Subject: [PATCH] 消息推送定时任务逻辑调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java | 76 ++++++++++--------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 5 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml | 7 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java | 83 +++++++++++---------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 6 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 5 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java | 2
12 files changed, 123 insertions(+), 74 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 2d79320..d6116cd 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -143,4 +143,7 @@
@ApiModelProperty(value = "瀹夎浣嶇疆")
@TableField(exist = false)
private String installationPosition;
+ @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+ @TableField(exist = false)
+ private java.lang.String orgId;
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 6365bb4..15935ff 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -155,4 +155,7 @@
@ApiModelProperty(value = "瀹夎浣嶇疆")
@TableField(exist = false)
private String installationPosition;
+ @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+ @TableField(exist = false)
+ private java.lang.String orgId;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java
index 66b4f5e..419bdb4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java
@@ -9,6 +9,7 @@
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.mdc.service.IMdcProductionEquipmentService;
import org.jeecg.modules.mdc.util.ThrowableUtil;
import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecg.modules.quartz.entity.SysQuartzLog;
@@ -16,9 +17,11 @@
import org.jeecg.modules.quartz.service.ISysQuartzLogService;
import org.jeecg.modules.qywx.message.vo.TemplateCard;
import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
+import org.jeecg.modules.system.entity.MdcProductionEquipment;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
+import org.jeecg.modules.system.vo.UserSelector;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -28,6 +31,8 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -63,49 +68,49 @@
}
long startTime = System.currentTimeMillis();
try {
- //鏌ヨ鎵�鏈夊緟鐐规鐨勫伐鍗�
- List<EamInspectionOrder> waitOrderList = eamInspectionOrderService.list(new LambdaQueryWrapper<EamInspectionOrder>()
- .eq(EamInspectionOrder::getInspectionStatus, InspectionStatus.WAIT_INSPECTION.name())
- .eq(EamInspectionOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
- if (!waitOrderList.isEmpty()) {
+ //鏌ヨ鎵�鏈夋湭棰嗗彇寰呯偣妫�鐨勫伐鍗�
+ List<EamInspectionOrder> unReceivedOrderList = eamInspectionOrderService.selectUnReceivedInspectionOrder();
+ if (!unReceivedOrderList.isEmpty()) {
//鏈夊緟鐐规宸ュ崟锛屾帹閫佷紒涓氬井淇℃秷鎭�
- //鏌ヨ鎵�鏈夋搷浣滃伐
- List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getPost, BusinessCodeConst.PCR0001)
- .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0)
- .eq(SysUser::getStatus, CommonConstant.USER_UNFREEZE));
- if (userList.isEmpty()) {
- log.error("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
- quartzLog.setIsSuccess(0);
- quartzLog.setParams("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
- } else {
- TemplateCard templateCard = new TemplateCard();
- String toUsers = userList.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
- String touser = wechatEnterpriseService.getTouser(toUsers, false);
- templateCard.setTouser(touser);
- TemplateCardEntity templateCardEntity = new TemplateCardEntity();
- templateCard.setTemplate_card(templateCardEntity);
- templateCardEntity.setTask_id(waitOrderList.get(0).getId());
- TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
- mainTitle.setTitle("璁惧鐐规");
- templateCardEntity.setMain_title(mainTitle);
- templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栫偣妫�宸ュ崟锛岃杩涘叆绯荤粺棰嗗彇");
- TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
- cardAction.setType(1);
- cardAction.setUrl(cardActionUrl);
- templateCardEntity.setCard_action(cardAction);
- JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
- Integer errcode = (Integer) jsonObject.get("errcode");
- if (errcode == 0) {
- log.info("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
- quartzLog.setIsSuccess(0);
- quartzLog.setParams(jsonObject.toJSONString());
+ Map<String, List<EamInspectionOrder>> unReceivedOrderMap = unReceivedOrderList.stream()
+ .collect(Collectors.groupingBy(EamInspectionOrder::getOrgId));
+ StringBuilder message = new StringBuilder();
+ for (String orgId : unReceivedOrderMap.keySet()) {
+ //鏌ヨ璇ヤ骇绾夸笅鐨勬墍鏈夋搷浣滃伐
+ List<UserSelector> userSelectorList = sysUserService.selectOperatorList(null, orgId, BusinessCodeConst.PCR0001);
+ if (userSelectorList.isEmpty()) {
+ log.error("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+ message.append("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�").append("\n");
} else {
- log.error("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
- quartzLog.setIsSuccess(-1);
- quartzLog.setExceptionDetail(jsonObject.toJSONString());
+ String toUsers = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.joining(","));
+ String touser = wechatEnterpriseService.getTouser(toUsers, false);
+ //鏋勯�犳秷鎭綋鍐呭
+ TemplateCard templateCard = new TemplateCard();
+ templateCard.setTouser(touser);
+ TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+ templateCard.setTemplate_card(templateCardEntity);
+ templateCardEntity.setTask_id(UUID.randomUUID().toString().replaceAll("-", ""));
+ TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+ mainTitle.setTitle("璁惧鐐规");
+ templateCardEntity.setMain_title(mainTitle);
+ templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栫偣妫�宸ュ崟锛岃杩涘叆绯荤粺棰嗗彇");
+ TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+ cardAction.setType(1);
+ cardAction.setUrl(cardActionUrl);
+ templateCardEntity.setCard_action(cardAction);
+ JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
+ Integer errcode = (Integer) jsonObject.get("errcode");
+ if (errcode == 0) {
+ log.info("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
+ message.append("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛�").append(jsonObject.toJSONString()).append("\n");
+ } else {
+ log.error("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
+ message.append("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛�").append(jsonObject.toJSONString()).append("\n");
+ }
}
}
+ quartzLog.setIsSuccess(0);
+ quartzLog.setExceptionDetail(message.toString());
} else {
log.info("鏃犲緟棰嗗彇鐐规宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
quartzLog.setIsSuccess(0);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java
index c654ffc..0eac778 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java
@@ -19,6 +19,7 @@
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
+import org.jeecg.modules.system.vo.UserSelector;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -28,6 +29,8 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -67,45 +70,48 @@
List<EamWeekMaintenanceOrder> waitOrderList = eamWeekMaintenanceOrderService.list(new LambdaQueryWrapper<EamWeekMaintenanceOrder>()
.eq(EamWeekMaintenanceOrder::getMaintenanceStatus, WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name())
.eq(EamWeekMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
- if (!waitOrderList.isEmpty()) {
+ List<EamWeekMaintenanceOrder> unReceivedOrderList = eamWeekMaintenanceOrderService.selectUnReceivedMaintenanceOrder();
+ if (!unReceivedOrderList.isEmpty()) {
//鏈夊緟淇濆吇鐨勫伐鍗曪紝鎺ㄩ�佷紒涓氬井淇℃秷鎭�
- //鏌ヨ鎵�鏈夋搷浣滃伐
- List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
- .eq(SysUser::getPost, BusinessCodeConst.PCR0001)
- .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0)
- .eq(SysUser::getStatus, CommonConstant.USER_UNFREEZE));
- if (userList.isEmpty()) {
- log.error("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
- quartzLog.setIsSuccess(0);
- quartzLog.setParams("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
- } else {
- TemplateCard templateCard = new TemplateCard();
- String toUsers = userList.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
- String touser = wechatEnterpriseService.getTouser(toUsers, false);
- templateCard.setTouser(touser);
- TemplateCardEntity templateCardEntity = new TemplateCardEntity();
- templateCard.setTemplate_card(templateCardEntity);
- templateCardEntity.setTask_id(waitOrderList.get(0).getId());
- TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
- mainTitle.setTitle("璁惧鍛ㄤ繚");
- templateCardEntity.setMain_title(mainTitle);
- templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栧懆淇濆伐鍗曪紝璇疯繘鍏ョ郴缁熼鍙�");
- TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
- cardAction.setType(1);
- cardAction.setUrl(cardActionUrl);
- templateCardEntity.setCard_action(cardAction);
- JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
- Integer errcode = (Integer) jsonObject.get("errcode");
- if (errcode == 0) {
- log.info("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
- quartzLog.setIsSuccess(0);
- quartzLog.setParams(jsonObject.toJSONString());
+ Map<String, List<EamWeekMaintenanceOrder>> unReceivedOrderMap = unReceivedOrderList.stream()
+ .collect(Collectors.groupingBy(EamWeekMaintenanceOrder::getOrgId));
+ StringBuilder message = new StringBuilder();
+ for (String orgId : unReceivedOrderMap.keySet()) {
+ //鏌ヨ璇ヤ骇绾夸笅鐨勬墍鏈夋搷浣滃伐
+ List<UserSelector> userSelectorList = sysUserService.selectOperatorList(null, orgId, BusinessCodeConst.PCR0001);
+ if (userSelectorList.isEmpty()) {
+ log.error("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+ message.append("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�").append("\n");
} else {
- log.error("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
- quartzLog.setIsSuccess(-1);
- quartzLog.setExceptionDetail(jsonObject.toJSONString());
+ String toUsers = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.joining(","));
+ String touser = wechatEnterpriseService.getTouser(toUsers, false);
+ //鏋勯�犳秷鎭綋鍐呭
+ TemplateCard templateCard = new TemplateCard();
+ templateCard.setTouser(touser);
+ TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+ templateCard.setTemplate_card(templateCardEntity);
+ templateCardEntity.setTask_id(UUID.randomUUID().toString().replaceAll("-", ""));
+ TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+ mainTitle.setTitle("璁惧鍛ㄤ繚");
+ templateCardEntity.setMain_title(mainTitle);
+ templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栧懆淇濆伐鍗曪紝璇疯繘鍏ョ郴缁熼鍙�");
+ TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+ cardAction.setType(1);
+ cardAction.setUrl(cardActionUrl);
+ templateCardEntity.setCard_action(cardAction);
+ JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
+ Integer errcode = (Integer) jsonObject.get("errcode");
+ if (errcode == 0) {
+ log.info("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
+ message.append("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛�").append(jsonObject.toJSONString()).append("\n");
+ } else {
+ log.error("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
+ message.append("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛�").append(jsonObject.toJSONString()).append("\n");
+ }
}
}
+ quartzLog.setIsSuccess(0);
+ quartzLog.setExceptionDetail(message.toString());
} else {
log.info("鏃犲緟棰嗗彇鍛ㄤ繚宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
quartzLog.setIsSuccess(0);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java
index 3c346e0..ce9aefc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java
@@ -36,4 +36,6 @@
* @return
*/
List<EquipmentInspectionStatistics> equipmentInspectionStatistics(@Param("productionIds") List<String> productionIds, @Param("start") String start, @Param("end") String end);
+
+ List<EamInspectionOrder> selectUnReceivedInspectionOrder();
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java
index 3580713..ad6af7d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java
@@ -34,4 +34,6 @@
* @return
*/
List<EquipmentMaintenanceStatistics> equipmentMaintenanceStatistics(@Param("productionIds") List<String> productionIds, @Param("start") String start, @Param("end") String end);
+
+ List<EamWeekMaintenanceOrder> selectUnReceivedMaintenanceOrder();
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index 18a5e0b..ba9d2e6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -29,4 +29,10 @@
and err.inspection_date < #{end}
group by FORMAT(err.inspection_date, 'yyyy-MM')
</select>
+ <select id="selectUnReceivedInspectionOrder" resultType="org.jeecg.modules.eam.entity.EamInspectionOrder">
+ select eio.*,ee.org_id
+ from eam_inspection_order eio
+ left join eam_equipment ee on eio.equipment_id = ee.id
+ where eio.inspection_status = 'WAIT_INSPECTION' and eio.del_flag = 0
+ </select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml
index a6ac183..4a34bb6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml
@@ -29,4 +29,11 @@
and err.maintenance_date < #{end}
group by FORMAT(err.maintenance_date, 'yyyy-MM')
</select>
+ <select id="selectUnReceivedMaintenanceOrder"
+ resultType="org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder">
+ select ewm.*,ee.org_id
+ from eam_week_maintenance_order ewm
+ left join eam_equipment ee on ewm.equipment_id = ee.id
+ where ewm.maintenance_status = 'WAIT_MAINTENANCE' and ewm.del_flag = 0
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index 6146862..2f55c89 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -93,4 +93,7 @@
* @return
*/
List<EquipmentInspectionStatistics> equipmentInspectionStatistics(String productionId, LocalDate firstOfMonth, LocalDate today);
+
+ /** 鏌ヨ鎵�鏈夋湭棰嗗彇锛堝緟鐐规鐘舵�侊級鐨勫伐鍗曪紙鍏宠仈鏌ヨ璁惧鎵�灞炰骇绾匡級 */
+ List<EamInspectionOrder> selectUnReceivedInspectionOrder();
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
index 0ea10d1..20e3bc8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
@@ -70,4 +70,6 @@
* @return
*/
List<EquipmentMaintenanceStatistics> equipmentMaintenanceStatistics(String productionId, LocalDate firstOfMonth, LocalDate today);
+
+ List<EamWeekMaintenanceOrder> selectUnReceivedMaintenanceOrder();
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index ef5d3ea..c962434 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -195,6 +195,11 @@
}
@Override
+ public List<EamInspectionOrder> selectUnReceivedInspectionOrder() {
+ return this.baseMapper.selectUnReceivedInspectionOrder();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
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 c846542..4bc6c16 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
@@ -711,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