zhoushihao
2024-09-02 cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -145,20 +145,25 @@
        }
        this.saveBatch(damageList);
    }
    /**
     * 拿走打印数据查询
     */
    @Override
    public List<Damage> selectDamagePrint(Damage damage) {
        QueryWrapper<Damage> wrapper = new QueryWrapper<>();
        wrapper.select("working_procedure,engineer_id,teams_groups_name,device_name,count(glass_id)as glass_id")
                .eq("type",damage.getType())
                .eq("working_procedure",damage.getWorkingProcedure())
                .groupBy("working_procedure,engineer_id,teams_groups_name,device_name");
                  if (damage.getEngineerId() != null) {
                      wrapper.eq("engineer_id", damage.getEngineerId());
                  }
        return this.list(wrapper);
    public List<DamagePrint> selectDamagePrint(Damage damage) {
        MPJQueryWrapper<Damage> listDamage=new MPJQueryWrapper<Damage>()
                .select("t.engineer_id,t.glass_id,b.tempering_layout_id,b.tempering_feed_sequence,b.width,b.height,b.thickness")
                .leftJoin("glass_info as b  on t.glass_id=b.glass_id")
                .eq("t.working_procedure",damage.getWorkingProcedure())
                .eq("t.type",damage.getType());
        // 动态添加条件,当 id 有值时
        if (damage.getEngineerId() != null) {
            listDamage.eq("t.engineer_id", damage.getEngineerId());
        }
        return damageMapper.selectJoinList(DamagePrint.class,listDamage);
    }
    /**
     * 拿走打印打印详情查询
     */
    @Override
    public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
        List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()