Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-18 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d

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

@@ -47,10 +47,11 @@
    }

    @ValueClassify("工时管理")
    //@ApiOperation(value = "统计产量工时汇总和辅助工时汇总")
    @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));
    }