From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 2 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 5351033..22719e6 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
@@ -16,14 +16,38 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
+import org.apache.commons.lang3.StringUtils;
+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;
+import org.springblade.modules.house.entity.HouseEntity;
+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.*;
+import org.springblade.modules.task.service.ITaskPlaceRecordService;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskPlaceRecordVO;
+import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import org.springblade.modules.task.mapper.TaskResidencePermitApplyMapper;
import org.springblade.modules.task.service.ITaskResidencePermitApplyService;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 居住证申请 服务实现类
@@ -34,10 +58,100 @@
@Service
public class TaskResidencePermitApplyServiceImpl extends ServiceImpl<TaskResidencePermitApplyMapper, TaskResidencePermitApplyEntity> implements ITaskResidencePermitApplyService {
+ @Resource
+ @Lazy
+ private ITaskService taskService;
+
@Override
public IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply) {
- return page.setRecords(baseMapper.selectTaskResidencePermitApplyPage(page, 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()));
}
+ @Override
+ public Boolean saveResidencePermitApplyEntity(TaskResidencePermitApplyEntity permitApply) {
+ permitApply.setCreateUser(AuthUtil.getUserId());
+ // 1.保存任务表
+ ITaskService taskService = SpringUtils.getBean(ITaskService.class);
+ Long aLong = taskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.RESIDENCE_PERMIT_APPLICATION, 1,
+ "", AuthUtil.getUserId(), permitApply.getHouseCode(), CommonConstant.NUMBER_TWO, 1);
+ if (aLong <= 0) {
+ return false;
+ }
+ if (StringUtils.isNotBlank(permitApply.getHouseCode())) {
+ // 设置网格编码
+ IHouseService houseService = SpringUtils.getBean(IHouseService.class);
+ HouseEntity houseEntity = houseService.getOne(Wrappers.<HouseEntity>lambdaQuery()
+ .eq(HouseEntity::getHouseCode, permitApply.getHouseCode()));
+ permitApply.setGridCode(houseEntity.getGridCode());
+ permitApply.setJwGridCode(houseEntity.getJwGridCode());
+ }
+ permitApply.setTaskId(aLong);
+ // 2.保存任务详情
+ boolean save = save(permitApply);
+ return save;
+ }
+
+ @Override
+ public Integer getCount(String neiCode, int status) {
+ TaskResidencePermitApplyVO taskResidencePermitApply = new TaskResidencePermitApplyVO();
+ taskResidencePermitApply.setCommunityCode(neiCode);
+ // 获取请求头中的角色别名
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (AuthUtils.isMj(roleName)) {
+ // todo 需要改造
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply);
+ return baseMapper.getCount(neiCode, status, AuthUtil.getUserId(),commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+ }
+ return 0;
+ }
+
+ /**
+ * 居住证申请 审核
+ * @param taskResidencePermitApply
+ * @return
+ */
+ @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());
+ // 更新任务表状态
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setId(entity.getTaskId());
+ taskEntity.setStatus(taskResidencePermitApply.getConfirmFlag());
+ b = taskService.updateById(taskEntity);
+ return b;
+ }
+ 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