Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

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

@@ -18,6 +18,7 @@

import org.springblade.common.constant.DictConstant;
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;
@@ -47,8 +48,8 @@


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

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