jiangping
2023-08-14 c90003b80ba6e29eb2a45c1028a09789bad5dc20
新增员工绩效分页查询接口
已修改3个文件
10 ■■■■■ 文件已修改
server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/business/model/WorkorderRecord.java
@@ -151,17 +151,13 @@
    @ApiModelProperty(value = "生产人员编码集合([1],[2],...形式存储,优化查询)"  )
    @ExcelColumn(name="生产人员编码集合([1],[2],...形式存储,优化查询)")
    private String proUserids;
    @ApiModelProperty(value = "工单状态"  )
    @TableField(exist = false)
    private Integer workorderStatus;
    @ApiModelProperty(value = "物料质量属性0合格 1不良 2报废(只有type=1才有值)"  )
    private Integer materialDonetype;
    @ApiModelProperty(value = "物料工序编码(关联procedure表)"  )
    private Integer materialProcedureId;
    @ApiModelProperty(value = "关联票据编码(投料时)"  )
    private Integer relobjId;
    @ApiModelProperty(value = "关联票据类型 0工单 1篮筐更换单记录"  )
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="合格率(%)")
    private BigDecimal rate;
}
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -180,8 +180,8 @@
            for(UserSalaryListVO model : result){
                //查询生产人员姓名
                model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
                if(Constants.formatBigdecimal4Float(model.getNum()).compareTo(new BigDecimal(0))>1){
                    model.setRate(Constants.formatBigdecimal4Float(model.getQualifiedNum()).divide(model.getNum()).multiply(new BigDecimal(100)));
                if(Constants.formatBigdecimal4Float(model.getNum()).compareTo(new BigDecimal(0))>0){
                    model.setRate(Constants.formatBigdecimal4Float(model.getQualifiedNum()).divide(model.getNum(),4).multiply(new BigDecimal(100)));
                }
            }
        }