义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wu
2024-08-22 07324f29a30c081444d49f79cace04c3e1b0f14d 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java


@@ -1,8 +1,12 @@


package com.mes.damage.service.impl;




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


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


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.github.yulichang.query.MPJQueryWrapper;


import com.mes.damage.entity.Damage;


import com.mes.damage.entity.DamagePrint;


import com.mes.damage.mapper.DamageMapper;


import com.mes.damage.service.DamageService;


import com.mes.glassinfo.entity.GlassInfo;


@@ -10,11 +14,14 @@


import com.mes.work_assignment.entity.WorkAssignment;


import com.mes.work_assignment.mapper.WorkAssignmentMapper;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


import java.sql.Timestamp;


import java.time.LocalDateTime;


import java.util.Collections;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;


@@ -28,12 +35,14 @@


 * @since 2024-06-13


 */


@Service


public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {


public class DamageServiceImpl extends MPJBaseServiceImpl<DamageMapper, Damage> implements DamageService {




    @Resource


    GlassInfoMapper glassInfoMapper;


    @Resource


    WorkAssignmentMapper workAssignmentMapper;


    @Autowired


    private DamageMapper damageMapper;




    /**


     * 查询报工信息


@@ -136,4 +145,29 @@


        }


        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);


    }




    @Override


    public List<DamagePrint> selectDamagePrintDetails(Damage damage) {


        List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()


                .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,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())


                .eq("t.engineer_id",damage.getEngineerId())


        );


        return listDamage;


    }


}