da

jiangping

2023-08-22 948deb769e66a1b02d26e46572027d6fbfc2f145

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

@@ -179,7 +179,7 @@
        List<Unqualified7DayModel> result = new ArrayList<>();
        Date date = DateUtil.getCurrentDate();
        for (int i = 0; i < 7; i++) {
            Date td = DateUtil.addDaysToDate(date, 7-i);
            Date td = DateUtil.addDaysToDate(date, i-6);
            Unqualified7DayModel m = getReusltModelByDate(td,model);
            if(m == null){
                m = new Unqualified7DayModel();
@@ -288,6 +288,7 @@
                QueryRouteProcedureExtDTO r = new QueryRouteProcedureExtDTO();
                r.setRouteId(model.getRouteId());
                r.setDeleted(Constants.ZERO);
                r.setWorkPlanId(model.getId());
                List<RouteProcedureExtListVO> list = routeProcedureExtMapper.selectStatisticsList(r);
                List<WorkPlansProcedureModel> rList = new ArrayList<>();
                if(list != null){
@@ -298,8 +299,10 @@
                        tt.setRate(new BigDecimal(0));
                        if(  Constants.formatBigdecimal(t.getPlanNum()).compareTo(new BigDecimal(0)) >0){
                            //完成率
                            tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).subtract(new BigDecimal(100)));
                            tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).multiply(new BigDecimal(100)));
                        }
                        tt.setPlanNum(Constants.formatBigdecimal(t.getPlanNum()));
                        tt.setDoneNum(Constants.formatBigdecimal(t.getDoneNum()));
                        rList.add(tt);
                        //最后一列的良品数/完工数：为当前产品最后一道工序的良品数/完工数
                        model.setNum(t.getPlanNum());
@@ -315,7 +318,9 @@
    private Unqualified7DayModel getReusltModelByDate(Date td, List<Unqualified7DayModel> model ) {
        if(model !=null){
            for(Unqualified7DayModel m : model){
                if(StringUtils.equals(DateUtil.getShortTime(td),DateUtil.getShortTime(m.getCreateTime()))){
                String d1 = DateUtil.getShortTime(td);
                String d2 = DateUtil.getShortTime(m.getCreateTime());
                if(StringUtils.equals(d1,d2)){
                    return m;
                }
            }