通信LIMS后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zss
2024-07-17 16d63c3d68d131ad0cc4a8bd9f22a0c0515aa6bf 
 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java


@@ -1,6 +1,7 @@


package com.yuanchu.mom.controller;




import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.yuanchu.mom.annotation.ValueAuth;


import com.yuanchu.mom.annotation.ValueClassify;


import com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto;


import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours;


@@ -12,10 +13,7 @@


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.AllArgsConstructor;


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;


@@ -51,14 +49,15 @@


    @ValueClassify("工时管理")


    @ApiOperation(value = "统计产量工时汇总和辅助工时汇总")


    @PostMapping("/collectWorkingHours")


    public Result collectWorkingHours(){


      return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours());


    public Result collectWorkingHours(@RequestBody Map<String, Object> data)throws Exception{


        AuxiliaryOutputWorkingHoursDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHoursDto.class);


        return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours(entity));


    }






    @ValueClassify("工时管理")


    @ApiOperation(value = "导出")


    @PostMapping("/exportWorkingHours")


    @ApiOperation(value = "导出产量工时+辅助工时")


    @GetMapping("/exportWorkingHours")


    public void exportWorkingHours(HttpServletResponse response) throws IOException {


        auxiliaryOutputWorkingHoursService.exportWorkingHours(response);


    }