From 461fb02ec8264079f73fd2b6f937ad4f40754cb9 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 19 六月 2024 23:39:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java index 5815d15..49f76bb 100644 --- a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java +++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java @@ -1,8 +1,21 @@ package com.yuanchu.mom.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.annotation.ValueClassify; +import com.yuanchu.mom.pojo.AuxiliaryWorkingHours; +import com.yuanchu.mom.pojo.Evaluate; +import com.yuanchu.mom.service.EvaluateService; +import com.yuanchu.mom.utils.JackSonUtil; +import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.RestController; + +import javax.annotation.Resource; +import java.util.Map; /** * <p> @@ -17,4 +30,17 @@ @RequestMapping("/evaluate") public class EvaluateController { + + @Resource + private EvaluateService evaluateService; + + @ValueClassify("浜哄憳鑰冭瘎") + @ApiOperation(value="鑰冭瘎鍒嗛〉鏌ヨ") + @PostMapping("/page") + public Result page(@RequestBody Map<String, Object> data) throws Exception { + Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); + Evaluate entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Evaluate.class); + return Result.success(evaluateService.getPage(page,entity)); + } + } -- Gitblit v1.9.3