居住证审核+从业人员优化

lin

2024-03-21 b5837609dcd4417904eaaa5924de46010443affd

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

@@ -48,6 +48,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -67,7 +68,7 @@
   @Override
   public IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply) {
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply);
      if(taskResidencePermitApply.getRoleName().equals("inhabitant")){
      if (taskResidencePermitApply.getRoleName() != null && taskResidencePermitApply.getRoleName().equals("inhabitant")) {
         taskResidencePermitApply.setCreateUser(AuthUtil.getUserId());
      }
      return page.setRecords(baseMapper.selectTaskResidencePermitApplyPage(page, taskResidencePermitApply,
@@ -111,6 +112,8 @@

   @Override
   public Boolean updateResidencePermitApplyEntity(TaskResidencePermitApplyEntity taskResidencePermitApply) {
      taskResidencePermitApply.setConfirmTime(new Date());
      taskResidencePermitApply.setConfirmUserId(AuthUtil.getUserId());
      boolean b = updateById(taskResidencePermitApply);
      if (b) {
         TaskResidencePermitApplyEntity entity = getById(taskResidencePermitApply.getId());