|
@@ -17,6 +17,7 @@ import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
|
|
|
import com.ruoyi.zdsz.service.IZEngineeringInfoService;
|
|
|
import com.ruoyi.zdsz.service.IZEngineeringNodeService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -35,11 +36,10 @@ import java.util.Map;
|
|
|
@Service
|
|
|
public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustryService {
|
|
|
|
|
|
+ @Resource
|
|
|
private final ZEngineeringIndustryMapper baseMapper;
|
|
|
|
|
|
@Resource
|
|
|
- private IZEngineeringInfoService izEngineeringInfoService;
|
|
|
- @Resource
|
|
|
private IZEngineeringNodeService izEngineeringNodeService;
|
|
|
|
|
|
/**
|
|
@@ -48,6 +48,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
|
|
|
@Override
|
|
|
public ZEngineeringIndustryVo queryById(String id){
|
|
|
return baseMapper.selectVoById(id);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -72,8 +73,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
|
|
|
private LambdaQueryWrapper<ZEngineeringIndustry> buildQueryWrapper(ZEngineeringIndustryBo bo) {
|
|
|
Map<String, Object> params = bo.getParams();
|
|
|
LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
|
|
|
- lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
|
|
|
- lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
|
|
|
+ lqw.like(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
|
|
|
+ lqw.like(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringIndustry::getDesignUnit, bo.getDesignUnit());
|