From b5b6b59de8f5349de1e36875582224f2712e0727 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 10:13:27 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/controller/AllocationController.java |   60 ++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 34 insertions(+), 26 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 f6b223a..86f968a 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
@@ -6,38 +6,42 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
-import org.aspectj.apache.bcel.generic.RET;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.AllocationLog;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
 import com.moral.api.pojo.ext.allocation.AllocationExt;
 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.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;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.moral.api.entity.Allocation;
 import com.moral.api.entity.ResponsibilityUnit;
-import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
+
 import com.moral.api.service.AllocationService;
 import com.moral.api.utils.EasyExcelUtils;
 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;
 
@@ -61,7 +65,6 @@
         return ResultMessage.ok(professions);
     }
 
-
     @ApiOperation(value = "������������", notes = "������������")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -71,6 +74,7 @@
         List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
         return ResultMessage.ok(responsibilityUnits);
     }
+
 
     /**
      * ���������������
@@ -84,15 +88,7 @@
     }
 
 
-    /**
-     * ���������������
-     * @return
-     */
-   /* @GetMapping("check")
-    public ResultMessage check(Integer id){
-        allocationService.check(id);
-        return ResultMessage.ok();
-    }*/
+
 
     /**
      * ������������
@@ -121,15 +117,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("������")
@@ -148,6 +136,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")
@@ -180,7 +169,7 @@
     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);
     }
 
 
@@ -212,4 +201,23 @@
         }
     }
 
+    @GetMapping("updataUnit")
+    @ApiOperation("������������������")
+    public ResultMessage updataUnit(@RequestParam @ApiParam(value = "id",name = "������id") Integer id,
+                                    @RequestParam @ApiParam(value = "unitId",name = "������������Id") Integer unitId,
+                                    @RequestParam @ApiParam(value = "polluteType",name = "������������Id") Integer polluteType){
+        allocationService.updataUnit(id,unitId,polluteType);
+        return ResultMessage.ok();
+    }
+
+
+
+    @GetMapping("getLog")
+    @ApiOperation("������������")
+    public ResultMessage getLog(@RequestParam @ApiParam(value = "allocationNum",name = "������������") String allocationNum){
+        List<AllocationLog> log = allocationService.getLog(allocationNum);
+        return ResultMessage.ok(log);
+    }
+
+
 }

--
Gitblit v1.8.0