From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java | 88 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java
index 57944ce..39175d6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java
@@ -35,6 +35,14 @@
private IInspectionOrderDetailService inspectionOrderDetailService;
@Autowired
private IDailyInspectionStandardDetailService dailyInspectionStandardDetailService;
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IDailyInspectionStandardService dailyInspectionStandardService;
+
+ @Autowired
+ private IInspectionProjectService inspectionProjectService;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -124,21 +132,65 @@
inspectionOrder.setInspectionStandardType("1");
inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
inspectionOrder.setTeamId(inspectionCycle.getTeamId());
+ inspectionOrder.setStatus("3");
inspectionOrderService.save(inspectionOrder);
- //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
- List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
- .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,inspectionOrder.getInspectionStandardId())
- .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()).list();
- for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
- InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
- inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
- inspectionOrderDetail.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId());
- inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
- inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
- inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
- inspectionOrderDetailService.save(inspectionOrderDetail);
+
+ Equipment equipment = equipmentService.getById(inspectionCycle.getEquipmentId());
+ String isLineEquip = equipment.getIsLineEquip();
+ if("no".equals(isLineEquip)){
+ //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
+ List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
+ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,inspectionOrder.getInspectionStandardId())
+ .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()).list();
+ for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
+ InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
+ inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
+ inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }else{
+ String lineId = equipment.getLineId();
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, lineId)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .eq(DailyInspectionStandard::getDelFlag, "0").list();
+ if(dailyInspectionStandards.size()>0){
+ DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
+ //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
+ List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
+ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId())
+ .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId())
+ .eq(DailyInspectionStandardDetail::getDelFlag,"0").list();
+ for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
+ InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
+ inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
+ inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }
}
- }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){
+
+
+// }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){
+ }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.MONDAY){
//淇濆瓨鐐规宸ュ崟涓昏〃鏁版嵁
InspectionOrder inspectionOrder = new InspectionOrder();
inspectionOrder.setNum(identityService.getNumByTypeAndLength("DailylnspectionOrder",4));
@@ -148,18 +200,26 @@
inspectionOrder.setInspectionStandardType("1");
inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
inspectionOrder.setTeamId(inspectionCycle.getTeamId());
+ inspectionOrder.setStatus("3");
inspectionOrderService.save(inspectionOrder);
//淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
.eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,inspectionOrder.getInspectionStandardId())
.eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()).list();
for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
- inspectionOrderDetail.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
inspectionOrderDetailService.save(inspectionOrderDetail);
}
}
--
Gitblit v1.9.3