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 | 9 +++++++--
1 files changed, 7 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 96b5b52..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
@@ -98,7 +98,7 @@
}
@Override
- public Integer getCount(String neiCode, int i) {
+ public Integer getCount(String neiCode, int status) {
TaskResidencePermitApplyVO taskResidencePermitApply = new TaskResidencePermitApplyVO();
taskResidencePermitApply.setCommunityCode(neiCode);
// 获取请求头中的角色别名
@@ -106,11 +106,16 @@
if (AuthUtils.isMj(roleName)) {
// todo 需要改造
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply);
- return baseMapper.getCount(neiCode, i, AuthUtil.getUserId(),commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+ 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());
--
Gitblit v1.9.3