From 0972f16bb4354539f782d9f91db83bd9f3b87471 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:33:34 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 63 +++----------------------------
1 files changed, 7 insertions(+), 56 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..2704560 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,9 +14,11 @@
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;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.Field;
@@ -61,16 +63,6 @@
}
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
- })
- @RequestMapping(value = "unit", method = RequestMethod.GET)
- public ResultMessage unit() {
- List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
- return ResultMessage.ok(responsibilityUnits);
- }
-
/**
* ���������������
* @return
@@ -83,15 +75,7 @@
}
- /**
- * ���������������
- * @return
- */
- /* @GetMapping("check")
- public ResultMessage check(Integer id){
- allocationService.check(id);
- return ResultMessage.ok();
- }*/
+
/**
* ������������
@@ -120,15 +104,7 @@
allocationService.checkAllocation(checkCond);
return ResultMessage.ok();
}
- /**
- * ������������������
- * @return
- */
- @GetMapping("selectAll")
- public ResultMessage selectAll(Map<String,Object> map){
- allocationService.selectAll(map);
- return ResultMessage.ok();
- }
+
@PostMapping("/page")
@ApiOperation("������")
@@ -175,10 +151,11 @@
* @return
*/
@GetMapping("selectUnitView")
+ @ApiOperation("������������")
public ResultMessage selectUnitView(HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
Map<String, Object> map1 = allocationService.selectUnitView(params);
- return ResultMessage.ok(map1);
+ return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
}
@@ -186,15 +163,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 +187,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