From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java
index 320fd9b..db22ce8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.ProjectType;
import zy.cloud.wms.manager.service.ProjectTypeService;
import com.core.annotations.ManagerAuth;
@@ -107,7 +108,7 @@
for (ProjectType projectType : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", projectType.getId());
- map.put("value", projectType.getId());
+ map.put("value", projectType.getTypeName());
result.add(map);
}
return R.ok(result);
@@ -123,4 +124,22 @@
return R.ok();
}
+ /**
+ * 杩斿洖缁欏墠绔偣鍑讳笅鎷夋鐨勬暟鎹�
+ * @return
+ */
+ @RequestMapping("/type/auth")
+ public R getProjectType(){
+ List<ProjectType> projectTypes = projectTypeService.selectList(null);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProjectType projectType : projectTypes) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",projectType.getId());
+ content.put("value",projectType.getTypeName());
+ result.add(content);
+ }
+
+
+ return R.ok(result);
+ }
}
--
Gitblit v1.9.1