显示数据

elkers

10 天以前 3a1efe863c0cf30683870c204fb9b55ff6c35500

 src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java

@@ -264,6 +264,7 @@
        List<WaterFacilityParameterPO> parameterPOList = mapper.getList();
        if(ListUtil.isNotNullOrEmpty(facilityPOList)){
            result = CopierUtil.mapTo(facilityPOList, WaterFacilityVO.class);
            int sumTime=0;
            for(WaterFacilityVO facilityVO:result){
                List<WaterFacilityParameterPO> collect = parameterPOList.stream().filter(x -> x.getFacilityId().equals(facilityVO.getId())).collect(Collectors.toList());
                if(ListUtil.isNotNullOrEmpty(collect)){
@@ -280,25 +281,36 @@
                        if("true".equals(parameterVO.getColumnValue())){
                            parameterVO.setColumnValue("开");
                        }
//                        if(parameterVO.getColumnsCode().equals("B001Time")||parameterVO.getColumnsCode().equals("B002Time")){
//                            BigDecimal bigDecimal=new BigDecimal(parameterVO.getColumnValue()).setScale(2,RoundingMode.DOWN);
//                            if(bigDecimal.compareTo(new BigDecimal(60).setScale(2,RoundingMode.DOWN))>0){
//                                BigDecimal data = bigDecimal.divide(new BigDecimal(60),2,BigDecimal.ROUND_HALF_UP);
//                                parameterVO.setColumnValue(data+"分");
//                            }
//                            if(bigDecimal.compareTo(new BigDecimal(3600))>0){
//                                BigDecimal data = bigDecimal.divide(new BigDecimal(3600),2,BigDecimal.ROUND_HALF_UP);
//                                parameterVO.setColumnValue(data+"时");
//                            }
//                        }
                        if(parameterVO.getColumnsCode().equals("B001TimeSum")||parameterVO.getColumnsCode().equals("B002TimeSum")){
                            int time = new BigDecimal(parameterVO.getColumnValue()).intValue();
                            sumTime=sumTime+time;
                            if(sumTime>0){
                                String timeString = timeString(sumTime);
                                facilityVO.setTotalTime(timeString);
                            }
                        }
                        if(parameterVO.getColumnsCode().equals("B001Time")||parameterVO.getColumnsCode().equals("B002Time")||parameterVO.getColumnsCode().equals("B001TimeSum")||parameterVO.getColumnsCode().equals("B002TimeSum")){
                            //计算时分秒
                            Integer time= new BigDecimal(parameterVO.getColumnValue()).intValue();
                            if(time>0){
                                String timeString = timeString(time);
                                parameterVO.setColumnValue(timeString);
                            }
                        }
                    }
                    facilityVO.setParameterVOList(parameterVOList);
                }

            }

        }
        return ExecutedResult.success(result);
    }
    public String timeString(Integer time){
        int hours=time/3600;
        int minutes=(time%3600)/60;
        int seconds=time%60;
        return  hours+"时"+minutes+"分"+seconds+"秒";
    }
    protected ExecutedResult<WaterFacilityParameterPO> check4Id(Long id) {
        WaterFacilityParameterPO exists = mapper.get(id);
        if (Objects.isNull(exists)) {