111
k94314517
2023-08-18 efd825d47f9cab3d7535e069d4a1b5e094e92e44
111
已修改4个文件
16 ■■■■ 文件已修改
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -91,6 +91,14 @@
        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")
server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java
@@ -25,5 +25,7 @@
    @ApiModelProperty(value = "报工时长(秒)"  )
    private Integer duration;
    @ApiModelProperty(value = "报工类型 0计件 1计时"  )
    private Integer salaryType;
}
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -1652,8 +1652,8 @@
        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());
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -1555,7 +1555,7 @@
        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());