新版430
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
lyh
2 天以前 1182b8b80bf3859cd962384ee4f01a43b1ecd139 
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamFactorySecondMaintPlanServiceImpl.java


@@ -1,7 +1,11 @@


package org.jeecg.modules.eam.service.impl;




import cn.hutool.core.util.StrUtil;


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


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import org.jeecg.common.constant.CommonConstant;


import org.jeecg.modules.eam.entity.EamEquipment;


import org.jeecg.modules.eam.entity.EamFactorySecondMaintPlan;


import org.jeecg.modules.eam.mapper.EamFactorySecondMaintPlanMapper;


@@ -9,6 +13,7 @@


import org.jeecg.modules.eam.service.IEamFactorySecondMaintPlanService;


import org.jeecg.modules.system.entity.BaseFactory;


import org.jeecg.modules.system.service.IBaseFactoryService;


import org.jeecg.modules.system.service.IMdcProductionService;


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


import org.springframework.dao.DuplicateKeyException;


import org.springframework.stereotype.Service;


@@ -16,7 +21,11 @@


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


import org.springframework.transaction.annotation.Transactional;




import java.util.ArrayList;


import java.util.HashSet;


import java.util.List;


import java.util.Set;


import java.util.stream.Collectors;




/**


 * @Description: “首页车间二保计划


@@ -37,8 +46,19 @@


     * @return


     */


    @Override


    public List<EamFactorySecondMaintPlan> queryAllList(){


        return this.baseMapper.queryAllList();


    public List<EamFactorySecondMaintPlan> queryAllList(String productionCode){


        if (!StrUtil.isEmpty(productionCode)){


            List<BaseFactory> baseFactoryList = baseFactoryService.list(new LambdaQueryWrapper<BaseFactory>()


                    .like(BaseFactory::getRemark, productionCode).eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));


            if (CollectionUtils.isEmpty(baseFactoryList)) {


                return new ArrayList<>();


            }


            List<String> factoryNames=baseFactoryList.stream().map(BaseFactory::getFactoryName).collect(Collectors.toList());


            return this.list(new  LambdaQueryWrapper<EamFactorySecondMaintPlan>()


                    .eq(EamFactorySecondMaintPlan::getDelFlag, CommonConstant.DEL_FLAG_0.toString())


                    .in(EamFactorySecondMaintPlan::getFactoryName, factoryNames));


        }


        return this.list();


    }




    /**