# 企业端用户

jiaosong

2023-08-25 dac20eee2dd2846158ba96f25a17f87d96d95743

# 企业端用户

 server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java

@@ -82,13 +82,13 @@


    @ApiModelProperty(value = "计价方式 0计件 1计时", example = "1")
    @ExcelColumn(name="计价方式",index =13,width =15, valueMapping =" 0计件 1计时")
    private String salaryType;
    @ExcelColumn(name="计价方式",index =13,width =15, valueMapping =" 0=计件;1=计时")
    private Integer salaryType;



    @ApiModelProperty(value = "工资单价", example = "1")
    @ExcelColumn(name="工资单价",index =14,width =15, suffix ="元")
    @ExcelColumn(name="计价工资（元）",index =14,width =15, suffix ="元")
    private Integer salaryPrice;



 server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java

@@ -304,7 +304,7 @@
            QueryWrapper<Department> wrapper = new QueryWrapper<>();
            wrapper.lambda()
                    .eq(Department::getRootId,user.getRootDepartment().getId())
                    .eq(Department::getName,departName)
                    .eq(Department::getName,s.getDepartName())
                    .last("limit 1");
            Department department = departmentMapper.selectOne(wrapper);
            if(Objects.isNull(department)){
@@ -314,11 +314,11 @@
            QueryWrapper<Procedures> proceduresQuery = new QueryWrapper<>();
            proceduresQuery.lambda()
                    .eq(Procedures::getRootDepartId,user.getRootDepartment().getId())
                    .eq(Procedures::getDepartId,department.getId())
                    .eq(Procedures::getOrgId,department.getId())
                    .eq(Procedures::getName,s.getProcedureName());
            Procedures procedures = proceduresMapper.selectOne(proceduresQuery);
            if(Objects.isNull(procedures)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"工序名称已存在");
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"工序名称不存在");
            }
            QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
            queryDeviceExtDTO.setDeleted(Constants.ZERO);

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -1757,10 +1757,16 @@
                wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                Integer duration = re.getDuration();
                Integer h = duration/3600;
                Integer m = (duration%3600)/60;
                Integer s = ((duration%3600)%60);
                wreev.setDuration(h+"小时"+m+"分钟"+s+"秒");
                if (Objects.nonNull(duration)){
                    Integer h = duration/3600;
                    Integer m = (duration%3600)/60;
                    Integer s = ((duration%3600)%60);
                    wreev.setDuration(h+"小时"+m+"分钟"+s+"秒");
                }else {
                    wreev.setDuration("-");
                }
                wreev.setSalaryType(re.getSalaryType());
                wreev.setSalaryPrice(re.getSalaryPrice());
                list.add(wreev);

        }