From 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 169 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 106 insertions(+), 63 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 97e6100..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,33 +6,44 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
-import org.aspectj.apache.bcel.generic.RET;
-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 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 java.lang.reflect.Field;
+import com.moral.api.pojo.vo.allocation.AllocationPageVo;
+import com.moral.api.pojo.vo.allocation.AllocationVo;
+
+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.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;
@Api(tags = {"������������"})
@@ -54,10 +65,6 @@
return ResultMessage.ok(professions);
}
-
-
-
-
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -68,46 +75,88 @@
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();
}
- /**
- * ������������������
- * @return
- */
- @GetMapping("selectAll")
- public ResultMessage selectAll(Map<String,Object> map){
- allocationService.selectAll(map);
+ @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());
+ allocationVo.setTime(DateUtils.dateToDateString(allocationVo.getEscalationTime(), DateUtils.yyyy_MM_dd_CN));
+ 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();
}
@@ -116,10 +165,11 @@
* @return
*/
@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(map1);
+ return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
}
@@ -127,15 +177,7 @@
public void unitExel(HttpServletResponse response,HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
//������������
- Map<String, Object> map1 = allocationService.selectUnitView(params);
- List<AllocationUnitViewDto> unitView = (List<AllocationUnitViewDto>) map1.get("unitView");
-
-
- ArrayList<Map<String, Object>> mapArrayList = new ArrayList<>();
- for (AllocationUnitViewDto allocationUnitViewDto : unitView) {
- Map<String, Object> map = entityToMap(allocationUnitViewDto);
- mapArrayList.add(map);
- }
+ List<Map<String, Object>> mapArrayList = allocationService.unitExel(params);
if (CollectionUtils.isEmpty(mapArrayList)) {
return;
}
@@ -159,22 +201,23 @@
}
}
- /**
- ������������Map
- */
- public static Map<String, Object> entityToMap(Object object) {
- Map<String, Object> map = new HashMap<>();
- for (Field field : object.getClass().getDeclaredFields()) {
- try {
- boolean flag = field.isAccessible();
- field.setAccessible(true);
- Object o = field.get(object);
- map.put(field.getName(), o);
- field.setAccessible(flag);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return map;
+ @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