巡查任务巡查责任人完成任务逻辑修改

guoshilong

2023-05-18 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java

@@ -10,6 +10,7 @@
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
@@ -21,13 +22,13 @@
import java.util.List;

@Service
@AllArgsConstructor
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));
      return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
   }

   @Override
@@ -54,4 +55,27 @@
   public List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds) {
      return baseMapper.getByTaskIdAndItemId(taskId,itemIds);
   }

   @Override
   public List getItemByItemIds(String itemIds,String groupId,String taskId) {
      List<PatrolGroupItem> itemList = patrolGroupItemService.getItemByItemIds(itemIds, groupId);
      List<PatrolRecord> patrolRecordList = new ArrayList<>();
      itemList.forEach(item->{
         PatrolRecordVO one = baseMapper.getPatrolRecordVO(item.getId(),taskId);
         if (ObjectUtil.isNotEmpty(one)){
            patrolRecordList.add(one);
         }
      });

      if (patrolRecordList.size()>0){
         return patrolRecordList;
      }else {
         return itemList;
      }
   }

   @Override
   public List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId) {
      return baseMapper.getByTaskIdAndGroupId(groupId,taskId);
   }
}