From cb6efdef55c77da2bcc8dbd99a74e7e49c5ec067 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 05 Mar 2024 18:06:34 +0800
Subject: [PATCH] 邮件收件+bug修复+流程优化
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 0d8fac8..08c67f9 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -23,6 +23,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
@@ -46,10 +47,12 @@
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
+import org.springblade.modules.label.vo.LabelVO;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -86,9 +89,13 @@
@Override
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house, regionChildCodesList, isAdministrator);
+// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+// Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseVO.class,house);
+
+ List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house,
+ commonParamSet.getRegionChildCodesList(),commonParamSet.getGridCodeList(), commonParamSet.getIsAdministrator()
+ );
return page.setRecords(houseVOS);
}
@@ -328,8 +335,8 @@
if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
householdEntity.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
}
- householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
- householdEntity.setPassport(houseAndHoldExcel.getPassport());
+ // householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
+ // householdEntity.setPassport(houseAndHoldExcel.getPassport());
// 民族
if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
householdEntity.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
@@ -460,8 +467,8 @@
if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
one.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
}
- one.setHkmtPass(houseAndHoldExcel.getHkmtPass());
- one.setPassport(houseAndHoldExcel.getPassport());
+ // one.setHkmtPass(houseAndHoldExcel.getHkmtPass());
+ // one.setPassport(houseAndHoldExcel.getPassport());
// 民族
if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
one.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
@@ -688,16 +695,21 @@
}
@Override
- public List<Map<String, Object>> labelStatistics(HouseVO house) {
+ public List<Map<String, Object>> labelStatistics(HouseVO house) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- return baseMapper.labelStatistics(house,regionChildCodesList,isAdministrator);
+ return baseMapper.labelStatistics(house, regionChildCodesList, isAdministrator);
}
@Override
public List<Map<String, Object>> labelCommunityStatistics(HouseVO house) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- return baseMapper.labelCommunityStatistics(house,regionChildCodesList,isAdministrator);
+ List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, regionChildCodesList);
+ for (Map<String, Object> map : list) {
+ List<LabelVO> code = baseMapper.getlabelCount(house, regionChildCodesList, isAdministrator, map.get("code").toString());
+ map.put("child",code);
+ }
+ return list;
}
}
--
Gitblit v1.9.3