From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java
index 2c4d533..96b5b52 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java
@@ -31,10 +31,7 @@
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.entity.*;
import org.springblade.modules.task.service.ITaskPlaceRecordService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskPlaceRecordVO;
@@ -48,6 +45,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 +65,9 @@
@Override
public IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply) {
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply);
-
+ if (taskResidencePermitApply.getRoleName() != null && taskResidencePermitApply.getRoleName().equals("inhabitant")) {
+ taskResidencePermitApply.setCreateUser(AuthUtil.getUserId());
+ }
return page.setRecords(baseMapper.selectTaskResidencePermitApplyPage(page, taskResidencePermitApply,
commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
}
@@ -99,16 +99,22 @@
@Override
public Integer getCount(String neiCode, int i) {
+ TaskResidencePermitApplyVO taskResidencePermitApply = new TaskResidencePermitApplyVO();
+ taskResidencePermitApply.setCommunityCode(neiCode);
// 获取请求头中的角色别名
String roleName = SpringUtils.getRequestParam("roleName");
if (AuthUtils.isMj(roleName)) {
- return baseMapper.getCount(neiCode, i, AuthUtil.getUserId());
+ // todo 需要改造
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply);
+ return baseMapper.getCount(neiCode, i, AuthUtil.getUserId(),commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
}
return 0;
}
@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());
@@ -121,4 +127,26 @@
}
return b;
}
+
+ /**
+ * 居住证申请 删除
+ * @param toLongList
+ * @return
+ */
+ @Override
+ public boolean removeTaskResidencePermitApplyBatchByIds(List<Long> toLongList) {
+ boolean flag = false;
+ for (Long id : toLongList) {
+ // 先查询对应的任务id
+ TaskResidencePermitApplyEntity taskResidencePermitApplyEntity = getById(id);
+ // 删除居住证
+ flag = removeById(id);
+ if (flag) {
+ // 删除对应的任务
+ flag = taskService.removeById(taskResidencePermitApplyEntity.getTaskId());
+ }
+ }
+ // 返回
+ return flag;
+ }
}
--
Gitblit v1.9.3