From 757a307e7e5da4b02b46a1bcef3d1a0b6b260be6 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 17:16:07 +0800
Subject: [PATCH] 取保候审菜单+居住证申请统计
---
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java | 4 +
src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java | 6 ++
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 2
src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java | 11 +++++
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 44 ++++++++++++++++++++--
5 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 5734262..222acc5 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -126,7 +126,7 @@
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
// 1:居民，居民需要通过人的标签来显示取保候审
if (CommonConstant.RESIDENT.equals(roleName)) {
- // extracted(labelType, roleMenus);
+ extracted(labelType, roleMenus);
}
}
// 顶部菜单请求返回对应角色权限菜单
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
index ca0f84c..c08e7d1 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
@@ -143,4 +143,15 @@
@TableField("jw_grid_code")
private String jwGridCode;
+
+ /** 房东名称 */
+ @ApiModelProperty(value = "房东名称", example = "")
+ @TableField("landlord_name")
+ private String landlordName;
+
+ /** 房东电话 */
+ @ApiModelProperty(value = "房东电话", example = "")
+ @TableField("landlord_phone")
+ private String landlordPhone;
+
}
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 ffc1ba5..bc0dabc 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.java
@@ -47,5 +47,7 @@
@Param("gridCodeList") List<String> gridCodeList);
- Integer getCount(String neiCode, int i, Long userId);
+ Integer getCount(String neiCode, int i, Long userId,@Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("gridCodeList") List<String> gridCodeList);
}
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 61f54d3..73f27ae 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -97,10 +97,46 @@
<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
+ from jczz_task_residence_permit_apply jtrpa
+ left join jczz_doorplate_address jda on jda.address_code = jtrpa.house_code
+ LEFT JOIN jczz_house jh on jh.house_code=jtrpa.house_code
+ left join jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
+ <where>
+ and jtrpa.is_deleted = 0
+ <if test="neiCode != null and neiCode != ''"> and jg.community_code = #{neiCode}</if>
+
+ <if test="isAdministrator==2">
+<!-- <if test="residen.roleType ==null ">-->
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jtrpa.jw_grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ </choose>
+
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and (
+ jg.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ </choose>
+<!-- </if>-->
+ </if>
+ </where>
</select>
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 ba1c633..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
@@ -99,10 +99,14 @@
@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;
}
--
Gitblit v1.9.3