巡查逻辑修改

guoshilong

2023-07-12 b176ddd3a9acdd1eef2e7eb9c0cef5fa620334b4

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

@@ -1,5 +1,6 @@
package cn.gistack.sm.patrol.service.impl;

import cn.gistack.sm.patrol.dto.PatrolGroupDTO;
import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
@@ -8,6 +9,7 @@
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import cn.gistack.sm.patrol.vo.RecordBatchVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -17,6 +19,7 @@
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
@@ -78,4 +81,20 @@
   public List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId) {
      return baseMapper.getByTaskIdAndGroupId(groupId,taskId);
   }

   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean updateThenSaveBatch(RecordBatchVO recordBatchVO) {


      boolean b = updateBatchById(recordBatchVO.getUpdateList());
      boolean b1 = saveBatch(recordBatchVO.getAddList());

      return b&&b1;
   }

   @Override
   public List<PatrolGroupDTO> getHistoryRecord(PatrolRecordVO patrolRecordVO) {
      return baseMapper.getHistoryRecord(patrolRecordVO);
   }
}