From 77fb7786036fd4c7dd16b9b15c6569cdf2d8ba19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:20:56 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 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 b59de2e..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
@@ -20,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;
@@ -39,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;
@@ -134,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")
@@ -198,32 +202,6 @@
}
}
-
-
- @GetMapping("selectSmallRoutine")
- @ApiOperation("���������������")
- public ResultMessage selectSmallRoutine(@RequestParam @ApiParam(value = "state",name = "������") Integer state,
- @RequestParam @ApiParam(value = "startTime",name = "������������") String startTime,
- @RequestParam @ApiParam(value = "endTime",name = "������������") String endTime){
- List<AllocationFindVo> allocationFindVos = allocationService.selectSmallRoutine(state,startTime,endTime);
- return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos);
- }
-
-
- @PostMapping("changeRoutine")
- @ApiOperation("���������������")
- public ResultMessage changeSmallRoutine(@Valid @RequestBody AllocationChangeCond changeCond){
- allocationService.changeSmallRoutine(changeCond);
- return ResultMessage.ok();
- }
-
-
- @PostMapping("checkRoutine")
- @ApiOperation("���������������")
- public ResultMessage checkSmallRoutine(@Valid @RequestBody AllocationCheckCond checkCond){
- allocationService.checkSmallRoutine(checkCond);
- return ResultMessage.ok();
- }
}
--
Gitblit v1.8.0