eims-master.git

			@@ -3,6 +3,7 @@
			import cn.hutool.core.convert.Convert;
			import cn.hutool.core.util.ObjectUtil;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import org.dromara.common.core.service.FixtureService;
			import org.dromara.common.core.utils.MapstructUtils;
			import org.dromara.common.core.utils.SpringUtils;
			import org.dromara.common.core.utils.StringUtils;
			@@ -39,7 +40,7 @@
			*/
			@RequiredArgsConstructor
			@Service
			public class EimsFixtureServiceImpl implements IEimsFixtureService {
			public class EimsFixtureServiceImpl implements IEimsFixtureService, FixtureService {

			private final EimsFixtureMapper baseMapper;
			private final EimsFixtureTypeMapper fixtureTypeMapper;
			@@ -100,6 +101,7 @@
			lqw.eq(StringUtils.isNotBlank(bo.getFixtureDesc()), EimsFixture::getFixtureDesc, bo.getFixtureDesc());
			lqw.eq(bo.getBorrowDept()!=null, EimsFixture::getBorrowDept, bo.getBorrowDept());
			lqw.eq(bo.getBorrowUser()!=null, EimsFixture::getBorrowUser, bo.getBorrowUser());
			lqw.eq(StringUtils.isNotEmpty(bo.getBorrowStatus()), EimsFixture::getBorrowStatus, bo.getBorrowStatus());
			lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsFixture::getStatus, bo.getStatus());
			lqw.like(StringUtils.isNotBlank(bo.getAssetNo()), EimsFixture::getAssetNo, bo.getAssetNo());
			lqw.like(StringUtils.isNotBlank(bo.getModelNo()), EimsFixture::getModelNo, bo.getModelNo());
			@@ -193,4 +195,15 @@
			return baseMapper.deleteByIds(ids) > 0;
			}

			@Override
			public String selectFixtureNameByIds(String fixIds) {
			List<String> list = new ArrayList<>();
			for (Long id : StringUtils.splitTo(fixIds, Convert::toLong)) {
			EimsFixtureVo vo = SpringUtils.getAopProxy(this).queryById(id);
			if (ObjectUtil.isNotNull(vo)) {
			list.add(vo.getFixtureName());
			}
			}
			return String.join(StringUtils.SEPARATOR, list);
			}
			}