三色任务完善

zhongrj

2024-01-11 af21084fa4d1e5f8432f61fbd26a3e4e99495616

 src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java

@@ -16,16 +16,21 @@
 */
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.task.dto.TaskHotelReportingDTO;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
import org.springblade.modules.task.mapper.TaskHotelReportingMapper;
import org.springblade.modules.task.service.ITaskHotelReportingService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskHotelReportingVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -39,10 +44,14 @@
 * @since 2023-11-06
 */
@Service
public class TaskHotelReportingServiceImpl extends BaseServiceImpl<TaskHotelReportingMapper, TaskHotelReportingEntity> implements ITaskHotelReportingService {
public class TaskHotelReportingServiceImpl extends ServiceImpl<TaskHotelReportingMapper, TaskHotelReportingEntity> implements ITaskHotelReportingService {

   @Resource
   @Lazy
   private ITaskService taskService;

   @Autowired
   private IPlaceService placeService;

   @Override
   public IPage<TaskHotelReportingVO> selectTaskHotelReportingPage(IPage<TaskHotelReportingVO> page, TaskHotelReportingVO taskHotelReporting) {
@@ -54,6 +63,11 @@
   public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) {
      Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 1, "", AuthUtil.getUserId(), taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType());
      if (aLong > 0) {
         // 通过houseCode 获取场所id
         QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",0).eq("house_code",taskHotelReporting.getHouseCode());
         PlaceEntity placeEntity = placeService.getOne(queryWrapper);
         taskHotelReporting.setPlaceId(placeEntity.getId());
         taskHotelReporting.setTaskId(aLong);
         taskHotelReporting.setCheckUserId(AuthUtil.getUserId());
         return baseMapper.insert(taskHotelReporting) > 0;
@@ -64,7 +78,7 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean updateHotelReporting(TaskHotelReportingEntity taskHotelReporting) throws Exception {
   public Boolean updateHotelReporting(TaskHotelReportingVO taskHotelReporting) throws Exception {
      Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskHotelReporting.getTaskId(), taskHotelReporting.getStatus());
      if (aLong > 0) {
         taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());