解决工时排序问题+考评bug调试

zss

2024-06-21 3547641f25634eec4b6dcf379080e92ed5025ee1

 performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java

@@ -9,12 +9,11 @@
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 org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;

/**
@@ -35,12 +34,19 @@
    private EvaluateService evaluateService;

    @ValueClassify("人员考评")
    @ApiOperation(value="考评分页查询")
    @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));
        return Result.success(evaluateService.getPage(page, entity));
    }

    @ValueClassify("人员考评")
    @ApiOperation(value = "导出考评")
    @PostMapping("/exportEvaluate")
    public void exportEvaluate(@RequestParam("month") String month, @RequestParam("name") String name, @RequestParam("departLims") String departLims, HttpServletResponse response) throws IOException {
        evaluateService.export(month, name, departLims, response);
    }

}