From 68e22957db996437fa20a9a4aa5ff37c54d4056f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:25 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 67e7547..f6b223a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -14,6 +14,7 @@
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.pojo.vo.allocation.AllocationVo;
+import com.moral.api.utils.BeanConverts;
import com.moral.constant.PageResult;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -175,6 +176,7 @@
* @return
*/
@GetMapping("selectUnitView")
+ @ApiOperation("������������")
public ResultMessage selectUnitView(HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
Map<String, Object> map1 = allocationService.selectUnitView(params);
@@ -186,15 +188,7 @@
public void unitExel(HttpServletResponse response,HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
//������������
- Map<String, Object> map1 = allocationService.selectUnitView(params);
- List<AllocationUnitViewDto> unitView = (List<AllocationUnitViewDto>) map1.get("unitView");
-
-
- ArrayList<Map<String, Object>> mapArrayList = new ArrayList<>();
- for (AllocationUnitViewDto allocationUnitViewDto : unitView) {
- Map<String, Object> map = entityToMap(allocationUnitViewDto);
- mapArrayList.add(map);
- }
+ List<Map<String, Object>> mapArrayList = allocationService.unitExel(params);
if (CollectionUtils.isEmpty(mapArrayList)) {
return;
}
@@ -218,22 +212,4 @@
}
}
- /**
- ������������Map
- */
- public static Map<String, Object> entityToMap(Object object) {
- Map<String, Object> map = new HashMap<>();
- for (Field field : object.getClass().getDeclaredFields()) {
- try {
- boolean flag = field.isAccessible();
- field.setAccessible(true);
- Object o = field.get(object);
- map.put(field.getName(), o);
- field.setAccessible(flag);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return map;
- }
}
--
Gitblit v1.8.0