From a7f2813fda788b63ad7757cd4a9a71b5fd212153 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 27 Jun 2024 17:15:17 +0800
Subject: [PATCH] 待办事项优化
---
src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java | 14 ++++
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java | 21 ++++++-
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 11 +++
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 7 ++
src/main/java/org/springblade/modules/place/service/IPlacePractitionerService.java | 7 ++
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 2
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 110 ++++++++++++++++++++++++++++++++++++
7 files changed, 166 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index da89249..770f07f 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -766,7 +766,7 @@
and jh.is_deleted = 0
</where>
order by jh.create_time desc
- limit 0,10000
+ limit 0,20000
</select>
@@ -783,6 +783,11 @@
<if test="household.communityCode != null and household.communityCode != ''">
and jg.community_code = #{household.communityCode}
</if>
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
+ </if>
<if test="household.confirmFlag != null">
and jh.confirm_flag = #{household.confirmFlag}
</if>
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 6246fa7..af93105 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -619,8 +619,8 @@
HouseholdVO householdVO = new HouseholdVO();
householdVO.setConfirmFlag(confirmFlag);
householdVO.setCommunityCode(neiCode);
+ householdVO.setUserId(AuthUtil.getUserId());
CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, householdVO);
-
return baseMapper.statistics(householdVO, commonParamSet.getIsAdministrator(),
commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList());
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
index 1d64b05..67d7355 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
@@ -16,12 +16,12 @@
*/
package org.springblade.modules.place.mapper;
-import liquibase.pro.packaged.S;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
import org.springblade.modules.place.vo.PlacePractitionerVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
import java.util.List;
/**
@@ -47,10 +47,25 @@
/**
* 统计数据
+ *
* @param placePractitioner
* @return
*/
Integer selectPlaceCountByType(@Param("placePractitioner") PlacePractitionerVO placePractitioner);
+ /**
+ * 统计审核从业人员
+ * @param placePractitioner
+ * @param gridCodeList
+ * @param regionChildCodesList
+ * @param isAdministrator
+ * @return
+ */
+ Integer selectPlacePractitionerCount(@Param("placePractitioner") PlacePractitionerVO placePractitioner,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
+
+
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
index abd5a64..c2bd26a 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -127,6 +127,7 @@
</choose>
</if>
and jpp.is_deleted = 0
+ GROUP BY jpp.place_id
order by jpp.id desc
</where>
</select>
@@ -218,4 +219,113 @@
</select>
+ <select id="selectPlacePractitionerCount" resultType="java.lang.Integer">
+ SELECT count(1) from ( SELECT
+ count(1)
+ FROM
+ jczz_place_practitioner jpp
+ LEFT JOIN jczz_place jp ON jp.id = jpp.place_id
+ LEFT JOIN jczz_place_poi_label jppl on jppl.place_id = jp.id and type = 3
+ LEFT JOIN jczz_category jc on jc.category_no = jppl.poi_code
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+ left join blade_region br on br.code = jpag.community_code
+ <where>
+ <if test="placePractitioner.townStreetName!=null and placePractitioner.townStreetName!=''">
+ and br.town_name like concat('%',#{placePractitioner.townStreetName},'%')
+ </if>
+ <if test="placePractitioner.neiName!=null and placePractitioner.neiName!=''">
+ and br.name like concat('%',#{placePractitioner.neiName},'%')
+ </if>
+ <if test="placePractitioner.id != null ">and jpp.id = #{placePractitioner.id}</if>
+ <if test="placePractitioner.placeId != null ">and jpp.place_id = #{placePractitioner.placeId}</if>
+ <if test="placePractitioner.name != null and placePractitioner.name != ''">and jpp.name like concat('%',
+ #{placePractitioner.name},'%')
+
+ </if>
+ <if test="placePractitioner.telephone != null and placePractitioner.telephone != ''">and jpp.telephone like
+ concat('%', #{placePractitioner.telephone},'%')
+ </if>
+ <if test="placePractitioner.tempAddress != null and placePractitioner.tempAddress != ''">and
+ jpp.temp_address =
+ #{placePractitioner.tempAddress}
+ </if>
+ <if test="placePractitioner.age != null ">and jpp.age = #{placePractitioner.age}</if>
+ <if test="placePractitioner.gender != null ">and jpp.gender = #{placePractitioner.gender}</if>
+ <if test="placePractitioner.idCard != null and placePractitioner.idCard != ''">and jpp.id_card =
+ #{placePractitioner.idCard}
+ </if>
+ <if test="placePractitioner.resignationFlag != null and placePractitioner.resignationFlag !='' ">
+ and jpp.resignation_flag = #{placePractitioner.resignationFlag}
+ </if>
+
+ <if test="placePractitioner.employerImg != null and placePractitioner.employerImg != ''">and
+ jpp.employer_img =
+ #{placePractitioner.employerImg}
+ </if>
+
+ <if test="placePractitioner.createTime != null ">and jpp.create_time = #{placePractitioner.createTime}</if>
+ <if test="placePractitioner.ethnicity != null ">and jpp.ethnicity = #{placePractitioner.ethnicity}</if>
+
+ <if test="placePractitioner.confirmUserId != null ">and confirm_user_id =
+ #{placePractitioner.confirmUserId}
+ </if>
+ <if test="placePractitioner.confirmFlag != null ">and confirm_flag = #{placePractitioner.confirmFlag}</if>
+ <if test="placePractitioner.confirmTime != null ">and confirm_time = #{placePractitioner.confirmTime}</if>
+ <if test="placePractitioner.confirmNotion != null and placePractitioner.confirmNotion != ''">and
+ confirm_notion = #{placePractitioner.confirmNotion}
+ </if>
+
+ <if test="placePractitioner.type == 1">
+ and TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) < 18
+ and jc.category_no in (180202,180201,180200)
+ </if>
+ <if test="placePractitioner.type == 2">
+ and jpp.ethnicity != 1
+ and jc.category_no in (180202,180201,180200)
+ </if>
+ <if test="placePractitioner.type == 3">
+ and (TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) < 18 or jpp.ethnicity != 1)
+ and jc.category_no in (180202,180201,180200)
+ </if>
+
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="placePractitioner.roleName != null and placePractitioner.roleName != ''">
+ <if test="placePractitioner.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="placePractitioner.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </when>
+ </choose>
+ </if>
+ and jpp.is_deleted = 0
+ GROUP BY jpp.place_id
+ ) a
+ </where>
+ </select>
+
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/place/service/IPlacePractitionerService.java b/src/main/java/org/springblade/modules/place/service/IPlacePractitionerService.java
index f0582c9..c63abe5 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlacePractitionerService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlacePractitionerService.java
@@ -53,4 +53,11 @@
Boolean auditing(PlacePractitionerEntity placePractitioner);
String importPractitioner(List<ImportPractitionerExcel> read, boolean b);
+
+ /**
+ * 统计审核从业人员
+ * @param placePractitioner
+ * @return
+ */
+ public Integer selectPlacePractitionerCount( PlacePractitionerVO placePractitioner);
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java
index b447da4..97aa44e 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java
@@ -127,4 +127,18 @@
}
return builder.toString();
}
+
+ /**
+ * 统计审核从业人员
+ * @param placePractitioner
+ * @return
+ */
+ @Override
+ public Integer selectPlacePractitionerCount( PlacePractitionerVO placePractitioner) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlacePractitionerVO.class, placePractitioner);
+ Integer result = baseMapper.selectPlacePractitionerCount(placePractitioner, commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
+ return result;
+ }
}
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 aaaae9c..a266572 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
@@ -43,7 +43,9 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceExtService;
+import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.sms.service.ISmsSendService;
import org.springblade.modules.task.entity.*;
@@ -291,12 +293,18 @@
long xyyh = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
// 校园纠纷矛盾
taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
- long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);;
+ long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
+ ;
taskVO.setReportType(CommonConstant.NUMBER_FOUR);
// 校园安全检查
Integer xyaqjc = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+ PlacePractitionerVO placePractitionerVO = new PlacePractitionerVO();
+ placePractitionerVO.setConfirmFlag(CommonConstant.NUMBER_ONE);
+ // 从业人员审核
+ Integer cyrysh = SpringUtils.getBean(IPlacePractitionerService.class).selectPlacePractitionerCount(placePractitionerVO);
+
// 设置
objectObjectHashMap.put("qbhs", qbhs);// 取保候审
objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -313,6 +321,7 @@
objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
objectObjectHashMap.put("xyaqjc", xyaqjc);// 校园安全检查
+ objectObjectHashMap.put("cyrysh", cyrysh);// 从业人员审核
return objectObjectHashMap;
}
--
Gitblit v1.9.3