From 72a6d5a954312a8a53e5bdd18c5f8f8b57b54dbc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 14:40:58 +0800
Subject: [PATCH] chore:分享权限修改提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 2704560..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,6 +12,7 @@
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;
@@ -19,11 +20,12 @@
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;
@@ -38,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,6 +64,16 @@
public ResultMessage contaminate() {
List<Map<String, Object>> professions = allocationService.sysDictData(Constants.WU_RAN_LEI_XING);
return ResultMessage.ok(professions);
+ }
+
+ @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);
}
@@ -123,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")
@@ -187,4 +202,6 @@
}
}
+
+
}
--
Gitblit v1.8.0