8dc8985eb32198788bef7ad21cf3f1726d840b6f..b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044
2023-08-18 jiaosong
Merge remote-tracking branch 'origin/master'
b5a63b 对比 | 目录
2023-08-18 jiaosong
#产出计算
f0e9e5 对比 | 目录
已修改2个文件
6 ■■■■ 文件已修改
server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
@@ -66,7 +66,7 @@
    @ExcelColumn(name="不良品数")
    private BigDecimal unQualifiedNum;
    @ApiModelProperty(value = "合格率(%)")
    @ExcelColumn(name="合格率(%)")
    @ExcelColumn(name="合格率(%)" ,suffix="%")
    private BigDecimal rate;
}
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1687,6 +1687,10 @@
            if(model.getUserInfo()!=null){
                model.setUserName(model.getUserInfo().getUserName());
                model.setDepartName(model.getUserInfo().getDepartName());
                model.setNum(model.getNum().setScale(2));
                model.setQualifiedNum(model.getQualifiedNum().setScale(2));
                model.setUnQualifiedNum(model.getUnQualifiedNum().setScale(2));
            }
        }
        ExcelExporter.build(UserSalaryListVO.class).export(result, "员工绩效明细"+System.currentTimeMillis(), response);