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 | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 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..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,17 +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;
@@ -37,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;
@@ -61,7 +66,6 @@
return ResultMessage.ok(professions);
}
-
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -71,6 +75,7 @@
List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
return ResultMessage.ok(responsibilityUnits);
}
+
/**
* ���������������
@@ -84,15 +89,7 @@
}
- /**
- * ���������������
- * @return
- */
- /* @GetMapping("check")
- public ResultMessage check(Integer id){
- allocationService.check(id);
- return ResultMessage.ok();
- }*/
+
/**
* ������������
@@ -121,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("������")
@@ -148,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")
@@ -180,7 +170,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 +202,6 @@
}
}
+
+
}
--
Gitblit v1.8.0