hbwri/skjcmanager.git

			@@ -1,16 +1,30 @@
			package cn.gistack.sm.patrol.service.impl;

			import cn.gistack.sm.patrol.entity.PatrolGroupItem;
			import cn.gistack.sm.patrol.entity.PatrolRecord;
			import cn.gistack.sm.patrol.entity.PatrolType;
			import cn.gistack.sm.patrol.mapper.PatrolRecordMapper;
			import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
			import cn.gistack.sm.patrol.service.IPatrolRecordService;
			import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
			import cn.gistack.sm.patrol.vo.PatrolRecordVO;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import org.springblade.core.mp.base.BaseServiceImpl;
			import org.springblade.core.mp.support.Condition;
			import org.springblade.core.tool.utils.Func;
			import org.springblade.core.tool.utils.ObjectUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			@Service
			public class PatrolRecordServiceImpl extends BaseServiceImpl<PatrolRecordMapper, PatrolRecord> implements IPatrolRecordService {
			@Autowired
			IPatrolGroupItemService patrolGroupItemService;

			@Override
			public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
			return page.setRecords(baseMapper.selectPatrolRecord(patrolRecord));
			@@ -20,4 +34,19 @@
			public PatrolRecordVO getDetail(String id) {
			return baseMapper.getDetail(id);
			}

			@Override
			public List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds) {
			List<Long> longList = Func.toLongList(itemIds);
			List<PatrolGroupItemVO> patrolGroupItemVOList = new ArrayList<>();
			longList.forEach(e->{
			PatrolRecord patrolRecord = baseMapper.selectPatrolRecordByTaskIdAndItemId(taskId, e);
			if (ObjectUtil.isEmpty(patrolRecord)){
			PatrolGroupItemVO patrolGroupItemVO = patrolGroupItemService.getPatrolGroupItemVOById(e);
			patrolGroupItemVOList.add(patrolGroupItemVO);
			}
			});

			return patrolGroupItemVOList;
			}
			}