| | |
| | | return ApiResponse.success(salaryParamService.findPage(pageWrap)); |
| | | } |
| | | |
| | | @ApiOperation("列表查询") |
| | | @PostMapping("/querytList") |
| | | @RequiresPermissions("business:salaryparam:query") |
| | | public ApiResponse<List<SalaryParam>> querytList(@RequestBody SalaryParam salaryParam) { |
| | | List<SalaryParam> data = salaryParamService.findList(salaryParam); |
| | | return ApiResponse.success(data); |
| | | } |
| | | |
| | | @ApiOperation("导出Excel") |
| | | @PostMapping("/exportExcel") |
| | | @RequiresPermissions("business:salaryparam:exportExcel") |
| | |
| | | @ApiModelProperty(value = "报工时长(秒)" ) |
| | | private Integer duration; |
| | | |
| | | @ApiModelProperty(value = "报工类型 0计件 1计时" ) |
| | | private Integer salaryType; |
| | | |
| | | } |
| | |
| | | Workorder param = new Workorder(); |
| | | param.setPlanId(autoWorkReportDTO.getPlansId()); |
| | | param.setPlanDate(new Date()); |
| | | CompanyUser companyUser= companyUserExtMapper.selectById(autoWorkReportDTO.getProUserList().get(Constants.ZERO)); |
| | | param.setCreateUser(companyUser.getUserId()); |
| | | // CompanyUser companyUser= companyUserExtMapper.selectById(autoWorkReportDTO.getProUserList().get(Constants.ZERO)); |
| | | param.setCreateUser(autoWorkReportDTO.getProUserList().get(Constants.ZERO)); |
| | | param.setProGroupId(autoWorkReportDTO.getProGroupId()); |
| | | param.setProUserList(autoWorkReportDTO.getProUserList()); |
| | | param.setPlanNum(num.intValue()); |
| | |
| | | workorderRecord.setQualifiedNum(createWorkorderRecordDTO.getQualifiedNum()); |
| | | //计算工资信息 |
| | | SalaryParam salaryParam = salaryParamMapper.selectOne(new QueryWrapper<SalaryParam>().eq("DELETED",Constants.ZERO).eq("MATERIAL_ID",workorderRecord.getMaterialId()) |
| | | .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).last(" limit 1 ")); |
| | | .eq("DEPART_ID",workorderRecord.getFactoryId()).eq("PROCEDURE_ID",workorderRecord.getProcedureId()).eq("TYPE",workorderRecord.getSalaryType()).last(" limit 1 ")); |
| | | if(!Objects.isNull(salaryParam)&&!Objects.isNull(createWorkorderRecordDTO.getDuration())){ |
| | | workorderRecord.setSalaryPrice(salaryParam.getSalary()); |
| | | workorderRecord.setSalaryType(salaryParam.getType()); |