增加分工表导入功能

yangys

2025-08-13 6de11904c373ded1f44f326382bb59d08b24c8d1

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

@@ -5,6 +5,7 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -12,8 +13,12 @@
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.nio.file.Files;
@@ -23,7 +28,8 @@

@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {

   @Autowired
   private ISysClient sysClient;
   @Transactional
   public void saveMachine(MachineSaveVO vo){
      checkMachine(vo);
@@ -89,6 +95,7 @@
      machine.setPollingHours(vo.getPollingHours());
      machine.setProgSendDir(vo.getProgSendDir());
      machine.setProgReceiveDir(vo.getProgReceiveDir());
      machine.setProgTempDir(vo.getProgTempDir());
      machine.setStatus(vo.getStatus());
      machine.setRemark(vo.getRemark());

@@ -105,12 +112,14 @@
    */
   public IPage<MachineVO> pageQuery(MachineQueryVO query) {

      LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
      //queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
      //String keys = query.getKeyword();
      if (query.getDeptId() != null) {
         R<Dept> rs = sysClient.getDept(query.getDeptId());
         if(rs.isSuccess()){
            query.setDeptAncestors(rs.getData().getAncestors()+","+rs.getData().getId());
         }
      }
      IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query), query);

      //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);
      return page;
   }

@@ -178,4 +187,9 @@
   public Machine getByCode(String machineCode) {
      return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
   }

   @Transactional
   public String importMachines(MultipartFile file) {
      return "";//导入成功，给空串，部分不成功给提示
   }
}