src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -105,6 +105,7 @@ userTopics.setPublicDiscussId(topic.getPublicDiscussId()); userTopics.setArticleId(topic.getArticleId()); userTopics.setHouseCode(topic.getHouseCode()); userTopics.setSignaturePath(topic.getSignaturePath()); UpdateWrapper<TopicsEntity> objectUpdateWrapper = new UpdateWrapper<>(); objectUpdateWrapper.setSql("number = number + 1"); objectUpdateWrapper.eq("id", topic.getSelected()); @@ -124,10 +125,11 @@ userTopics.setPublicDiscussId(topic.getPublicDiscussId()); userTopics.setArticleId(topic.getArticleId()); userTopics.setHouseCode(topic.getHouseCode()); userTopics.setSignaturePath(topic.getSignaturePath()); objectsTwo.add(userTopics); UpdateWrapper<TopicsEntity> objectUpdateWrapper = new UpdateWrapper<>(); objectUpdateWrapper.setSql("number = number + 1"); objectUpdateWrapper.eq("id", o); objectsTwo.add(userTopics); topicsService.update(null, objectUpdateWrapper); } return save(objectsTwo.get(0)); src/main/java/org/springblade/modules/discuss/vo/TopicsVO.java
@@ -38,4 +38,6 @@ private String houseCode; private String signaturePath; } src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
@@ -178,14 +178,24 @@ /** * 住户-标签 自定义分页 * */ @GetMapping("/statisticalLabels") @GetMapping("/getRegionStatisticalLabels") @ApiOperation(value = "统计标签", notes = "") public R<IPage<HouseholdLabelVO>> statisticalLabels(HouseholdLabelVO householdLabel, Query query) { IPage<HouseholdLabelVO> pages = householdLabelService.statisticalLabels(Condition.getPage(query), householdLabel); return R.data(pages); } /** * */ @GetMapping("/getCommunityStatisticalLabels") @ApiOperation(value = "统计标签", notes = "") public R<IPage<HouseholdLabelVO>> getCommunityStatisticalLabels(HouseholdLabelVO householdLabel, Query query) { IPage<HouseholdLabelVO> pages = householdLabelService.getCommunityStatisticalLabels(Condition.getPage(query), householdLabel); return R.data(pages); } } src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -122,5 +122,5 @@ */ List<HouseholdVO> selectHouseholdList(@Param("household") HouseholdVO household); List<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, HouseholdVO household); List<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, @Param("household") HouseholdVO household); } src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -718,7 +718,7 @@ </select> <select id="getKeynotePersonnelPage" resultType="org.springblade.modules.house.vo.HouseholdVO"> <select id="getKeynotePersonnelPage" resultMap="householdPageAndLabelMap"> SELECT jh.id, @@ -828,6 +828,18 @@ <if test="household.aoiCode!=null and household.aoiCode!=''"> and jhs.district_code = #{household.aoiCode} </if> AND EXISTS ( SELECT * FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.parent_id = 103 AND juhl.household_id = jh.id AND juhl.label_id IS NOT NULL ) and jh.is_deleted = 0 order by jh.create_time desc </where> src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.java
@@ -44,4 +44,6 @@ List<Integer> getUserLabelList(UserHouseLabelDTO userHouseLabelDTO); List<HouseholdLabelVO> statisticalLabels(IPage page, HouseholdLabelVO householdLabel); List<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel); } src/main/java/org/springblade/modules/house/mapper/UserHouseLabelMapper.xml
@@ -86,11 +86,121 @@ <select id="statisticalLabels" resultType="org.springblade.modules.house.vo.HouseholdLabelVO" parameterType="org.springblade.modules.house.vo.HouseholdLabelVO"> SELECT SELECT br.region_level, br.`code` regionCode, br.NAME regionName, jc.`street_code`, jc.NAME communityName, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '19' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id LEFT JOIN jczz_community jc on jc.`code` = jg.community_code WHERE br.`code` = jc.`street_code` )) number1,( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '20' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id LEFT JOIN jczz_community jc on jc.`code` = jg.community_code WHERE br.`code` = jc.`street_code` )) number2, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '22' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id LEFT JOIN jczz_community jc on jc.`code` = jg.community_code WHERE br.`code` = jc.`street_code` )) number3, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '23' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id LEFT JOIN jczz_community jc on jc.`code` = jg.community_code WHERE br.`code` = jc.`street_code` )) number4, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '1025' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id LEFT JOIN jczz_community jc on jc.`code` = jg.community_code WHERE br.`code` = jc.`street_code` )) number5 FROM `blade_region` br WHERE br.region_level = 4 AND br.city_code = 3611 </select> <select id="getCommunityStatisticalLabels" resultType="org.springblade.modules.house.vo.HouseholdLabelVO"> SELECT jc.NAME communityName, jc.code communityCode, ( SELECT @@ -100,7 +210,82 @@ LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.parent_id = '103' AND jl.id = '19' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jc.`code` = jg.community_code )) number1,( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '20' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jc.`code` = jg.community_code )) number2, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '22' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jc.`code` = jg.community_code )) number3, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '23' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT jgr.house_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jc.`code` = jg.community_code )) number4, ( SELECT count( 1 ) FROM jczz_user_house_label juhl LEFT JOIN jczz_label jl ON juhl.label_id = jl.id WHERE juhl.lable_type = 1 AND jl.id = '1025' AND juhl.household_id IS NOT NULL AND juhl.house_code IN ( SELECT @@ -109,13 +294,14 @@ jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jc.`code` = jg.community_code )) numbers jc.`code` = jg.community_code )) number5 FROM jczz_community jc LEFT JOIN `blade_region` br ON br.`code` = jc.`street_code` `jczz_community` jc WHERE jc.street_code IS NOT NULL jc.street_code = #{householdLabel.regionCode} </select>
@@ -56,4 +56,6 @@ void importUserHouseLabel(List<UserHouseLabelExcel> data, Boolean isCovered); IPage<HouseholdLabelVO> statisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel); IPage<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel); } src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
@@ -54,6 +54,7 @@ /** * 住户-标签 自定义新增或修改 * * @param householdLabel * @return */ @@ -64,10 +65,10 @@ householdLabel.setLabelName(labelEntity.getLabelName()); // 判断同一个住户同一个标签是否已存在，已存在则更新，不存在则新增 QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("household_id",householdLabel.getHouseholdId()) .eq("label_id",householdLabel.getLabelId()); queryWrapper.eq("household_id", householdLabel.getHouseholdId()) .eq("label_id", householdLabel.getLabelId()); UserHouseLabelEntity one = getOne(queryWrapper); if (null != one){ if (null != one) { householdLabel.setId(one.getId()); // 更新 return updateById(householdLabel); @@ -94,4 +95,9 @@ public IPage<HouseholdLabelVO> statisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel) { return page.setRecords(baseMapper.statisticalLabels(page, householdLabel)); } @Override public IPage<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel) { return page.setRecords(baseMapper.getCommunityStatisticalLabels(page, householdLabel)); } } src/main/java/org/springblade/modules/house/vo/HouseholdLabelVO.java
@@ -20,6 +20,8 @@ import lombok.EqualsAndHashCode; import org.springblade.modules.house.entity.UserHouseLabelEntity; import java.util.List; /** * 住户-标签 视图实体类 * @@ -35,9 +37,21 @@ private String communityName; private String regionName; private String regionCode; private String communityCode; private Integer numbers; // 刑释解教人员 // 肇事肇祸精神障碍患者 // 一般精神障碍患者 // 重点对象 // 取保候审 private Integer number1; private Integer number2; private Integer number3; private Integer number4; private Integer number5; private List<Integer> ListId; } src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -19,8 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.logging.log4j.util.Strings; import org.springblade.common.node.TreeLongNode; import org.apache.commons.lang3.StringUtils; import org.springblade.common.node.TreeStringNode; import org.springblade.common.utils.NodeTreeUtil; import org.springblade.core.log.exception.ServiceException; @@ -28,7 +27,6 @@ import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringPool; import org.springblade.modules.district.vo.DistrictVO; import org.springblade.modules.system.entity.Dept; import org.springblade.modules.system.entity.Region; import org.springblade.modules.system.excel.RegionExcel; @@ -131,13 +129,14 @@ /** * 树列表 * * @param region * @return */ @Override public List<TreeStringNode> getTree(RegionVO region) { Dept dept = deptService.getById(AuthUtil.getDeptId()); if (null!=dept){ if (null != dept) { region.setRegionCode(dept.getRegionCode()); } return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region)); @@ -145,6 +144,7 @@ /** * 树列表(获取当前树） * * @param code * @return */ @@ -152,9 +152,9 @@ public List<TreeStringNode> getTownTree(String code) { Dept dept = deptService.getById(AuthUtil.getDeptId()); String regionCode = null; if (null!=dept){ if (null != dept) { regionCode = dept.getRegionCode(); if (regionCode.equals("3611")){ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("3611")) { regionCode = "361102"; } } @@ -163,6 +163,7 @@ /** * 树列表(包含省市县三级) * * @return */ @Override
