From 0b552dd61546bb5e577d9adb35b09046ebf64341 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 29 八月 2023 09:38:39 +0800
Subject: [PATCH] 设备管理 设备保养 bug修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml | 6 +++---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 5 ++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java
index 5da4254..3934591 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceCycleController.java
@@ -128,7 +128,7 @@
*/
@PostMapping(value = "/addNew")
public Result<String> addNew(@RequestBody MaintenanceCycle maintenanceCycle) {
- String cycleUnit = sysBaseApi.queryDictTextByKey("cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
+ String cycleUnit = sysBaseApi.queryDictTextByKey("maintenance_cycle_unit", String.valueOf(maintenanceCycle.getCycleUnit()));
maintenanceCycle.setName(String.valueOf(maintenanceCycle.getCycle()).concat(cycleUnit));
maintenanceCycleService.save(maintenanceCycle);
return Result.OK("娣诲姞鎴愬姛锛�");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml
index 595b950..0651743 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.eam.mapper.SpecialtyMaintenanceOrderMapper">
<select id="getSpecialtyMaintenanceOrderList" parameterType="Map" resultType="Map">
- SELECT
+ SELECT DISTINCT
t1.id,
t1.num,
t1.status,
@@ -39,8 +39,8 @@
LEFT JOIN mom_eam_maintenance_type t9 ON t9.id = t2.maintenance_type_id
left join sys_user t10 on t1.recipient_user_id = t10.id
left join sys_user t12 on t1.maintenance_user_id = t12.id
- left join (select * from mom_eam_specialty_maintenance_order_detail where del_flag = 0) t13 on t13.specialty_maintenance_order_id = t1.id
- left join (select * from mom_eam_maintenance_project where del_flag = 0) t14 on t14.id = t13.maintenance_project_id
+-- left join (select * from mom_eam_specialty_maintenance_order_detail where del_flag = 0) t13 on t13.specialty_maintenance_order_id = t1.id
+-- left join (select * from mom_eam_maintenance_project where del_flag = 0) t14 on t14.id = t13.maintenance_project_id
WHERE t1.del_flag = 0 and t2.del_flag = 0 and t8.del_flag = 0 and t9.del_flag = 0
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index 79de6f4..9892504 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -1384,7 +1384,10 @@
@Override
public String getUnitNameById(String unitId) {
Unit unit = unitService.getById(unitId);
- String unitName = unit.getName();
+ String unitName = "";
+ if(unit != null){
+ unitName = unit.getName();
+ }
return unitName;
}
--
Gitblit v1.9.3