From 346288bc38bdab442721d7609caed86d03b9d2d4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java
new file mode 100644
index 0000000..d5ded3c
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationExtensionController.java
@@ -0,0 +1,64 @@
+package com.moral.api.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.pojo.ext.allocationextension.AllocationExtensionExt;
+import com.moral.api.pojo.ext.allocationextension.AllocationExtensionPageExt;
+import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.query.allocationextension.AllocationExtensionPageCond;
+import com.moral.api.pojo.vo.allocationextension.AllocationExtensionPageVo;
+import com.moral.api.pojo.vo.allocationextension.AllocationExtensionVo;
+import com.moral.api.service.AllocationExtensionService;
+import com.moral.constant.PageResult;
+import com.moral.constant.ResultMessage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * ��������������� ���������������
+ * </p>
+ * deyt template generate
+ * @author JI
+ * @since 2023-09-25
+ */
+@RestController
+@RequestMapping("/allocationExtension")
+@Api(tags = {"������������"})
+public class AllocationExtensionController {
+
+    private final AllocationExtensionService allocationExtensionService;
+
+    public AllocationExtensionController(AllocationExtensionService allocationExtensionService) {
+        this.allocationExtensionService = allocationExtensionService;
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation("������")
+    public ResultMessage<AllocationExtensionVo> get(Integer id) {
+        AllocationExtensionExt allocationExtensionext = allocationExtensionService.extOne(id);
+        return ResultMessage.ok(allocationExtensionext == null ? null : AllocationExtensionVo.convert(allocationExtensionext));
+    }
+
+
+    @PostMapping("/page")
+    @ApiOperation("������")
+    public ResultMessage<PageResult<AllocationExtensionPageVo>> page(@Valid @RequestBody AllocationExtensionPageCond allocationExtensionPageCond) {
+        Page<AllocationExtensionPageExt> page = allocationExtensionService.extPage(allocationExtensionPageCond);
+        PageResult<AllocationExtensionPageVo> result = new PageResult<>(page);
+        result.setList(AllocationExtensionPageVo.convert(page.getRecords()));
+        return ResultMessage.ok(result);
+    }
+
+    @GetMapping("check")
+    @ApiOperation("������")
+    public ResultMessage check(@RequestParam @ApiParam(value = "id",name = "������id") Integer id,
+                                       @RequestParam @ApiParam(value = "state",name = "������") Integer state){
+        allocationExtensionService.check(id,state);
+        return ResultMessage.ok();
+    }
+
+}

--
Gitblit v1.8.0