blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-06-27 31553fc8b224d70f4415e9edf4098587dea44e3f 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java


@@ -3,6 +3,7 @@


import com.baomidou.dynamic.datasource.annotation.DS;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.mes.pp.entity.ReportingWork;


import com.mes.pp.entity.request.AwaitingRepair;


import com.mes.pp.entity.request.Reportingdamage;


import com.mes.pp.mapper.ReportingWorkMapper;


import com.mes.pp.mapper.request.AwaitingRepairMapper;


@@ -36,11 +37,18 @@


    @Override


    public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) {


        QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>();


        queryWrapper.eq("this_process",reportingdamage.getThisProcess())


                .eq("device_name",reportingdamage.getDeviceName())


                .le("reporting_work_time", LocalDateTime.now());


        queryWrapper.select("this_process,sum(completed_quantity)as completedQuantity,sum(breakage_quantity)as breakageQuantity,device_name ")


                .eq("this_process",reportingdamage.getThisProcess())


                //.eq("device_name",reportingdamage.getDeviceName())


                .ge("reporting_work_time",reportingdamage.getReportingWorkTime())


                .groupBy("this_process");


        return reportingDamageMapper.selectList(queryWrapper);


//  rw.reporting_work_time BETWEEN '2024/05/12'and'2024/06/20' and rw.this_process = '磨边' and  rw.device_name = '快速磨'


    }




    @Override


    public List<AwaitingRepair> selectAwaitingRepair() {


        QueryWrapper<AwaitingRepair>queryWrapper=new QueryWrapper<>();


        queryWrapper.select("*");


        return awaitingRepairMapper.selectList(queryWrapper);


    }


}