From ff222509d4be77f97bde0c89a7e48dc5cba2412b Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 15:30:23 +0800
Subject: [PATCH] 居住证审核
---
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java | 2 +
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 4 -
src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java | 10 +++++
src/main/java/org/springblade/modules/task/service/ITaskResidencePermitApplyService.java | 15 +++++++
src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java | 28 ++++++++++++++
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 10 +++++
6 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
index 76f6ccc..27d2c22 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
@@ -102,6 +102,16 @@
}
/**
+ * 居住证申请 审核
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply")
+ public R updateResidencePermitApply(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ return R.status(taskResidencePermitApplyService.updateResidencePermitApplyEntity(taskResidencePermitApply));
+ }
+
+ /**
* 居住证申请 新增或修改
*/
@PostMapping("/submit")
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java
index d40f6bc..ffc1ba5 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java
@@ -22,6 +22,7 @@
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
import java.util.List;
/**
@@ -46,4 +47,5 @@
@Param("gridCodeList") List<String> gridCodeList);
+ Integer getCount(String neiCode, int i, Long userId);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
index d632397..119554f 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -92,6 +92,16 @@
</where>
</select>
+
+ <select id="getCount" resultType="java.lang.Integer">
+ SELECT count(1)
+ FROM jczz_task_residence_permit_apply jtrpa
+ WHERE jtrpa.jw_grid_code IN
+ (SELECT jpag.jw_grid_code FROM jczz_police_affairs_grid jpag WHERE jpag.police_user_id like concat('%',${userId},'%') )
+ AND jtrpa.`confirm_flag` = 1
+
+ </select>
+
<resultMap type="org.springblade.modules.task.dto.TaskResidencePermitApplyDTO"
id="TaskResidencePermitApplyDTOResult">
<result property="id" column="id"/>
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskResidencePermitApplyService.java b/src/main/java/org/springblade/modules/task/service/ITaskResidencePermitApplyService.java
index 8db4390..3d1731c 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskResidencePermitApplyService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskResidencePermitApplyService.java
@@ -45,4 +45,19 @@
* @return
*/
Boolean saveResidencePermitApplyEntity(TaskResidencePermitApplyEntity taskResidencePermitApply);
+
+ /**
+ * 统计数量
+ * @param neiCode
+ * @param i
+ * @return
+ */
+ Integer getCount(String neiCode, int i);
+
+ /**
+ * 审核
+ * @param taskResidencePermitApply
+ * @return
+ */
+ Boolean updateResidencePermitApplyEntity(TaskResidencePermitApplyEntity taskResidencePermitApply);
}
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 05d003c..2c4d533 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
@@ -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;
+ }
}
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index b2a4ef6..d822729 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -246,9 +246,7 @@
// 消防隐患整改
Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
// 居住证申请
- taskVO.setReportType(2);
- Integer jzzsq = baseMapper.selectTaskCount(taskVO,commonParamSet.getRegionChildCodesList(),
- commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
+ Integer jzzsq = SpringUtils.getBean(ITaskResidencePermitApplyService.class).getCount(neiCode, 1);
// 设置
objectObjectHashMap.put("qbhs", qbhs);// 取保候审
objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
--
Gitblit v1.9.3