From 0581d9986b4d14cdf8a6f66a929674224dd45b2f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 11 一月 2024 09:34:15 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml | 3 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 2 +-
12 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index ba3283b..44d0d99 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -308,6 +308,7 @@
dailyMaintenanceOrder.setConfirmStatus("0");//绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�
dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�
dailyMaintenanceOrder.setStoveExemptStatus("0");//鐐夌被璁惧璞佸厤20椤圭姸鎬侊紙0鏈‘璁わ紝1缁翠慨瀹や富浠伙紝2淇濆吇浜哄憳锛�3浠〃宸ワ級
+ dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮�
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index d002a74..1776799 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -231,7 +231,7 @@
dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime());
dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime());
- dailyMaintenanceOrder.setStatus(CommonConstant.STATUS_1);
+ dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮�
dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId());
dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2);
List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index c516266..1a0d577 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -117,7 +117,7 @@
LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("1");
- equipmentReportRepair.setType("1");
+// equipmentReportRepair.setType("1");
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepairService.save(equipmentReportRepair);
String IS_PRODUCT_YES = "yes";
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 1c9c10d..15fe908 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -187,6 +187,7 @@
}
inspectionOrder.setInspectionDeadline(date);
inspectionOrder.setInspectionStandardType("1");
+ inspectionOrder.setStatus("3");//3:鏈紑濮�
inspectionOrderService.save(inspectionOrder);
String equipmentId = inspectionOrder.getEquipmentId();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
index 7065b79..b629944 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
@@ -85,7 +85,7 @@
/**鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級*/
@Excel(name = "鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級")
- private String status = CommonConstant.STATUS_1;
+ private String status;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index 75abb77..fa7d21e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -152,7 +152,7 @@
/**
* qsw 2023-12-29
*/
- @ApiModelProperty(value = "绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�")
+ @ApiModelProperty(value = "绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�3涓诲姩缁翠慨锛�")
private String type;
/*********************************************** 鎵� 灞� 瀛� 娈� ********************************************************/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java
index d27ebc5..25e96e5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java
@@ -143,7 +143,7 @@
/**鐘舵��*/
@Excel(name = "鐘舵��", width = 15)
@ApiModelProperty(value = "鐘舵��")
- private String status = DailyInspectionOrder.STATUS_1;
+ private String status;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
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 cb7a65a..3ab9a47 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
@@ -132,6 +132,7 @@
inspectionOrder.setInspectionStandardType("1");
inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
inspectionOrder.setTeamId(inspectionCycle.getTeamId());
+ inspectionOrder.setStatus("3");
inspectionOrderService.save(inspectionOrder);
Equipment equipment = equipmentService.getById(inspectionCycle.getEquipmentId());
@@ -198,6 +199,7 @@
inspectionOrder.setInspectionStandardType("1");
inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId());
inspectionOrder.setTeamId(inspectionCycle.getTeamId());
+ inspectionOrder.setStatus("3");
inspectionOrderService.save(inspectionOrder);
//淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java
index 7e6ba2e..1027e07 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java
@@ -14,6 +14,6 @@
* @Version: V1.0
*/
public interface StreamMapper extends BaseMapper<Stream> {
- List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId);
+ List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId,@Param("num") String num);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 7620836..2fc793d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -14,6 +14,7 @@
t1.is_stop isStop,
t1.approval approval,
t1.fault_time faultTime,
+ t1.type,
t1.source source,
t1.source_id sourceId,
t1.urgency urgency,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
index 5a63a2b..53b58ee 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
@@ -6,6 +6,9 @@
from mom_eam_stream t1
left join sys_user t2 on t2.id = t1.create_by
where 1=1
+ <if test="num != null and num != ''">
+ and t1.num like concat('%',#{num},'%')
+ </if>
<choose>
<when test="areaId != null and areaId != ''">
and t2.area_id = #{areaId}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java
index 60227ee..ba5c029 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java
@@ -49,7 +49,7 @@
@Override
public Page<Stream> myPage(Page<Stream> page, Stream stream) {
- return page.setRecords(baseMapper.myPage(page,stream.getAreaId()));
+ return page.setRecords(baseMapper.myPage(page,stream.getAreaId(),stream.getNum()));
}
--
Gitblit v1.9.3