From 4fc7f3a0b9d0f2b385e87fb2ee27cbeafcc35ea5 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期四, 18 八月 2022 14:16:00 +0800
Subject: [PATCH] 配置工具修改
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java | 8 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java | 3 +++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
index bd43a9e..75e4266 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
@@ -68,6 +68,8 @@
List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103").orderByAsc(SysDictData::getDictSort));
// 閲囬泦鍛ㄦ湡
List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
+ //鍦ㄧ敤鐘舵��
+ List<SysDictData> dict4 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT104").orderByAsc(SysDictData::getDictSort));
// 澶栬鍗曞厓
List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
//澶栬鍘傚晢
@@ -80,6 +82,7 @@
map.put("DICT101", dict1);
map.put("DICT102", dict2);
map.put("DICT103", dict3);
+ map.put("DICT104", dict4);
map.put("DICT107", dict7);
map.put("peripheralUnit", peripheralUnit);
map.put("peripheralFirm", peripheralFirm);
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
index dd8ce44..e8d3e67 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java
@@ -189,6 +189,10 @@
if(StringUtils.isNotBlank(bo.getEdition())){
po.setEdition(bo.getEdition());
}
+ if(StringUtils.isNotBlank(bo.getUseStatus()))
+ {
+ po.setUseStatus(bo.getUseStatus());
+ }
// if (StringUtils.isEmpty(bo.getNetworkId())) {
// po.setNetworkId(bo.getNetworkId());
// }
@@ -218,6 +222,10 @@
if (StringUtils.isNotBlank(bo.getRemarks())) {
po.setRemarks(bo.getRemarks());
}
+ if(StringUtils.isNotBlank(bo.getUseStatus()))
+ {
+ po.setUseStatus(bo.getUseStatus());
+ }
baseMapper.updateById(po);
}
}
--
Gitblit v1.9.1