From 9b3d5e47568ac430a7a544297cfa7d1a77186e86 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期五, 31 十二月 2021 17:34:20 +0800
Subject: [PATCH] 配置工具修改
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java | 22 +++++++++++++---------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java | 11 +++++++----
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/DevEquipmentBo.java | 6 +++++-
3 files changed, 25 insertions(+), 14 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 4555176..e7c9614 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
@@ -11,12 +11,10 @@
import com.ruoyi.common.enums.LogType;
import com.ruoyi.oa.domain.BsSchool;
import com.ruoyi.oa.domain.DevBatch;
+import com.ruoyi.oa.domain.DevManufacturer;
import com.ruoyi.oa.domain.DevPeripheralUnit;
import com.ruoyi.oa.domain.bo.DevEquipmentBo;
-import com.ruoyi.oa.service.IBsSchoolService;
-import com.ruoyi.oa.service.IDevBatchService;
-import com.ruoyi.oa.service.IDevEquipmentService;
-import com.ruoyi.oa.service.IDevPeripheralUnitService;
+import com.ruoyi.oa.service.*;
import com.ruoyi.system.service.ISysDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,6 +50,8 @@
private final IDevEquipmentService iDevEquipmentService;
+ private final IDevManufacturerService iDevManufacturerService;
+
/**
* 鍩虹淇℃伅
*/
@@ -70,6 +70,8 @@
List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107"));
// 澶栬鍗曞厓
List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
+ //澶栬鍘傚晢
+ List<DevManufacturer> peripheralFirm = iDevManufacturerService.list(new QueryWrapper<DevManufacturer>());
// 鎵规
List<DevBatch> batch = iDevBatchService.list(new QueryWrapper<DevBatch>());
// 楂樻牎
@@ -80,6 +82,7 @@
map.put("DICT103", dict3);
map.put("DICT107", dict7);
map.put("peripheralUnit", peripheralUnit);
+ map.put("peripheralFirm", peripheralFirm);
map.put("batch", batch);
map.put("school", school);
return AjaxResult.success(map);
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/DevEquipmentBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/DevEquipmentBo.java
index 921f156..57ed96d 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/DevEquipmentBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/DevEquipmentBo.java
@@ -120,5 +120,9 @@
*/
@ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
private String isAsc;
-
+ /**
+ * 鏄惁娉ㄥ唽
+ */
+ @ApiModelProperty(value = "register")
+ private boolean register;
}
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 5133b28..740091a 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
@@ -129,15 +129,19 @@
}
// 璁惧涓嶅瓨鍦ㄥ垯鏂板缓
else {
- // 鍏堟牴鎹簭鍒楃爜鐢熸垚搴忓垪鍙�
- DevEquipmentCode c = new DevEquipmentCode();
- c.setCreateTime(DateUtils.getNowDate());
- devEquipmentCodeMapper.insert(c);
- // 娣诲姞璁惧
- DevEquipment add = BeanUtil.toBean(bo, DevEquipment.class);
- add.setSerialNumber(c.getId());
- baseMapper.insert(add);
- return add;
+ if(bo.isRegister()) {
+ // 鍏堟牴鎹簭鍒楃爜鐢熸垚搴忓垪鍙�
+ DevEquipmentCode c = new DevEquipmentCode();
+ c.setCreateTime(DateUtils.getNowDate());
+ devEquipmentCodeMapper.insert(c);
+ // 娣诲姞璁惧
+ DevEquipment add = BeanUtil.toBean(bo, DevEquipment.class);
+ add.setSerialNumber(c.getId());
+ baseMapper.insert(add);
+ return add;
+ }else{
+ return po;
+ }
}
}
--
Gitblit v1.9.1