Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import org.springblade.modules.task.mapper.TaskBailReportingEventMapper;
import org.springblade.modules.task.service.ITaskBailReportingEventService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import javax.annotation.Resource;

@@ -49,7 +50,7 @@

   @Override
   public Boolean saveBailReporting(TaskBailReportingEventDTO taskBailReportingEvent) {
      Long aLong = taskService.saveTask(1, DictConstant.BAIL_PENDING_TRIAL, 3, "", AuthUtil.getUserId(),taskBailReportingEvent.getHouseCode());
      Long aLong = taskService.saveTask(3, DictConstant.BAIL_PENDING_TRIAL, 1, "", AuthUtil.getUserId(),taskBailReportingEvent.getHouseCode());
      if (aLong > 0) {
         taskBailReportingEvent.setTaskId(aLong);
         taskBailReportingEvent.setCheckUserId(AuthUtil.getUserId());
@@ -60,7 +61,8 @@

   @Override
   public Boolean updateBailReporting(TaskBailReportingEventEntity taskBailReportingEvent) {
      Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskBailReportingEvent.getTaskId(), Integer.valueOf(taskBailReportingEvent.getConfirmFlag()));
      Integer integer = StringUtils.isBlank(taskBailReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskBailReportingEvent.getConfirmFlag());
      Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskBailReportingEvent.getTaskId(), integer);
      if (aLong > 0) {
         return baseMapper.updateById(taskBailReportingEvent) > 0 ? true : false;
      }