增加流程与程序关联查询

yangys

2025-06-30 813f0f6d391b7f24682204c22c059ef69b124fa6

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.micrometer.common.util.StringUtils;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
@@ -38,6 +39,7 @@
      Machine machine = this.getById(vo.getId());

      machine.setMachineSpec(vo.getMachineSpec());
      machine.setCode(vo.getCode());
      machine.setName(vo.getName());
      machine.setMachineGroupCode(vo.getMachineGroupCode());
      machine.setManufacturer(vo.getManufacturer());
@@ -64,8 +66,11 @@
   public IPage<MachineVO> pageQuery(MachineQueryVO query) {

      LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
      queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
      IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);
      //queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
      //String keys = query.getKeyword();

      //queryWrapper.and(StringUtils.isNotEmpty(keys), wrapper -> wrapper.like(Machine::getCode, keys).or().like(Machine::getName, keys));
      IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);

      //MachineSpec.valueOf()
      for (MachineVO record : page.getRecords()) {
@@ -140,7 +145,6 @@
    * @return
    */
   public Machine getByCode(String machineCode) {

      return this.getOne(this.lambdaQuery().eq(Machine::getCode, machineCode));
      return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
   }
}