|
@@ -43,6 +43,7 @@ import java.sql.Timestamp;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.boman.common.core.utils.StringUtils.isNotEmpty;
|
|
|
import static com.boman.common.core.utils.fieldTranslator.IdCardUtils.getSex;
|
|
@@ -103,6 +104,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
/**
|
|
|
* 2022/3/24修复人员认领中常住人员接口列表,逻辑:所有人都能看到所有没有确认,没有认领的人员
|
|
|
+ *
|
|
|
* @param czrk
|
|
|
* @return
|
|
|
*/
|
|
@@ -135,7 +137,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
String villageTownsId = czrk.getVillageTownsIdXjd();
|
|
|
String villageId = czrk.getVillageIdXjd();
|
|
|
//设置查询列表权限
|
|
|
- setQueryRole(czrk,sysUser,Czrk.HJ);
|
|
|
+ setQueryRole(czrk, sysUser, Czrk.HJ);
|
|
|
//如果查询参数有居住地址,进行连表查询
|
|
|
if (StringUtils.isNotBlank(provinceId) || StringUtils.isNotBlank(cityId) || StringUtils.isNotBlank(regionId) || StringUtils.isNotBlank(villageTownsId) || StringUtils.isNotBlank(villageId)) {
|
|
|
long startTimeSql = System.currentTimeMillis();
|
|
@@ -168,7 +170,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
setAgeScope(czrk);
|
|
|
|
|
|
//设置权限
|
|
|
- setQueryRole(czrk,sysUser,Czrk.HJ);
|
|
|
+ setQueryRole(czrk, sysUser, Czrk.HJ);
|
|
|
startPage();
|
|
|
long startTimeSql = System.currentTimeMillis();
|
|
|
List<Czrk> czrks = czrkMapper.unusualList(czrk);
|
|
@@ -369,7 +371,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
|
|
|
if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
|
|
|
//一开始就判断是否是户籍和所有居住地址是否都不在权限之下
|
|
|
- if (setInsertRole(czrk,sysUser)) {
|
|
|
+ if (setInsertRole(czrk, sysUser)) {
|
|
|
return AjaxResult.error(HttpStatus.NOT_IMPLEMENTED, "当前填写的户籍地址和居住地址均不属于权限范围");
|
|
|
}
|
|
|
String houseType = czrk.getHouseType();
|
|
@@ -431,7 +433,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
|
|
|
if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
|
|
|
//一开始就判断是否是户籍和所有居住地址是否都不在权限之下
|
|
|
- if (setInsertRole(czrk,sysUser)) {
|
|
|
+ if (setInsertRole(czrk, sysUser)) {
|
|
|
return AjaxResult.error(HttpStatus.NOT_IMPLEMENTED, "当前填写的户籍地址和居住地址均不属于权限范围");
|
|
|
}
|
|
|
//看是否是户主,且有户主号需要去查看该家庭是否有户主
|
|
@@ -480,7 +482,8 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
czrkJzdz.setSort(++sort);
|
|
|
czrkJzdz.setUserName(czrk.getUserName());
|
|
|
czrkJzdz.setIdCard(czrk.getIdCard());
|
|
|
- czrkJzdz.setCreateBy(username);;
|
|
|
+ czrkJzdz.setCreateBy(username);
|
|
|
+ ;
|
|
|
childCount += czrkJzdzService.insertCzrkJzdz(czrkJzdz);
|
|
|
}
|
|
|
|
|
@@ -640,7 +643,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
/**
|
|
|
* 2022/3/24修改的根据czrkId查询该用户信息
|
|
|
*
|
|
|
- * @param
|
|
|
+ * @param s
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
@@ -774,6 +777,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
/**
|
|
|
* 功能描述: 人员认领菜单中认领接口
|
|
|
+ *
|
|
|
* @param czrk
|
|
|
* @return
|
|
|
*/
|
|
@@ -785,7 +789,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
|
|
|
if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
|
|
|
//一开始就判断是否是户籍和所有居住地址是否都不在权限之下
|
|
|
- if (setInsertRole(czrk,sysUser)) {
|
|
|
+ if (setInsertRole(czrk, sysUser)) {
|
|
|
return AjaxResult.error(HttpStatus.NOT_IMPLEMENTED, "当前填写的户籍地址和居住地址均不属于权限范围,请先修改后认领");
|
|
|
}
|
|
|
//看是否是户主,且有户主号需要去查看该家庭是否有户主
|
|
@@ -822,63 +826,55 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 小程序接口统计认领人员
|
|
|
+ * 2022/3/25修改小程序接口统计认领人员
|
|
|
*
|
|
|
- * @param provinceId
|
|
|
- * @param cityId
|
|
|
- * @param regionId
|
|
|
- * @param townId
|
|
|
- * @param villageId
|
|
|
- * @param idCard
|
|
|
- * @param userName
|
|
|
- * @param queryType
|
|
|
- * @param houseType
|
|
|
- * @param isConfirm
|
|
|
+ * @param czrk
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String userName, String queryType, String houseType, String isConfirm) {
|
|
|
- //todo 需要增加用户权限,根据sys_dept表中area_id来进行关联
|
|
|
- Long areaId = null;
|
|
|
- int type = 0, yrl = 0, wrl = 0;
|
|
|
- if (ObjectUtils.isNotEmpty(provinceId)) {
|
|
|
- areaId = provinceId;
|
|
|
- type = 1;
|
|
|
- } else if (ObjectUtils.isNotEmpty(cityId)) {
|
|
|
- areaId = cityId;
|
|
|
- type = 2;
|
|
|
- } else if (ObjectUtils.isNotEmpty(regionId)) {
|
|
|
- areaId = regionId;
|
|
|
- type = 3;
|
|
|
- } else if (ObjectUtils.isNotEmpty(townId)) {
|
|
|
- areaId = townId;
|
|
|
- type = 4;
|
|
|
- } else if (ObjectUtils.isNotEmpty(villageId)) {
|
|
|
- areaId = villageId;
|
|
|
- type = 5;
|
|
|
- }
|
|
|
-
|
|
|
+ public JSONObject stsByApplet(Czrk czrk) {
|
|
|
+ SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
|
|
|
+ log.info("{}于{}人员认领:{}"
|
|
|
+ , sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
|
+ String queryType = czrk.getQueryType();
|
|
|
+ long total = 0, yrl = 0, wrl = 0;
|
|
|
+ //搜索常住人口全部未认领人员需要在设置权限之前
|
|
|
+ wrl = czrkMapper.stsByWrl(czrk);
|
|
|
+ //设置查询权限
|
|
|
+ setQueryRole(czrk, sysUser, queryType);
|
|
|
+ //拆分搜索接口中年龄字段
|
|
|
+ setAgeScope(czrk);
|
|
|
if (Czrk.HJ.equals(queryType)) {
|
|
|
- // 户籍
|
|
|
- //todo areaId不能是Long类型改为String 不然走不上索引
|
|
|
- yrl = czrkMapper.stsByYrl(type, areaId, idCard, userName, houseType, isConfirm);
|
|
|
- wrl = czrkMapper.stsByWrl(type, areaId, idCard, userName, houseType, isConfirm);
|
|
|
- } else {
|
|
|
- // 常住
|
|
|
- List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, idCard, userName, houseType, isConfirm);
|
|
|
- for (Czrk czrk : rls) {
|
|
|
- if ("是".equals(czrk.getIsRl())) {
|
|
|
- yrl++;
|
|
|
- } else if ("否".equals(czrk.getIsRl())) {
|
|
|
- wrl++;
|
|
|
- }
|
|
|
+ //获取到居住地的查询条件
|
|
|
+ String provinceId = czrk.getProvinceIdXjd();
|
|
|
+ String cityId = czrk.getCityIdXjd();
|
|
|
+ String regionId = czrk.getRegionIdXjd();
|
|
|
+ String villageTownsId = czrk.getVillageTownsIdXjd();
|
|
|
+ String villageId = czrk.getVillageIdXjd();
|
|
|
+ List<Czrk> czrks = new ArrayList<>();
|
|
|
+ //如果查询参数有居住地址,进行连表查询
|
|
|
+ if (StringUtils.isNotBlank(provinceId) || StringUtils.isNotBlank(cityId) || StringUtils.isNotBlank(regionId) || StringUtils.isNotBlank(villageTownsId) || StringUtils.isNotBlank(villageId)) {
|
|
|
+ czrks = czrkMapper.listCzrkByJzdz(czrk);
|
|
|
+ } else {
|
|
|
+ //没有搜索居住地址的条件,进行单表查询
|
|
|
+ czrks = czrkMapper.listByCzrk(czrk);
|
|
|
+ }
|
|
|
+ if (czrks != null && czrks.size() > 0){
|
|
|
+ //户籍人口全部人员
|
|
|
+ total = czrks.size();
|
|
|
+ //户籍人口已认领
|
|
|
+ yrl = czrks.stream().filter(e -> StringUtils.isNotBlank(e.getIsRl()) && "是".equals(e.getIsRl())).count();
|
|
|
}
|
|
|
+ } else {
|
|
|
+ //常住人口全部人员
|
|
|
+ total = czrkMapper.stsByAll(czrk);
|
|
|
+ //常住人口已认领
|
|
|
+ yrl = czrkMapper.stsByYrl(czrk);
|
|
|
}
|
|
|
-
|
|
|
JSONObject result = new JSONObject(3);
|
|
|
result.put("yrl", yrl);
|
|
|
result.put("wrl", wrl);
|
|
|
- result.put("total", wrl + yrl);
|
|
|
+ result.put("total", total);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
@@ -1062,7 +1058,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//查找潜山市户籍人口总数
|
|
|
List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
|
|
|
- if(czrkList==null){
|
|
|
+ if (czrkList == null) {
|
|
|
czrkList = new ArrayList<>();
|
|
|
}
|
|
|
//潜山市户籍人口总数
|
|
@@ -1075,14 +1071,14 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//循环所有人判断当前总人数,该镇 户籍人口今日新增,该镇 户籍人口今日减少
|
|
|
for (Czrk czrk : czrkList) {
|
|
|
- if("Y".equals(czrk.getIsDel())){
|
|
|
+ if ("Y".equals(czrk.getIsDel())) {
|
|
|
hjzrs--;
|
|
|
}
|
|
|
//判断是否是在今天操作的人员信息
|
|
|
- if(s.before(czrk.getCreateTime()) && czrk.getCreateTime().before(e)){
|
|
|
- if("Y".equals(czrk.getIsDel())){
|
|
|
+ if (s.before(czrk.getCreateTime()) && czrk.getCreateTime().before(e)) {
|
|
|
+ if ("Y".equals(czrk.getIsDel())) {
|
|
|
hjjs++;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
hjxz++;
|
|
|
}
|
|
|
}
|
|
@@ -1098,7 +1094,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//查找潜山市常驻人口信息
|
|
|
List<CzrkJzdz> czrkJzdzList = czrkJzdzService.selectCzrkJzdzListByRegionId("340882000000");
|
|
|
- if(czrkJzdzList==null){
|
|
|
+ if (czrkJzdzList == null) {
|
|
|
czrkJzdzList = new ArrayList<>();
|
|
|
}
|
|
|
//潜山市居住人口总数
|
|
@@ -1111,14 +1107,14 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//循环所有人判断当前总人数,该镇 户籍人口今日新增,该镇 户籍人口今日减少
|
|
|
for (CzrkJzdz czrkJzdz : czrkJzdzList) {
|
|
|
- if("N".equals(czrkJzdz.getStatus())){
|
|
|
+ if ("N".equals(czrkJzdz.getStatus())) {
|
|
|
czzrs--;
|
|
|
}
|
|
|
//判断是否是在今天操作的人员信息
|
|
|
- if(s.before(czrkJzdz.getCreateTime()) && czrkJzdz.getCreateTime().before(e)){
|
|
|
- if("N".equals(czrkJzdz.getStatus())){
|
|
|
+ if (s.before(czrkJzdz.getCreateTime()) && czrkJzdz.getCreateTime().before(e)) {
|
|
|
+ if ("N".equals(czrkJzdz.getStatus())) {
|
|
|
czjs++;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
czxz++;
|
|
|
}
|
|
|
}
|
|
@@ -1154,7 +1150,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
for (SysDept townsDept : townsDepts) {
|
|
|
JSONObject townsResult = new JSONObject(16);
|
|
|
///townSts(townsResult, townsDept.getId(), townsDept.getDeptName(), false);
|
|
|
- townSts(townsResult, townsDept, czrkList, czrkJzdzList,hjzrs, czzrs);
|
|
|
+ townSts(townsResult, townsDept, czrkList, czrkJzdzList, hjzrs, czzrs);
|
|
|
towsDataList.add(townsResult);
|
|
|
}
|
|
|
|
|
@@ -1176,33 +1172,33 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//查找潜山市户籍人口总数
|
|
|
List<Czrk> czrkList = czrkMapper.getAllCzrkRegionId("340882000000");
|
|
|
- if(czrkList==null){
|
|
|
+ if (czrkList == null) {
|
|
|
czrkList = new ArrayList<>();
|
|
|
}
|
|
|
//潜山市户籍人口总数
|
|
|
int hjzrs = czrkList.size();
|
|
|
//循环所有人判断当前总人数,该镇 户籍人口今日新增,该镇 户籍人口今日减少
|
|
|
for (Czrk czrk : czrkList) {
|
|
|
- if("Y".equals(czrk.getIsDel())){
|
|
|
+ if ("Y".equals(czrk.getIsDel())) {
|
|
|
hjzrs--;
|
|
|
}
|
|
|
}
|
|
|
//查找潜山市常驻人口信息
|
|
|
List<CzrkJzdz> czrkJzdzList = czrkJzdzService.selectCzrkJzdzListByRegionId("340882000000");
|
|
|
- if(czrkJzdzList==null){
|
|
|
+ if (czrkJzdzList == null) {
|
|
|
czrkJzdzList = new ArrayList<>();
|
|
|
}
|
|
|
//潜山市居住人口总数
|
|
|
int czzrs = czrkJzdzList.size();
|
|
|
//循环所有人判断当前总人数,该镇 户籍人口今日新增,该镇 户籍人口今日减少
|
|
|
for (CzrkJzdz czrkJzdz : czrkJzdzList) {
|
|
|
- if("N".equals(czrkJzdz.getStatus())){
|
|
|
+ if ("N".equals(czrkJzdz.getStatus())) {
|
|
|
czzrs--;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
- townSts(result, sysUser.getDept(), czrkList, czrkJzdzList,hjzrs, czzrs);
|
|
|
+ townSts(result, sysUser.getDept(), czrkList, czrkJzdzList, hjzrs, czzrs);
|
|
|
// redisService.setCacheObject(packRedisKey("town:" + deptId), result, 1L, TimeUnit.DAYS);
|
|
|
setIntoRedis(packRedisKey("town:" + deptId), result);
|
|
|
});
|
|
@@ -1248,7 +1244,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- private void townSts(JSONObject result, SysDept sysDept, List<Czrk> czrkList, List<CzrkJzdz> czrkJzdzList ,int shjzrs, int sczzrs) {
|
|
|
+ private void townSts(JSONObject result, SysDept sysDept, List<Czrk> czrkList, List<CzrkJzdz> czrkJzdzList, int shjzrs, int sczzrs) {
|
|
|
String startTime = DateUtils.getTodayStartStr();
|
|
|
String endTime = DateUtils.getTodayEndStr();
|
|
|
Timestamp s = Timestamp.valueOf(startTime);
|
|
@@ -1284,7 +1280,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
zrs = czrkMapper.countAll();
|
|
|
}*/
|
|
|
|
|
|
- if(czrkList==null){
|
|
|
+ if (czrkList == null) {
|
|
|
czrkList = new ArrayList<>();
|
|
|
}
|
|
|
//该镇户籍人口总数
|
|
@@ -1297,15 +1293,15 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//循环所有人判断当前总人数,该镇 户籍人口今日新增,该镇 户籍人口今日减少
|
|
|
for (Czrk czrk : czrkList) {
|
|
|
- if(StringUtils.isNotEmpty(czrk.getVillageTownsId()) && String.valueOf(czrk.getVillageTownsId()).equals(areaId)){
|
|
|
- if("N".equals(czrk.getIsDel())){
|
|
|
+ if (StringUtils.isNotEmpty(czrk.getVillageTownsId()) && String.valueOf(czrk.getVillageTownsId()).equals(areaId)) {
|
|
|
+ if ("N".equals(czrk.getIsDel())) {
|
|
|
hjzrs++;
|
|
|
}
|
|
|
//判断是否是在今天操作的人员信息
|
|
|
- if(s.before(czrk.getCreateTime()) && czrk.getCreateTime().before(e)){
|
|
|
- if("Y".equals(czrk.getIsDel())){
|
|
|
+ if (s.before(czrk.getCreateTime()) && czrk.getCreateTime().before(e)) {
|
|
|
+ if ("Y".equals(czrk.getIsDel())) {
|
|
|
hjjs++;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
hjxz++;
|
|
|
}
|
|
|
}
|
|
@@ -1317,7 +1313,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
result.put("hjbfb", NumberUtils.percent(hjzrs, shjzrs));
|
|
|
|
|
|
|
|
|
- if(czrkJzdzList==null){
|
|
|
+ if (czrkJzdzList == null) {
|
|
|
czrkJzdzList = new ArrayList<>();
|
|
|
}
|
|
|
//该镇户籍人口总数
|
|
@@ -1330,15 +1326,15 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
//循环所有人判断当前总人数,该镇 户籍人口今日新增,该镇 户籍人口今日减少
|
|
|
for (CzrkJzdz czrkJzdz : czrkJzdzList) {
|
|
|
- if(StringUtils.isNotEmpty(czrkJzdz.getTownId()) && czrkJzdz.getTownId().equals(areaId)){
|
|
|
- if("Y".equals(czrkJzdz.getStatus())){
|
|
|
+ if (StringUtils.isNotEmpty(czrkJzdz.getTownId()) && czrkJzdz.getTownId().equals(areaId)) {
|
|
|
+ if ("Y".equals(czrkJzdz.getStatus())) {
|
|
|
czzrs++;
|
|
|
}
|
|
|
//判断是否是在今天操作的人员信息
|
|
|
- if(s.before(czrkJzdz.getCreateTime()) && czrkJzdz.getCreateTime().before(e)){
|
|
|
- if("N".equals(czrkJzdz.getStatus())){
|
|
|
+ if (s.before(czrkJzdz.getCreateTime()) && czrkJzdz.getCreateTime().before(e)) {
|
|
|
+ if ("N".equals(czrkJzdz.getStatus())) {
|
|
|
czjs++;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
czxz++;
|
|
|
}
|
|
|
}
|
|
@@ -1514,7 +1510,11 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
result.put("czbfb", NumberUtils.percent(czzrs, zrs));*//*
|
|
|
|
|
|
result.put("zhen", deptName);
|
|
|
- *//** **//*
|
|
|
+ */
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ **//*
|
|
|
|
|
|
|
|
|
// 常住人口信息
|
|
@@ -1552,7 +1552,6 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
// String hjbfb = NumberUtils.percent(hjzrs, zrs);
|
|
|
// result.put("hjbfb", hjbfb);
|
|
|
}*/
|
|
|
-
|
|
|
@Override
|
|
|
public JSONObject hjczLine() {
|
|
|
JSONObject resultData = new JSONObject(5);
|