springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngRealCompanyBelongsDTO.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @description: 实有单位归属请求参数 * @author: Null * @date: 2021/3/11 10:36 */ @Data @ApiModel("实有单位归属请求参数") public class ComMngRealCompanyBelongsDTO { @ApiModelProperty(value = "社区名称") private String actName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyBelongsVO.java
New file @@ -0,0 +1,50 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @description: 实有单位归属 * @author: Null * @date: 2021/3/19 12:02 */ @Data public class ComMngRealCompanyBelongsVO implements Serializable { @ApiModelProperty("省份行政区划代码") private Integer provinceAdcode; @ApiModelProperty("省份行政区划名称") private String provinceName; @ApiModelProperty("城市行政区划代码") private Integer cityAdcode; @ApiModelProperty("城市行政区划名称") private String cityName; /**区县行政区划代码*/ @ApiModelProperty("区县行政区划代码") private Integer districtAdcode; @ApiModelProperty("区县行政区划名称") private String districtName; @ApiModelProperty("街道标识") private Long streetId; @ApiModelProperty("街道名称") private String streetName; @ApiModelProperty("社区名称") private String communityName; @ApiModelProperty("社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1382,6 +1382,16 @@ @GetMapping("/common/data/company/detail") R detailComMngRealCompany(@RequestParam(value = "id") Long id); /** * 实有单位归属地 * * @param comMngRealCompanyBelongsDTO * @return */ @GetMapping("/common/data/company/belongs") R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO); /** * 批量导入实有单位 * springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -530,6 +530,12 @@ } @ApiOperation(value = "实有单位归属地", response = ComMngRealCompanyVO.class) @GetMapping("/company/belongs") public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) { return communityService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO); } ///////////// @ApiOperation(value = "分页查询实有资产列表", response = ComMngRealAssetsVO.class) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -130,6 +130,10 @@ return comMngRealCompanyService.detailComMngRealCompany(id); } @GetMapping("/company/belongs") public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) { return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO); } /** * 社区后台导入实有单位 * @param list 车实有单位列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java
@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO; import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO; import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO; import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO; @@ -74,4 +76,30 @@ " order by t.create_at desc"+ "</script>") List<ComMngRealCompanyExcelVO> exportRealCompanyExcel(@Param(value = "exportRealCompanyExcelDTO") ExportRealCompanyExcelDTO exportRealCompanyExcelDTO); @Select("<script> " + " SELECT distinct " + " act.province_code AS provinceAdcode, " + " act.city_code AS cityAdcode, " + " act.area_code AS districtAdcode, " + " pr.province_name AS provinceName, " + " cty.city_name AS cityName, " + " dis.district_name AS districtName, " + " street.name AS streetName, " + " act.name AS communityName, " + " street.street_id AS streetId, " + " act.community_id AS communityId " + " FROM " + " com_act act " + " LEFT JOIN com_street street ON act.street_id = street.street_id " + " LEFT join com_mng_struct_area_province pr on street.province_code = pr.province_adcode " + " LEFT join com_mng_struct_area_city cty on street.city_code = cty.city_adcode " + " LEFT join com_mng_struct_area_district dis on street.area_code = dis.district_adcode " + " WHERE 1=1 " + "<if test='pageComMngRealCompanyBelongsDTO.actName != null and pageComMngRealCompanyBelongsDTO.actName.trim() != ""'>" + " and act.name = #{pageComMngRealCompanyBelongsDTO.actName} " + " </if> " + " order by act.create_at desc"+ "</script>") ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(@Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngRealCompanyService.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO; import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO; import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; @@ -52,4 +53,12 @@ * @return */ R exportRealCompanyExcel(ExportRealCompanyExcelDTO exportRealCompanyExcelDTO); /** * 实有单位详情 * @param comMngRealCompanyBelongsDTO * @return */ R belongsComMngRealCompany(ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO; import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO; import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCarVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO; import com.panzhihua.service_community.dao.ComMngRealCompanyDAO; @@ -132,4 +133,11 @@ List<ComMngRealCompanyExcelVO> list = comMngRealCompanyDAO.exportRealCompanyExcel(exportRealCompanyExcelDTO); return R.ok(list); } @Override public R belongsComMngRealCompany(ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) { ComMngRealCompanyBelongsVO comMngRealCompanyBelongsVO = comMngRealCompanyDAO.queryComMngRealCompanyBelongs(comMngRealCompanyBelongsDTO); return R.ok(comMngRealCompanyBelongsVO); } }
