From 41e8084ef826dc8d98d4d25bf891965ce2af3ad3 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 18 五月 2022 14:56:38 +0800
Subject: [PATCH] 提交代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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..bd43a9e 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;
+
/**
* 鍩虹淇℃伅
*/
@@ -61,15 +61,17 @@
public AjaxResult externaList() {
// 鏅烘帶璁惧绫诲瀷
- List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101"));
+ List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101").orderByAsc(SysDictData::getDictSort));
// 尾缃戠粶宸ヤ綔棰戞
- List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102"));
+ List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102").orderByAsc(SysDictData::getDictSort));
// 涓插彛閫氫俊娉㈢壒鐜�
- List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103"));
+ 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"));
+ List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
// 澶栬鍗曞厓
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);
--
Gitblit v1.9.1