From 8674cac4b660595c17f341eaaeb9dcad79f4979a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 07 Nov 2023 12:57:23 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/controller/AllocationController.java |   64 ++++++++------------------------
 1 files changed, 16 insertions(+), 48 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..92cb30c 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
@@ -12,16 +12,20 @@
 import com.moral.api.pojo.ext.allocation.AllocationPageExt;
 import com.moral.api.pojo.query.allocation.*;
 import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.vo.allocation.AllocationFindVo;
 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;
 import java.util.ArrayList;
-import java.util.HashMap;
+
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +40,9 @@
 import com.moral.api.utils.NoModelWriteData;
 import com.moral.constant.Constants;
 import com.moral.constant.ResultMessage;
+import com.moral.util.DateUtils;
 import com.moral.util.WebUtils;
+
 
 import javax.validation.Valid;
 
@@ -60,7 +66,6 @@
         return ResultMessage.ok(professions);
     }
 
-
     @ApiOperation(value = "������������", notes = "������������")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -70,6 +75,7 @@
         List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
         return ResultMessage.ok(responsibilityUnits);
     }
+
 
     /**
      * ���������������
@@ -83,15 +89,7 @@
     }
 
 
-    /**
-     * ���������������
-     * @return
-     */
-   /* @GetMapping("check")
-    public ResultMessage check(Integer id){
-        allocationService.check(id);
-        return ResultMessage.ok();
-    }*/
+
 
     /**
      * ������������
@@ -120,15 +118,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("������")
@@ -147,6 +137,7 @@
         allocationVo.setFileChangeList(allocationext.getFileChangeList());
         allocationVo.setFileApproveList(allocationext.getFileApproveList());
         allocationVo.setApproveList(allocationext.getApproveList());
+        allocationVo.setTime(DateUtils.dateToDateString(allocationVo.getEscalationTime(), DateUtils.yyyy_MM_dd_CN));
         return ResultMessage.ok(allocationVo);
     }
     @GetMapping("remove")
@@ -175,10 +166,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 +178,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 +202,6 @@
         }
     }
 
-    /**
-     ������������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