From 54596f54e147492009daa112ab89a6bcd7bf33a5 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:10:09 +0800
Subject: [PATCH] ci:添加单号筛选项
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 162 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 37 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 7fc6b52..2704560 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
@@ -5,23 +5,42 @@
import io.swagger.annotations.ApiImplicitParam;
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.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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+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.WebUtils;
+
+import javax.validation.Valid;
@Api(tags = {"������������"})
@@ -44,59 +63,128 @@
}
-
-
-
- @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);
- }
-
/**
* ���������������
* @return
*/
@PostMapping("insert")
- public ResultMessage insert(@RequestBody Allocation allocation){
+ @ApiOperation("������")
+ public ResultMessage insert(@Valid @RequestBody AllocationAddCond allocation){
allocationService.insertAllocation(allocation);
return ResultMessage.ok();
}
- /**
- * ���������������
- * @return
- */
- @GetMapping("check")
- public ResultMessage check(Integer id){
- allocationService.check(id);
- return ResultMessage.ok();
- }
+
/**
* ������������
- * @param allocation
+ * @param allocationUpdateCond
* @return
+ *
+ *
*/
@PostMapping("update")
- public ResultMessage update(@RequestBody Allocation allocation){
- allocationService.updateAll(allocation);
+ @ApiOperation("������")
+ public ResultMessage update(@Valid @RequestBody AllocationUpdateCond allocationUpdateCond){
+ allocationService.updateAll(allocationUpdateCond);
return ResultMessage.ok();
}
+ @PostMapping("change")
+ @ApiOperation("������")
+ public ResultMessage changeAllocation(@Valid @RequestBody AllocationChangeCond changeCond){
+ allocationService.changeAllocation(changeCond);
+ return ResultMessage.ok();
+ }
+
+ @PostMapping("check")
+ @ApiOperation("������")
+ public ResultMessage checkAllocation(@Valid @RequestBody AllocationCheckCond checkCond){
+ allocationService.checkAllocation(checkCond);
+ return ResultMessage.ok();
+ }
+
+
+ @PostMapping("/page")
+ @ApiOperation("������")
+ public ResultMessage<PageResult<AllocationPageVo>> page(@Valid @RequestBody AllocationPageCond allocationPageCond) {
+ Page<AllocationPageExt> page = allocationService.extPage(allocationPageCond);
+ PageResult<AllocationPageVo> result = new PageResult<>(page);
+ result.setList(AllocationPageVo.convert(page.getRecords()));
+ return ResultMessage.ok(result);
+ }
+ @GetMapping("/detail")
+ @ApiOperation("������")
+ public ResultMessage<AllocationVo> get(Integer id) {
+ AllocationExt allocationext = allocationService.extOne(id);
+ AllocationVo allocationVo = AllocationVo.convert(allocationext);
+ allocationVo.setFileBaseList(allocationext.getFileBaseList());
+ allocationVo.setFileChangeList(allocationext.getFileChangeList());
+ allocationVo.setFileApproveList(allocationext.getFileApproveList());
+ allocationVo.setApproveList(allocationext.getApproveList());
+ return ResultMessage.ok(allocationVo);
+ }
+ @GetMapping("remove")
+ @ApiOperation("������")
+ public ResultMessage removeById(Integer id){
+ allocationService.removeById(id);
+ return ResultMessage.ok();
+ }
+ @GetMapping("invalid")
+ @ApiOperation("������")
+ public ResultMessage invalidResult(@RequestParam @ApiParam(value = "id",name = "������id") Integer id,
+ @RequestParam @ApiParam(value = "invalidReason",name = "������������") String invalidReason){
+ allocationService.invalidResult(id,invalidReason);
+ return ResultMessage.ok();
+ }
+
+ @PostMapping("/applyfor")
+ @ApiOperation("������������")
+ public ResultMessage applyFor(@Valid @RequestBody AllocationExtensionAddCond allocationExtensionAddCond) {
+ return allocationService.applyFor(allocationExtensionAddCond) ? ResultMessage.ok() : ResultMessage.fail();
+ }
+
+
/**
- * ������������������
+ * ������������������
* @return
*/
- @GetMapping("selectAll")
- public ResultMessage selectAll(Map<String,Object> map){
- allocationService.selectAll(map);
- return ResultMessage.ok();
+ @GetMapping("selectUnitView")
+ @ApiOperation("������������")
+ public ResultMessage selectUnitView(HttpServletRequest request){
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ Map<String, Object> map1 = allocationService.selectUnitView(params);
+ return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
+ }
+
+
+ @GetMapping("unitExel")
+ public void unitExel(HttpServletResponse response,HttpServletRequest request){
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ //������������
+ List<Map<String, Object>> mapArrayList = allocationService.unitExel(params);
+ if (CollectionUtils.isEmpty(mapArrayList)) {
+ return;
+ }
+ Map<String, Object> map = mapArrayList.get(0);
+ List<String> list = new ArrayList<>();
+ for (String key : map.keySet()) {
+ list.add(key);
+ }
+ String[] s2 = new String[list.size()];
+ list.toArray(s2);
+ NoModelWriteData d = new NoModelWriteData();
+ d.setFileName("������������");
+ d.setHeadMap(s2);
+ d.setDataStrMap(s2);
+ d.setDataList(mapArrayList);
+ try {
+ EasyExcelUtils easyExcelUtils = new EasyExcelUtils();
+ easyExcelUtils.noModleWrite(d, response);
+ } catch (Exception e) {
+ int i = 0;
+ }
}
}
--
Gitblit v1.8.0