修复bug

jiangping

2023-08-18 6ccb04d9bfb5cc638f221453d2b5b47039de9ddd

修复bug

 server/src/main/java/doumeemes/core/utils/Constants.java

@@ -1075,6 +1075,14 @@
        d = d.setScale(4, BigDecimal.ROUND_HALF_UP);
        return  d;
    }
    public static BigDecimal formatBigdecimalFloat(BigDecimal d,int scale) {
        if (d == null) {
            d = new BigDecimal(0.0);
        }
        //保留两位小数且四舍五入
        d = d.setScale(scale, BigDecimal.ROUND_HALF_UP);
        return  d;
    }
    public static String formatCodeStr(String code) {
        if (code == null) {
            return "";

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

@@ -1687,14 +1687,13 @@
            if(model.getUserInfo()!=null){
                model.setUserName(model.getUserInfo().getUserName());
                model.setDepartName(model.getUserInfo().getDepartName());
                model.setNum(Objects.isNull(model.getNum()) ? model.getNum().setScale(2) : new BigDecimal("0"));
                model.setQualifiedNum(Objects.isNull(model.getQualifiedNum()) ? model.getQualifiedNum().setScale(2) : new BigDecimal("0"));
                model.setUnQualifiedNum(Objects.isNull(model.getUnQualifiedNum()) ? model.getUnQualifiedNum().setScale(2): new BigDecimal("0"));
                model.setRate(Objects.isNull(model.getRate()) ? model.getRate().setScale(2): new BigDecimal("0"));
                model.setNum(Constants.formatBigdecimalFloat(model.getNum(),2));
                model.setQualifiedNum(Constants.formatBigdecimalFloat(model.getQualifiedNum(),2));
                model.setUnQualifiedNum(Constants.formatBigdecimalFloat(model.getUnQualifiedNum(),2));
                model.setRate(Constants.formatBigdecimalFloat(model.getRate(),2));
            }
        }
        ExcelExporter.build(UserSalaryListVO.class).export(result, "员工绩效明细"+System.currentTimeMillis(), response);

    }
    @Override
    public void exportSalaryStatistics(PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response){