Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -23,6 +23,7 @@
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.AuthUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -30,7 +31,9 @@
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.service.ITaskPlaceRecordService;
import org.springblade.modules.task.service.ITaskService;
@@ -93,4 +96,29 @@
      boolean save = save(permitApply);
      return save;
   }

   @Override
   public Integer getCount(String neiCode, int i) {
      // 获取请求头中的角色别名
      String roleName = SpringUtils.getRequestParam("roleName");
      if (AuthUtils.isMj(roleName)) {
         return baseMapper.getCount(neiCode, i, AuthUtil.getUserId());
      }
      return 0;
   }

   @Override
   public Boolean updateResidencePermitApplyEntity(TaskResidencePermitApplyEntity taskResidencePermitApply) {
      boolean b = updateById(taskResidencePermitApply);
      if (b) {
         TaskResidencePermitApplyEntity entity = getById(taskResidencePermitApply.getId());
         // 更新任务表状态
         TaskEntity taskEntity = new TaskEntity();
         taskEntity.setId(entity.getTaskId());
         taskEntity.setStatus(taskResidencePermitApply.getConfirmFlag());
         b = taskService.updateById(taskEntity);
         return b;
      }
      return b;
   }
}