From 17bb5d74bc4a57b117b776745774c23d78dba381 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:18 +0800
Subject: [PATCH] fix：修改测试环境redis
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 476d2c6..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,39 +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;
@@ -133,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")
@@ -197,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