社区后台基础数据库修改

tangxiaobao

2021-07-16 baa82f05e228466e2e6a6973086a42bd7232ab18

社区后台基础数据库修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java

@@ -18,8 +18,7 @@
    SO(30, "丧偶"),
    LH(40, "离婚"),

    FJ(50, "分居"),
    QT(90, "其他"),
    QT(60, "其他"),
    WSM(90, "未说明的婚姻状况");

    private final Integer code;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java

New file
@@ -0,0 +1,110 @@
package com.panzhihua.common.model.dtos.community;

import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 *  退役军人DTO
 */
@Data
@ApiModel("退役军人")
public class ComExServicemanDTO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 分页-当前页数
     */
    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum;

    /**
     * 分页-每页记录数
     */
    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize;

    /**
     * 年龄开始查询字段
     */
    @ApiModelProperty("年龄开始查询字段")
    private String ageStart;

    /**
     * 年龄开始时间查询字段
     */
    @ApiModelProperty(value = "年龄开始时间查询字段",hidden = true)
    private String ageStartTime;
    /**
     * 年龄结束查询字段
     */
    @ApiModelProperty("年龄结束查询字段")
    private String ageEnd;

    /**
     * 年龄结束时间查询字段
     */
    @ApiModelProperty(value = "年龄结束时间查询字段",hidden = true)
    private String ageEndTime;

    /**
     * 民族
     */
    @ApiModelProperty("民族")
    private String nation;

    /**
     * 主键id
     */
    @ApiModelProperty(value="主键id")
    private Long id;

    /**
     * 街道id
     */
    @ApiModelProperty(value="街道id",hidden = true)
    private Integer streetId;

    /**
     * 社区id
     */
    @ApiModelProperty(value="社区id",hidden = true)
    private Long CommunityId;
    /**
     * 姓名
     */
    @ApiModelProperty(value="姓名")
    private String name;
    /**
     * 性别
     */
    @ApiModelProperty(value="性别")
    private String sex;

    /**
     * 身份证号码
     */
    @ApiModelProperty(value="身份证号码")
    @EncryptQuery
    private String cardNo;
    /**
     * 联系电话
     */
    @ApiModelProperty(value="联系电话")
    private String phone;
    /**
     * 创建时间
     */
    @ApiModelProperty(value="创建时间")
    private Date createAt;
    /**
     * 修改时间
     */
    @ApiModelProperty(value="修改时间")
    private Date updateAt;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java

@@ -86,7 +86,7 @@
     * 小区id（实有房屋id）
     */
    @ApiModelProperty(value="小区id（实有房屋id）")
    private Integer villageId;
    private Long villageId;
    /**
     * 家庭成员（姓名）
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportComMngCarExcelDTO.java

@@ -21,4 +21,8 @@

    @ApiModelProperty(value = "车主名称")
    private String userName;

    @ApiModelProperty(value = "小区id",hidden = true)
    private Long villageId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComExServicemanVO.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * 退役军人Vo
 */
@Data
@ApiModel("退役军人")
public class ComExServicemanVO {

    /**
     * 退役军人id
     */
    @ApiModelProperty("退役军人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
public class ComMngCarVO implements Serializable {

    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("社区ID")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCascadeHouseVO.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,7 @@
     * 房屋id
     */
    @ApiModelProperty("房屋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long houseId;

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCarVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
public class ComMngPopulationCarVO implements Serializable {

    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("车牌号")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseAdminVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,6 +20,7 @@
     * 实有房屋id
     */
    @ApiModelProperty("实有房屋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 房屋地址

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -30,6 +32,7 @@
     * 自增 id
     */
    @ApiModelProperty("实有人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 街道id
@@ -45,6 +48,7 @@
     * 小区id（实有房屋id）
     */
    @ApiModelProperty("小区id（实有房屋id）")
    @JsonSerialize(using = ToStringSerializer.class)
    private long villageId;
    /**
     * 家庭成员（姓名）
@@ -147,7 +151,7 @@
    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
    private Integer cultureLevel;

    @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
    @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
    private Integer marriage;

    @ApiModelProperty("健康状况")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -17,6 +19,7 @@
public class ComMngRealAssetsVO implements Serializable {

    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "社区ID",hidden = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
public class ComMngRealCompanyVO implements Serializable {

    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "社区ID",hidden = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.user;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -14,6 +16,7 @@
public class ComHouseMemberVo {

    @ApiModelProperty("房屋成员用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populId;

    @ApiModelProperty("姓名")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.user;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,9 +23,11 @@
public class ComMngFamilyInfoVO {

    @ApiModelProperty("自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("本人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("与本人关系")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.user;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
@@ -12,6 +14,7 @@
public class ComMngHouseVo {

    @ApiModelProperty("房屋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long houseId;

    @ApiModelProperty("房屋地址")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.user;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -25,6 +27,7 @@
public class InputUserInfoVO implements Serializable {

    @ApiModelProperty("用户编号")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("生日")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1454,6 +1454,15 @@
    R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);

    /**
     * 社区后台实有单位统计
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @PostMapping("/common/data/company/statistics")
    R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 社区后台添加修改实有单位
     *
     * @param comMngRealCompanyVO
@@ -3626,4 +3635,13 @@
     */
    @GetMapping("/eventgrid/community/list")
    R getCommunityLists();

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO 请求参数
     * @return 退役军人列表
     */
    @PostMapping("/population/page/exServiceman")
    R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -620,7 +620,7 @@
     * @param id
     * @return
     */
    @DeleteMapping("common/data/special/delete")
    @DeleteMapping("common/data/special/delete1")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);

    /**

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -398,7 +398,7 @@
    @ApiOperation(value = "特殊群体/删除", response = InputUserInfoVO.class)
    @DeleteMapping("/special/delete")
    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
        return userService.deleteSpecialInputUser(id);
        return communityService.deleteSpecialInputUser(id);
    }

//    @ApiOperation(value = "特殊群体 导出特殊群体Excel")
@@ -567,6 +567,14 @@
        return communityService.pageQueryComMngRealCompany(pageComMngRealCompanyDTO);
    }

    @ApiOperation(value = "实有单位统计接口", response = ComMngRealCompanyVO.class)
    @PostMapping("/company/statistics")
    public R getComMngRealCompanyTotalByAdmin() {
        //获取登陆用户绑定社区id
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.getComMngRealCompanyTotalByAdmin(communityId);
    }

    @ApiOperation(value = "添加/修改实有单位")
    @PostMapping("/company/save")
    public R saveComMngRealCompany(@RequestBody ComMngRealCompanyVO comMngRealCompanyVO) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java

@@ -7,12 +7,12 @@
import com.alibaba.fastjson.JSON;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.PopulIsOkEnum;
import com.panzhihua.common.enums.PopulOutOrLocalEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.listen.ComMngPopulationServeExcelListen;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.community.ComExServicemanVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
@@ -526,4 +526,15 @@
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.getHouseTotalByAdmin(communityId);
    }

    @ApiOperation(value = "分页查询退役军人列表", response = ComExServicemanVO.class)
    @PostMapping("/pageExServiceman")
    public R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO) {
        //获取登陆用户绑定社区id
        LoginUserInfoVO loginUser = this.getLoginUserInfo();
        if(loginUser != null){
            comExServicemanDTO.setCommunityId(loginUser.getCommunityId());
        }
        return communityService.pageExServiceman(comExServicemanDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java

@@ -1,12 +1,13 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComExServicemanService;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import com.panzhihua.service_community.service.ComMngPopulationService;
import lombok.extern.slf4j.Slf4j;
@@ -24,6 +25,8 @@
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComMngPopulationHouseService comMngPopulationHouseService;
    @Resource
    private ComExServicemanService comExServicemanService;

    /**
     * 获取人口数据信息
@@ -131,5 +134,16 @@
        return comMngPopulationHouseService.populationRelationHouse(relationHouseDTO);
    }

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO 请求参数
     * @return 退役军人列表
     */
    @PostMapping("/page/exServiceman")
    public R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO){
        return comExServicemanService.getPageExServiceman(comExServicemanDTO);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComExServicemanDAO.java

New file
@@ -0,0 +1,57 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
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.community.ComExServicemanVO;
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.ComExServicemanDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @description: 退役军人
 * @author: txb
 * @date: 2021/7/15 14:00
 */
@Mapper
public interface ComExServicemanDAO extends BaseMapper<ComExServicemanDO> {

    @Select("<script> " +
            " SELECT  " +
            "  id,  " +
            "  com_name AS comName,  " +
            "  legal_person AS legalPerson,  " +
            "  leader,  " +
            "  contacts_phone AS contactsPhone,  " +
            "  scope,  " +
            "  credit_code AS creditCode,  " +
            "  province_adcode AS provinceAdcode,  " +
            "  city_adcode AS cityAdcode,  " +
            "  district_adcode AS districtAdcode,  " +
            "  address,  " +
            "  create_at AS createAt  " +
            "FROM  " +
            "  com_ex_serviceman   where 1=1" +
            "<if test='pageComMngRealCompanyDTO.legalPerson != null and pageComMngRealCompanyDTO.legalPerson.trim() != &quot;&quot;'>" +
            " and t.legal_person LIKE concat( #{pageComMngRealCompanyDTO.legalPerson}, '%' )  " +
            " </if> " +
            "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>" +
            " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " +
            " </if> " +
            "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>" +
            " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " +
            " </if> " +
            " order by t.create_at desc" +
            "</script>")
    IPage<ComExServicemanVO> pageQueryComExServiceman(Page page, @Param(value = "comExServicemanDTO") ComExServicemanDTO comExServicemanDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java

@@ -88,6 +88,9 @@
            "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != 0'>" +
            " and t.community_id = #{exportComMngCarExcelDTO.communityId} " +
            " </if> " +
            "<if test='exportComMngCarExcelDTO.villageId != null and exportComMngCarExcelDTO.villageId != 0'>" +
            " and t.village_id = #{exportComMngCarExcelDTO.villageId} " +
            " </if> " +
            "<if test='exportComMngCarExcelDTO.userName != null and exportComMngCarExcelDTO.userName.trim() != &quot;&quot;'>" +
            " and t.user_name LIKE concat( #{exportComMngCarExcelDTO.userName}, '%' )  " +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -69,10 +69,12 @@
            "cmp.remark, " +
            "cmv.alley, " +
            "cmp.native_place, " +
            "cmphu.relation, " +
            "cmp.nation  " +
            "FROM  " +
            "com_mng_population AS cmp " +
            "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
            "LEFT JOIN com_mng_population_house_user AS cmphu ON cmphu.popul_id = cmp.id " +
            "<where>" +
            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != &quot;&quot;'>" +
            "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java

@@ -88,7 +88,8 @@
            "  street.name AS streetName, " +
            "  act.name AS communityName, " +
            "  street.street_id AS streetId, " +
            "  act.community_id AS communityId " +
            "  act.community_id AS communityId, " +
            "  act.create_at AS creatAt " +
            " FROM  " +
            "  com_act act " +
            "  LEFT JOIN com_street street ON act.street_id = street.street_id " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComExServicemanDO.java

New file
@@ -0,0 +1,142 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName(value = "com_ex_serviceman")
public class ComExServicemanDO implements Serializable {

  private static final long serialVersionUID = 1L;

  /**
   * 自增 id
   */
  @TableId(type = IdType.INPUT)
  private Long id;

  /**
   * 用户 id
   */
  private Long userId;

  /**
   * 街道 id
   */
  private Long streetId;

  /**
   * 社区 id
   */
  private Long actId;

  /**
   * 0是正常1是异常 id
   */
  private Integer status;

  /**
   * 机构
   */
  private String organization;

  /**
   * 名字
   */
  private String name;

  /**
   * 身份证号码
   */
  @EncryptDecryptField
  private String cardNo;

  /**
   * 性别
   */
  private String sex;

  /**
   * 出生年月
   */
  private String birthday;

  /**
   * 残疾人证
   */
  private String level;

  /**
   * 文化程度(取字典表国家编码))
   */
  private String cultureLevel;

  /**
   * 性别名称
   */
  private String sexName;

  /**
   * 联系电话
   */
  @EncryptDecryptField
  private String phone;

  /**
   * 头像
   */
  private String image;

  /**
   * 民族
   */
  private String nation;

  /**
   * 残疾部位/类别
   */
  private String disableType;

  /**
   * 残疾界别
   */
  private String disableLevel;

  /**
   * 监护人联系电话
   */
  @EncryptDecryptField
  private String guardianPhone;

  /**
   * 地址
   */
  private String address;

  /**
   * 创建时间
   */
  @TableField(fill = FieldFill.INSERT)
  private Date createAt;

  /**
   * 创建用户
   */
  private Long createBy;

  /**
   * 修改时间
   */
  @TableField(fill = FieldFill.UPDATE)
  private Date updateAt;

  /**
   * 修改用户
   */
  private Long updateBy;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowIncomePeopleCopyDO.java

New file
@@ -0,0 +1,138 @@
package com.panzhihua.service_community.model.dos;


import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName(value = "com_low_income_people_copy")
public class ComLowIncomePeopleCopyDO implements Serializable {

  private static final long serialVersionUID = 1L;

  /**
   * 自增 id
   */
  @TableId(type = IdType.INPUT)
  private Long id;

  /**
   * 用户 id
   */
  private Long userId;

  /**
   * 街道 id
   */
  private Long streetId;

  /**
   * 社区 id
   */
  private Long actId;

  /**
   * 月份
   */
  private String month;

  /**
   * 户主名字
   */
  private String name;

  /**
   * 性别
   */
  private String sex;

  /**
   * 家庭成员人数
   */
  private String familyMemberTotal;

  /**
   * 家庭月收入(元)
   */
  private String familyMonthIncome;

  /**
   * 家庭成员身份证号
   */
  @EncryptDecryptField
  private String familyMemberCardNo;

  /**
   * 文化程度(取字典表国家编码))
   */
  private String cultureLevel;

  /**
   * 性别名称
   */
  private String sexName;

  /**
   * 民族
   */
  private String nation;

  /**
   * 身份证号码
   */
  @EncryptDecryptField
  private String cardNo;

  /**
   * 联系电话
   */
  @EncryptDecryptField
  private String phone;

  /**
   * 地址
   */
  private String address;

  /**
   * 出生年月
   */
  private String birthday;

  /**
   * 申请事由
   */
  private String applyForReason;

  /**
   * 备注
   */
  private String note;

  /**
   * 创建时间
   */
  @TableField(fill = FieldFill.INSERT)
  private Date createAt;

  /**
   * 创建用户
   */
  private Long createBy;

  /**
   * 修改时间
   */
  @TableField(fill = FieldFill.UPDATE)
  private Date updateAt;

  /**
   * 修改用户
   */
  private Long updateBy;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPeopleDO.java

New file
@@ -0,0 +1,149 @@
package com.panzhihua.service_community.model.dos;


import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

@Data
@TableName(value = "com_low_security_people")
public class ComLowSecurityPeopleDO implements Serializable {

  private static final long serialVersionUID = 1L;

  /**
   * 自增 id
   */
  @TableId(type = IdType.INPUT)
  private Long id;

  /**
   * 用户 id
   */
  private Long userId;

  /**
   * 街道 id
   */
  private Long streetId;

  /**
   * 社区 id
   */
  private Long actId;

  /**
   * 名字
   */
  private String name;

  /**
   * 性别
   */
  private String sex;

  /**
   * 家庭成员身份证号
   */
  @EncryptDecryptField
  private String familyMemberCardNo;

  /**
   * 家庭情况
   */
  private String familyStatus;

  /**
   * 文化程度(取字典表国家编码))
   */
  private String cultureLevel;

  /**
   * 低保类别
   */
  private String level;

  /**
   * 性别名称
   */
  private String sexName;

  /**
   * 民族
   */
  private String nation;

  /**
   * 身份证号码
   */
  @EncryptDecryptField
  private String cardNo;

  /**
   * 联系电话
   */
  @EncryptDecryptField
  private String phone;

  /**
   * 地址
   */
  private String address;

  /**
   * 出生年月
   */
  private String birthday;

  /**
   * 家庭成员
   */
  private String familyMember;

  /**
   * 保障人数
   */
  private Integer securityNumber;

  /**
   * 享受低保金额（元）
   */
  private BigDecimal subsidiesAmount;

  /**
   * 享社保卡账号
   */
  private String socialSecurityCardNumber;

  /**
   * 备注
   */
  private String note;

  /**
   * 创建时间
   */
  @TableField(fill = FieldFill.INSERT)
  private Date createAt;

  /**
   * 创建用户
   */
  private Long createBy;

  /**
   * 修改时间
   */
  @TableField(fill = FieldFill.UPDATE)
  private Date updateAt;

  /**
   * 修改用户
   */
  private Long updateBy;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java

@@ -43,6 +43,11 @@
     * 年龄
     */
//    private Integer age;

    /**
     * 证件类型
     */
    private String certificateType;
    /**
     * 身份证号码
     */
@@ -53,6 +58,12 @@
     * 临时用
     */
    private String cardNoStr;

    /**
     * 默认为身份证到期时间，可以是其他证件到期时间
     */
    private Date cardNoExpirationDate;

    /**
     * 街路巷
     */
@@ -78,7 +89,7 @@
     */
    private Integer politicalOutlook;
    /**
     * 工作单位
     * 工作单位/学校
     */
    private String workCompany;
    /**
@@ -98,52 +109,41 @@
     * 户口所在地
     */
    private String censusRegister;

    /**
     * 备注
     * 人员类型（1、户籍人员2、留守人员3、外地人员4、境外人员）
     */
    private String remark;
    private String personType;

    /**
     * 标签集合（多个标签以,隔开）
     * 国家code(取字典表国家标准编码)
     */
    private String label;
    private String country;

    /**
     * 创建时间
     * 离开日期(境外人员填写)
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
    private Date dateOfDeparture;

    /**
     * 籍贯
     */
    private String nativePlace;

    /**
     * 民族
     * 民族code,从字典表取国家标准码
     */
    private String nationCode;

    /**
     * 民族
     */
    private String nation;

    /**
     * 是否租住(0.否 1.是)
     */
    private Integer isRent;
    /**
     * 小区名字
     */
    @TableField(exist = false)
    private String villageName;

    /**
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
//    private Integer relation;
//
//    private String relationStr;

    /**
     * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)
@@ -162,9 +162,49 @@
    private String healthy;

    /**
     * 居住地址
     * 血型
     */
    private String address;
    private String bloodType;

    /**
     * 宗教信仰
     */
    private String religion;

    /**
     * 职业
     */
    private String profession;

    /**
     * 人员状态：正常、失联、出国(取字典表）
     */
    private String personStatus;

    /**
     * 是否死亡 1是 、0否
     */
    private String death;

    /**
     * 头像图片地址
     */
    private String headPortrait;

    /**
     * 月收入情况
     */
    private String monthlyIncome;

    /**
     * 家庭情况(取字典表国家标准编码)
     */
    private String familyStatus;

    /**
     * 来华目的(境外人员填写)
     */
    private String goalInChina;

    /**
     * 出生年月日
@@ -172,6 +212,74 @@
    private String birthday;

    /**
     * 抵达日期(境外人员填写)
     */
    private Date dateOfArrival;

    /**
     * 标签集合（多个标签以,隔开）
     */
    private String label;

    /**
     * 证件照（人面像）照片
     */
    private String cardPhotoFront;

    /**
     * 证件照（国徽面）照片
     */
    private String cardPhotoBack;

    /**
     * 户口本照片
     */
    private String familyBook;

    /**
     * 删除标识
     */
    private Integer deleteFlag;

    /**
     * 备注
     */
    private String remark;
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 小区名字
     */
    @TableField(exist = false)
    private String villageName;

    /**
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
//    private Integer relation;
//
//    private String relationStr;

    /**
     * 是否居住地
     */
    private String residence;

    /**
     * 居住地址
     */
    private String address;

    /**
     * 居住地房屋id
     */
    private Long houseId;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java

@@ -1,6 +1,8 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.io.Serializable;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java

@@ -63,6 +63,12 @@
    private Date createAt;

    /**
     * 更改时间
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
    public interface relation{
@@ -89,6 +95,7 @@
                ", populId=" + populId +
                ", houseId=" + houseId +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -18,6 +20,7 @@
     * villageId
     */
    @TableId(value = "village_id",type = IdType.INPUT)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long villageId;
    /**
     * 街路巷

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComExServicemanService.java

New file
@@ -0,0 +1,31 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComExServicemanDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;

import java.util.List;

/**
 * @auther txb
 * @create 2021-07-15 15:52:31
 * @describe 退役军人服务类
 */
public interface ComExServicemanService extends IService<ComExServicemanDO> {

    /**
     * 分页查询退役军人列表
     * @param comExServicemanDTO   请求参数
     * @return  退役军人列表
     */
    R getPageExServiceman(ComExServicemanDTO comExServicemanDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComExServicemanServiceImpl.java

New file
@@ -0,0 +1,56 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.*;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComExServicemanVO;
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.ComExServicemanDAO;
import com.panzhihua.service_community.dao.ComMngRealCompanyDAO;
import com.panzhihua.service_community.model.dos.ComExServicemanDO;
import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
import com.panzhihua.service_community.service.ComExServicemanService;
import com.panzhihua.service_community.service.ComMngRealCompanyService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @description: 退役军人
 * @author: txb
 * @date: 2021/7/15 16:00
 */
@Service
public class ComExServicemanServiceImpl extends ServiceImpl<ComExServicemanDAO, ComExServicemanDO> implements ComExServicemanService {

    @Resource
    private ComExServicemanDAO comExServicemanDAO;

    @Override
    public R getPageExServiceman(ComExServicemanDTO comExServicemanDTO) {
        Page page = new Page<>();
        Long pageNum = comExServicemanDTO.getPageNum();
        Long pageSize = comExServicemanDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComExServicemanVO> iPage = comExServicemanDAO.pageQueryComExServiceman(page, comExServicemanDTO);
        return R.ok(iPage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -713,6 +713,7 @@
        if (!vo.getHouseEditDTOList().isEmpty()) {
            for (ComMngPopulationHouseEditDTO houseEditDto : vo.getHouseEditDTOList()) {
                ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
                populationHouseUserDO.setId(Snowflake.getId());
                populationHouseUserDO.setPopulId(populationDO.getId());
                populationHouseUserDO.setHouseId(houseEditDto.getId());
                if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {