Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

tangxiaobao

2021-07-14 c64da5152d32c366eecfb20b3fdc023be1d27681

Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

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

@@ -7,12 +7,7 @@
public enum  EventTasksStatusEnum {

    DZF(1,"待走访"),
    YJJ(2,"已解决"),
    ZJJJ(3,"待验证"),
    DYZ(4,"草稿箱"),
    CG(5,"已撤销"),
    YCX(6,"已撤销"),
    YC(7,"异常"),
    YJJ(2,"已走访")
    ;


@@ -38,6 +33,6 @@
                return item.getName();
            }
        }
        return YC.getName();
        return "";
    }
}

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

@@ -6,9 +6,9 @@
 */
public enum  PopulHouseUseEnum {

    SELF(1,"自住"),
    RENT(2,"租住"),
        ;
    SELF(1,"是"),
    RENT(0,"否"),
    ;
    private final Integer code;
    private final String name;


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

New file
@@ -0,0 +1,45 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * 人员类型
 *
 * @author tangxb
 */
@Getter
public enum PopulPersonTypeEnum
{
    HJ(1, "户籍人员"),
    LS(2, "留守人员"),
    WD(3, "外地人员"),
    JW(4, "境外人员");

    private final Integer code;
    private final String name;

    PopulPersonTypeEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (PopulPersonTypeEnum item : PopulPersonTypeEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return -1;
    }

    public static String getCnDescByName(Integer code) {
        for (PopulPersonTypeEnum item : PopulPersonTypeEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "其他";
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/CustomSheetWriteHandler.java

@@ -29,19 +29,27 @@
        LOGGER.info("第{}个Sheet写入成功。", writeSheetHolder.getSheetNo());

        // 区间设置 第一列第一行和第二行的数据。由于第一行是头，所以第一、二行的数据实际上是第二三行
        CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 2000, 1, 1);
        CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 2000, 3 ,3);
        CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 2000, 10 ,10);
        CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 2000, 11, 11);
        CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 2000, 4 ,4);
        CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 2000, 6 ,6);
        CellRangeAddressList cellRangeAddressList3 = new CellRangeAddressList(1, 2000, 13 ,13);
        CellRangeAddressList cellRangeAddressList4 = new CellRangeAddressList(1, 2000, 14 ,14);
        DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper();
        DataValidationConstraint constraint = helper.createExplicitListConstraint(new String[] {"是", "否"});
        DataValidationConstraint constraint = helper.createExplicitListConstraint(new String[] {"男", "女","未知"});
        DataValidationConstraint constraint1 = helper.createExplicitListConstraint(new String[] {"中共党员","中共预备党员","共青团员","民革党员","民盟盟员","民建会员","农工党党员","致公党党员","九三学社社员","台盟盟员","无党派人士","群众"});
        DataValidationConstraint constraint2 = helper.createExplicitListConstraint(new String[] {"男", "女","未知"});
        DataValidationConstraint constraint2 = helper.createExplicitListConstraint(new String[] {"本地", "外地"});
        DataValidationConstraint constraint3 = helper.createExplicitListConstraint(new String[] {"未婚", "已婚", "初婚", "再婚", "复婚", "丧偶", "离婚", "未说明的婚育状况"});
        DataValidationConstraint constraint4 = helper.createExplicitListConstraint(new String[] {"很好", "较好", "一般", "较差", "很差"});
        DataValidation dataValidation = helper.createValidation(constraint2, cellRangeAddressList);
        DataValidation dataValidation1 = helper.createValidation(constraint, cellRangeAddressList1);
        DataValidation dataValidation2= helper.createValidation(constraint1, cellRangeAddressList2);
        DataValidation dataValidation3 = helper.createValidation(constraint3, cellRangeAddressList3);
        DataValidation dataValidation4= helper.createValidation(constraint4, cellRangeAddressList4);

        writeSheetHolder.getSheet().addValidationData(dataValidation);
        writeSheetHolder.getSheet().addValidationData(dataValidation1);
        writeSheetHolder.getSheet().addValidationData(dataValidation2);
        writeSheetHolder.getSheet().addValidationData(dataValidation3);
        writeSheetHolder.getSheet().addValidationData(dataValidation4);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/PEXCustomSheetWriteHandler.java

New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.excel;

import com.alibaba.excel.write.handler.SheetWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
import org.apache.poi.ss.usermodel.DataValidation;
import org.apache.poi.ss.usermodel.DataValidationConstraint;
import org.apache.poi.ss.usermodel.DataValidationHelper;
import org.apache.poi.ss.util.CellRangeAddressList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * 自定义拦截器.对第一列第一行和第二行的数据新增下拉框，显示 测试1 测试2
 *
 * @author Jiaju Zhuang
 */
public class PEXCustomSheetWriteHandler implements SheetWriteHandler {

    private static final Logger LOGGER = LoggerFactory.getLogger(PEXCustomSheetWriteHandler.class);

    @Override
    public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {

    }

    @Override
    public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
        LOGGER.info("第{}个Sheet写入成功。", writeSheetHolder.getSheetNo());

        // 区间设置 第一列第一行和第二行的数据。由于第一行是头，所以第一、二行的数据实际上是第二三行
        CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 5000, 3, 3);
        CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 5000, 4 ,4);
        CellRangeAddressList cellRangeAddressList3 = new CellRangeAddressList(1, 5000, 25 ,25);
        DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper();
        DataValidationConstraint constraint1 = helper.createExplicitListConstraint(new String[] {"中共党员","中共预备党员","共青团员","民革党员","民盟盟员","民建会员","农工党党员","致公党党员","九三学社社员","台盟盟员","无党派人士","群众"});
        DataValidationConstraint constraint2 = helper.createExplicitListConstraint(new String[] {"是", "否"});
        DataValidationConstraint constraint3 = helper.createExplicitListConstraint(new String[] {"本地", "外地"});
        DataValidation dataValidation1 = helper.createValidation(constraint1, cellRangeAddressList1);
        DataValidation dataValidation2 = helper.createValidation(constraint2, cellRangeAddressList2);
        DataValidation dataValidation3= helper.createValidation(constraint3, cellRangeAddressList3);

        writeSheetHolder.getSheet().addValidationData(dataValidation1);
        writeSheetHolder.getSheet().addValidationData(dataValidation2);
        writeSheetHolder.getSheet().addValidationData(dataValidation3);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -16,6 +16,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@@ -130,7 +132,7 @@
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
                    //设置用户年龄
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
@@ -270,7 +272,7 @@
                        index++;
                        continue;
                    }
                    vo.setHouseStatus(isOk);
                    vo.setControlStatus(isOk);
                }

                if(StringUtils.isNotEmpty(oneData.get(16))){
@@ -302,42 +304,95 @@
                    vo.setHealthy(oneData.get(20).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(21))){
                    vo.setWorkCompany(oneData.get(21).trim());
                    vo.setBloodType(oneData.get(21).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(22))){
                    Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(22));
                    vo.setReligion(oneData.get(22).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(23))){
                    vo.setProfession(oneData.get(23).trim());
                }

                if(StringUtils.isNotEmpty(oneData.get(24))){
                    vo.setWorkCompany(oneData.get(24).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(25))){
                    Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第23列");
                        importErrorVO.setErrorMsg("您填写的外地or本地有误");
                        importErrorVO.setErrorPosition("第" + index + "行，第26列");
                        importErrorVO.setErrorMsg("您填写的本地/外地有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setOutOrLocal(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(23))){
                    vo.setCensusRegister(oneData.get(23).trim());
                if(StringUtils.isNotEmpty(oneData.get(26))){
                    vo.setCensusRegister(oneData.get(26).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(24))){
                    vo.setRemark(oneData.get(24).trim());
                if(StringUtils.isEmpty(oneData.get(27))){
                    vo.setResidence(0);
                }else{
                    vo.setResidence(PopulIsOkEnum.getCodeByName(oneData.get(27).trim()));
                }
                if(StringUtils.isNotEmpty(oneData.get(28))){
                    vo.setAddress(oneData.get(28).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(29))){
                    Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(29));
                    if(isOk.equals(-1)){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第30列");
                        importErrorVO.setErrorMsg("您填写的人员类型有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setPersonType(isOk);
                }
                if(StringUtils.isNotEmpty(oneData.get(30))){
                    vo.setCountry(oneData.get(30).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(31))){
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
                    vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(31)));
                }
                if(StringUtils.isNotEmpty(oneData.get(32))){
                    vo.setPersonStatus(oneData.get(32).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(33))){
                    vo.setMonthlyIncome(oneData.get(33).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(34))){
                    vo.setFamilyStatus(oneData.get(34).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(35))){
                    vo.setGoalInChina(oneData.get(35).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(36))){
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
                    vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(36)));
                }
                if(StringUtils.isNotEmpty(oneData.get(37))){
                    vo.setRemark(oneData.get(37).trim());
                }

                if(StringUtils.isNotEmpty(oneData.get(25))){
                    vo.setIdCardPositive(oneData.get(25).trim());
                if(StringUtils.isNotEmpty(oneData.get(38))){
                    vo.setIdCardPositive(oneData.get(38).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(26))){
                    vo.setIdCardBack(oneData.get(26).trim());
                if(StringUtils.isNotEmpty(oneData.get(39))){
                    vo.setIdCardBack(oneData.get(39).trim());
                }
                if(StringUtils.isNotEmpty(oneData.get(27))){
                    vo.setHouseHold(oneData.get(27).trim());
                if(StringUtils.isNotEmpty(oneData.get(40))){
                    vo.setHouseHold(oneData.get(40).trim());
                }
                if(StringUtils.isEmpty(oneData.get(28))){
                    vo.setIsResidence(0);
                if(StringUtils.isEmpty(oneData.get(41))){
                    vo.setDeath(0);
                }else{
                    vo.setIsResidence(PopulIsOkEnum.getCodeByName(oneData.get(28).trim()));
                    vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(41).trim()));
                }
                for (int i = 29; i < headSize; i++) {
                for (int i = 42; i < headSize; i++) {
                    if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                        vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                    }
@@ -389,6 +444,14 @@
            importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
            populationImportErrorVOList.add(importErrorVO);
            throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
        } catch (ParseException e1) {
            e1.printStackTrace();
            List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
            importErrorVO.setErrorPosition("第" + index + "行");
            importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
            populationImportErrorVOList.add(importErrorVO);
            throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
        }
    }

@@ -431,7 +494,7 @@
        }else if(Objects.equals(ra,"长男") || ra.contains("长子")){
            ra = "长子";
        }else if(Objects.equals(ra,"非亲属") || ra.contains("女友")  || ra.contains("女朋友")
                    || ra.contains("男友") || ra.contains("男朋友")){
                || ra.contains("男友") || ra.contains("男朋友")){
            ra = "其他";
        }else if(Objects.equals(ra,"姐")){
            ra = "姐姐";

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

@@ -193,4 +193,7 @@
    @ApiModelProperty(value="房屋id")
    private Long houseId;

    @ApiModelProperty("居住地址")
    private String address;

}

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

@@ -117,4 +117,10 @@
    @ApiModelProperty(value="小区id")
    private Long villageId;

    /**
     * 房屋地址
     */
    @ApiModelProperty(value="房屋地址")
    private Long address;

}

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @description: 车辆导出请求参数
 * @author: txb
 * @date: 2021/7/14 10:36
 */
@Data
@ApiModel("车辆导出请求参数")
public class ExportComMngCarExcelDTO {

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "小区名称")
    private String areaName;

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

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

@@ -1,9 +1,12 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * @description: 批量导入车辆管理
@@ -22,24 +25,36 @@
     */
    @ExcelProperty(value = "车主姓名" ,index = 1)
    private String userName;

    /**
     * 联系方式
     * 品牌型号
     */
    @ExcelProperty(value = "联系方式" ,index = 2)
    private String mobile;
    @ExcelProperty(value = "品牌型号" ,index = 2)
    private String brand;

    /**
     * 车牌号
     */
    @ExcelProperty(value = "车牌号" ,index = 3)
    private String plateNum;
    /**
     * 品牌型号
     */
    @ExcelProperty(value = "品牌型号" ,index = 4)
    private String brand;

    /**
     * 车身颜色
     */
    @ExcelProperty(value = "车身颜色" ,index = 5)
    @ExcelProperty(value = "颜色" ,index = 4)
    private String color;

    /**
     * 联系方式
     */
    @ExcelProperty(value = "联系方式" ,index = 5)
    private String mobile;

    /**
     * 详细住址
     */
    @ExcelProperty(value = "详细住址" ,index = 6)
    private String address;

}


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

@@ -9,48 +9,48 @@
    @ExcelProperty(value = "姓名" ,index = 0)
    private String name;

    @ExcelProperty(value = "性别" ,index = 1)
    private String sex;

    @ExcelProperty(value = "年龄" ,index = 2)
    private Integer age;

    @ExcelProperty(value = "是否租住" ,index = 3)
    private String isRent;

    @ExcelProperty(value = "街路巷" ,index = 4)
    private String road;

    @ExcelProperty(value = "楼排号" ,index = 5)
    private String doorNo;

    @ExcelProperty(value = "门牌号" ,index = 6)
    private String floor;

    @ExcelProperty(value = "单元号" ,index = 7)
    private String unitNo;

    @ExcelProperty(value = "户室" ,index = 8)
    private String houseNo;

    @ExcelProperty(value = "民族" ,index = 9)
    private String nation;

    @ExcelProperty(value = "政治面貌" ,index = 10)
    private String politicalOutlook;

    @ExcelProperty(value = "身份证号码" ,index = 11)
    @ExcelProperty(value = "身份证号码" ,index = 1)
    private String cardNo;

    @ExcelProperty(value = "联系方式" ,index = 12)
    @ExcelProperty(value = "人员标签" ,index = 2)
    private String label;

    @ExcelProperty(value = "居住地址" ,index = 3)
    private String address;

    @ExcelProperty(value = "性别" ,index = 4)
    private String sex;

    @ExcelProperty(value = "民族" ,index = 5)
    private String nation;

    @ExcelProperty(value = "政治面貌" ,index = 6)
    private String politicalOutlook;

    @ExcelProperty(value = "出生年月日" ,index = 7)
    private String birthday;

    @ExcelProperty(value = "年龄" ,index = 8)
    private Integer age;

    @ExcelProperty(value = "联系方式" ,index = 9)
    private String phone;

    @ExcelProperty(value = "籍贯" ,index = 13)
    @ExcelProperty(value = "籍贯" ,index = 10)
    private String nativePlace;

    @ExcelProperty(value = "工作单位" ,index = 14)
    private String workCompany;
    @ExcelProperty(value = "本地外地" ,index = 11)
    private String outOrLacal;

    @ExcelProperty(value = "标签" ,index = 15)
    private String label;
    @ExcelProperty(value = "文化程度" ,index = 12)
    private String cultureLevel;

    @ExcelProperty(value = "婚姻状况" ,index = 13)
    private String marriage;

    @ExcelProperty(value = "健康状况" ,index = 14)
    private String healthy;

    @ExcelProperty(value = "工作单位" ,index = 15)
    private String workCompany;
}

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

@@ -5,6 +5,7 @@
import lombok.Data;

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

/**
@@ -33,7 +34,7 @@
    private Integer relation;
    private String relationStr;

    @ExcelProperty(value = "街路巷", index = 6)
    @ExcelProperty(value = "街/路/巷", index = 6)
    private String road;

    @ExcelProperty(value = "小区号", index = 7)
@@ -80,52 +81,93 @@
    @ExcelProperty(value = "健康状况", index = 20)
    private String healthy;

    @ExcelProperty(value = "工作单位", index = 21)
    @ExcelProperty(value = "血型", index = 21)
    private String bloodType;

    @ExcelProperty(value = "宗教信仰", index = 22)
    private String religion;

    @ExcelProperty(value = "职业", index = 23)
    private String profession;

    @ExcelProperty(value = "工作单位/学校", index = 24)
    private String workCompany;

    @ExcelProperty(value = "外地or本地（1.本地  2.外地）", index = 22)
    @ExcelProperty(value = "外地/本地（1.本地  2.外地）", index = 25)
    private Integer outOrLocal;

    @ExcelProperty(value = "户口所在地", index = 23)
    @ExcelProperty(value = "户口所在地", index = 26)
    private String censusRegister;

    @ExcelProperty(value = "备注", index = 24)
    @ExcelProperty(value = "是否居住地 1是 、0否", index = 27)
    private Integer residence;

    @ExcelProperty(value = "居住地址", index = 28)
    private String address;

    @ExcelProperty(value = "人员类型（1、户籍人员2、留守人员3、外地人员4、境外人员）", index = 29)
    private Integer personType;

    @ExcelProperty(value = "国家", index = 30)
    private String country;

    @ExcelProperty(value = "离开日期（境外人员填写）", index = 31)
    private Date dateOfDeparture;

    @ExcelProperty(value = "人员状态", index = 32)
    private String personStatus;

    @ExcelProperty(value = "月收入情况", index = 33)
    private String monthlyIncome;

    @ExcelProperty(value = "家庭情况", index = 34)
    private String familyStatus;

    @ExcelProperty(value = "来华目的（境外人员填写）", index = 35)
    private String goalInChina;

    @ExcelProperty(value = "抵达日期（境外人员填写）", index = 36)
    private Date dateOfArrival;

    @ExcelProperty(value = "备注", index = 37)
    private String remark;

    @ExcelProperty(value = "证件照（人面像）照片", index = 25)
    @ExcelProperty(value = "证件照（人面像）照片", index = 38)
    private String idCardPositive;

    @ExcelProperty(value = "证件照（国徽面）照片", index = 26)
    @ExcelProperty(value = "证件照（国徽面）照片", index = 39)
    private String idCardBack;

    @ExcelProperty(value = "户口本照片", index = 27)
    @ExcelProperty(value = "户口本照片", index = 40)
    private String houseHold;

    @ExcelProperty(value = "退役军人(是/否)", index = 28)
    @ExcelProperty(value = "是否死亡(是/否)", index = 41)
    private Integer death;

    @ExcelProperty(value = "退役军人(是/否)", index = 41)
    private Integer veterans;

    @ExcelProperty(value = "残疾人(是/否)", index = 29)
    @ExcelProperty(value = "残疾人(是/否)", index = 43)
    private Integer disabled;

    @ExcelProperty(value = "低保户(是/否)", index = 30)
    @ExcelProperty(value = "低保户(是/否)", index = 44)
    private Integer lowIncomeHold;

    @ExcelProperty(value = "低收入人员(是/否)", index = 31)
    @ExcelProperty(value = "低收入人员(是/否)", index = 45)
    private Integer lowIncome;

    @ExcelProperty(value = "高龄老人(是/否)", index = 32)
    @ExcelProperty(value = "高龄老人(是/否)", index = 46)
    private Integer elder;

    @ExcelProperty(value = "特服家庭(是/否)", index = 33)
    @ExcelProperty(value = "特服家庭(是/否)", index = 47)
    private Integer specialFamily;

    @ExcelProperty(value = "重点人员(是/否)", index = 34)
    @ExcelProperty(value = "重点人员(是/否)", index = 48)
    private Integer important;

    @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 35)
    @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 49)
    private Integer specialCase;

    private Integer isResidence;

    /**
     * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
@@ -146,11 +188,6 @@
     * 出生年月日
     */
    private String birthday;

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

    /**
     * 扩展字段用逗号隔开

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

@@ -45,7 +45,7 @@
     * 小区id（实有房屋id）
     */
    @ApiModelProperty("小区id（实有房屋id）")
    private Integer villageId;
    private long villageId;
    /**
     * 家庭成员（姓名）
     */
@@ -162,6 +162,7 @@
    /**
     * 居住地址
     */
    @ApiModelProperty("居住地址")
    private String address;

    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java

@@ -45,4 +45,6 @@
    private String lcGirdId;
    @ApiModelProperty(value = "关联市平台网格")
    private String lcGirdName;
    @ApiModelProperty(value = "网格所属社区id")
    private Long gridCommunityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkVO.java

@@ -26,6 +26,15 @@
    @ApiModelProperty("解决事件")
    private Long eventSolve;

    @ApiModelProperty("随手拍数量")
    private Long sspTotal = 0L;

    @ApiModelProperty("新增随手拍数量")
    private Long sspAdd = 0L;

    @ApiModelProperty("解决随手拍数量")
    private Long sspSolve = 0L;

    @ApiModelProperty(hidden = true)
    private String start;
    @ApiModelProperty(hidden = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java

@@ -41,6 +41,9 @@
    @ApiModelProperty("网格员")
    private String gridMemberName;

    @ApiModelProperty("网格员联系方式")
    private String gridMenberTele;

    @ApiModelProperty("处理人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dellUserId;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java

@@ -48,7 +48,6 @@
    @ApiModelProperty(value = "需走访人名字")
    private String visiterName;


    @ExcelProperty(value = "身份证号码",index = 3)
    @ApiModelProperty(value = "身份证号码")
    @EncryptDecryptField
@@ -104,6 +103,8 @@
    @ApiModelProperty(value = "网格员联系方式")
    private String gridMenberTele;

    @ApiModelProperty(value = "所属网格")
    private String gridName;

    @ApiModelProperty(value = "需走访人员性别")
    private Integer visiterSex;
@@ -182,8 +183,8 @@
    private Boolean urgentDell;


    @ApiModelProperty(value = "是否异常行为")
    private Boolean exception;
    @ApiModelProperty(value = "是否异常行为(1.是   0.否)")
    private Integer exception;

    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
    private String tableContentJson;

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

@@ -1436,6 +1436,15 @@
    R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);

    /**
     * 车辆导出
     *
     * @param exportComMngCarExcelDTO
     * @return
     */
    @PostMapping("/common/data/car/export")
    R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);

    /**
     * 社区后台实有单位管理列表
     *
     * @param pageComMngRealCompanyDTO

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

@@ -138,6 +138,61 @@
        return R.ok();
    }

    @ApiOperation(value = "车辆Excel-数据导出")
    @PostMapping("/car/export")
    public R exportComMngCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO) {
        exportComMngCarExcelDTO.setCommunityId(this.getCommunityId());
        String url = excelUrl;
//        String uuid = UUID.randomUUID().toString().replace("-", "");
        String name = "车辆导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r = communityService.exportRealCar(exportComMngCarExcelDTO);
        if (R.isOk(r)) {
            List<ComMngCarExcelVO> comMngCarExcelVOS = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngCarExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComMngCarExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("车辆导出").build();
                        excelWriter.write(comMngCarExcelVOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到车辆");
    }

    @ApiOperation(value = "下载居民导入模板")
    @GetMapping("/user/template")
    @ApiImplicitParam(name = "id", value = "小区id", required = true)
@@ -436,7 +491,7 @@
                            //设置政治面貌
                            populationExcelVo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(popul.getPoliticalOutlook()));
                            //设置是否租住
                            populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent()));
//                            populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent()));
                            populationExcelVoList.add(populationExcelVo);
                        }
                    }

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

@@ -8,6 +8,7 @@
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;
@@ -158,6 +159,7 @@
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    List<List<String>> list = new ArrayList<>();
@@ -180,7 +182,6 @@
                    }
                    dataList.add(data);
                    EasyExcel.write(fileName).head(list).sheet("实有人口导入模板").doWrite(dataList);

                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
@@ -219,21 +220,21 @@
        List<String> head2 = new ArrayList<String>();
        head2.add("民族");
        List<String> head3 = new ArrayList<String>();
        head3.add("政治面貌(中共党员/中共预备党员/共青团员/民革党员/台盟盟员/群众)");
        head3.add("政治面貌(群众/中共党员/共青团员)");
        List<String> head4 = new ArrayList<String>();
        head4.add("是否租住(是/否)");
        head4.add("是否租住");
        List<String> head5 = new ArrayList<String>();
        head5.add("与户主关系（户主/本人/配偶/夫/妻/子/女/孙女/孙子/兄弟姐妹/父母/其他）");
        head5.add("与户主关系");
        List<String> head6 = new ArrayList<String>();
        head6.add("*街/路/巷(必填)");
        head6.add("街/路/巷");
        List<String> head7 = new ArrayList<String>();
        head7.add("*小区号（必填，政府对于每个小区都有特定编号）");
        head7.add("小区号（政府对于每个小区都有特定编号）");
        List<String> head8 = new ArrayList<String>();
        head8.add("*楼排号（必填）");
        head8.add("楼排号");
        List<String> head9 = new ArrayList<String>();
        head9.add("*单元号（必填）");
        head9.add("单元号");
        List<String> head10 = new ArrayList<String>();
        head10.add("*户室（必填，四位数表示。前两位楼层，后两位户号）");
        head10.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head11 = new ArrayList<String>();
        head11.add("建筑用途");
        List<String> head12 = new ArrayList<String>();
@@ -250,27 +251,59 @@
        List<String> head17 = new ArrayList<String>();
        head17.add("籍贯");
        List<String> head18 = new ArrayList<String>();
        head18.add("文化程度(小学/初中/高中/中专/大专/本科/硕士/博士/其他)");
        head18.add("文化程度");
        List<String> head19 = new ArrayList<String>();
        head19.add("婚姻状况(未婚/已婚/初婚/再婚/复婚/丧偶/离婚/分居/其他)");
        head19.add("婚姻状况");
        List<String> head20 = new ArrayList<String>();
        head20.add("健康状况");

        List<String> head21 = new ArrayList<String>();
        head21.add("工作单位");
        head21.add("血型");
        List<String> head22 = new ArrayList<String>();
        head22.add("本地外地(本地/外地)");
        head22.add("宗教信仰");
        List<String> head23 = new ArrayList<String>();
        head23.add("户口所在地");
        head23.add("职业");

        List<String> head24 = new ArrayList<String>();
        head24.add("备注");
        head24.add("工作单位/学校");
        List<String> head25 = new ArrayList<String>();
        head25.add("证件照（人面像）照片");
        head25.add("本地/外地");
        List<String> head26 = new ArrayList<String>();
        head26.add("证件照（国徽面）照片");
        head26.add("户口所在地");

        List<String> head27 = new ArrayList<String>();
        head27.add("户口本照片");
        head27.add("是否居住地(是/否)");
        List<String> head28 = new ArrayList<String>();
        head28.add("是否为居住地(是/否)");
        head28.add("居住地址");

        List<String> head29 = new ArrayList<String>();
        head29.add("人员类型（户籍人员/留守人员/外地人员/境外人员）");
        List<String> head30 = new ArrayList<String>();
        head30.add("国家");
        List<String> head31 = new ArrayList<String>();
        head31.add("离开日期（境外人员填写）");
        List<String> head32 = new ArrayList<String>();
        head32.add("人员状态（正常/失联/出国）");
        List<String> head33 = new ArrayList<String>();
        head33.add("月收入情况");

        List<String> head34 = new ArrayList<String>();
        head34.add("家庭情况");
        List<String> head35 = new ArrayList<String>();
        head35.add("来华目的（境外人员填写）");
        List<String> head36 = new ArrayList<String>();
        head36.add("抵达日期（境外人员填写）");

        List<String> head37 = new ArrayList<String>();
        head37.add("备注");
        List<String> head38 = new ArrayList<String>();
        head38.add("证件照（人面像）照片");
        List<String> head39 = new ArrayList<String>();
        head39.add("证件照（国徽面）照片");
        List<String> head40 = new ArrayList<String>();
        head40.add("户口本照片");
        List<String> head41 = new ArrayList<String>();
        head41.add("是否死亡(是/否)");


        list.add(head0);
@@ -302,6 +335,19 @@
        list.add(head26);
        list.add(head27);
        list.add(head28);
        list.add(head29);
        list.add(head30);
        list.add(head31);
        list.add(head32);
        list.add(head33);
        list.add(head34);
        list.add(head35);
        list.add(head36);
        list.add(head37);
        list.add(head38);
        list.add(head39);
        list.add(head40);
        list.add(head41);
        return list;
    }

@@ -328,14 +374,27 @@
        data.add("硕士");
        data.add("未婚");
        data.add("");
        data.add("O");
        data.add("");
        data.add("工程师");
        data.add("阿里巴巴");
        data.add("本地");
        data.add("四川成都");
        data.add("");
        data.add("");
        data.add("");
        data.add("");
        data.add("是");
        data.add("四川成都高新");
        data.add("户籍");
        data.add("中国");
        data.add("");
        data.add("正常");
        data.add("");
        data.add("");
        data.add("");
        data.add("");
        data.add("");
        data.add("");
        data.add("");
        data.add("");
        data.add("否");
        return data;
    }

@@ -377,7 +436,9 @@
                            //设置政治面貌
                            populationExcelVo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(popul.getPoliticalOutlook()));
                            //设置是否租住
                            populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent()));
//                            populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent()));
                            //设置本地或外地
                            populationExcelVo.setOutOrLacal(PopulOutOrLocalEnum.getCnDescByName(popul.getPoliticalOutlook()));
                            populationExcelVoList.add(populationExcelVo);
                        }
                    }

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/CommonApi.java

@@ -83,6 +83,10 @@
            fileExtension = ".mp3";
        }

        if(originName.toLowerCase().endsWith(".gif")){
            fileExtension = ".gif";
        }


        String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
        File file1 = new File(fileName);

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

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
@@ -109,6 +110,17 @@
    @PostMapping("/car/import")
    public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId) {
        return comMngCarService.listSaveMngCarExcelVO(list, communityId);
    }

    /**
     * 车辆导出
     *
     * @param exportComMngCarExcelDTO
     * @return
     */
    @PostMapping("/car/export")
    public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
        return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
    }

    /**
@@ -431,6 +443,36 @@
    }

    /**
     * 基础数据》特殊群体》分页查询标签列表
     * @param comMngUserTagDTO
     * @return
     */
    @PostMapping("/special/tags/page")
    public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO){
        return comMngPopulationService.specialInputUserTags(comMngUserTagDTO);
    }

    /**
     * 新增或修改特殊群体标签
     * @param comMngTagVO
     * @return
     */
    @PostMapping("/special/tags/save")
    public R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO){
        return comMngPopulationService.saveSpecialInputUserTags(comMngTagVO);
    }

    /**
     * 删除特殊群体标签
     * @param id
     * @return
     */
    @PostMapping("/special/tags/delete")
    public R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id){
        return comMngPopulationService.deleteSpecialInputUserTags(id);
    }

    /**
     * 编辑实有人口_电子档案
     *
     * @param userElectronicFileVO

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

@@ -3,9 +3,14 @@
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.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationCarVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.service_community.model.dos.ComMngCarDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -65,4 +70,30 @@
    List<ComMngPopulationCarVO> getPopulationCarListByIdCard(@Param(value = "idCard") String idCard);



    @Select("<script> " +
            " SELECT  " +
            "  t.area_name AS areaName,  " +
            "  t.user_name AS userName,  " +
            "  t.brand,  " +
            "  t.plate_num AS plateNum,  " +
            "  t.color,  " +
            "  t.mobile,  " +
            "  t.address " +
            "FROM  " +
            "  com_mng_car t where 1=1 " +
            "<if test='exportComMngCarExcelDTO.areaName != null and exportComMngCarExcelDTO.areaName.trim() != &quot;&quot;'>" +
            " and t.area_name LIKE concat( #{exportComMngCarExcelDTO.areaName}, '%' )  " +
            " </if> " +
            "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != 0'>" +
            " and t.community_id = #{exportComMngCarExcelDTO.communityId} " +
            " </if> " +
            "<if test='exportComMngCarExcelDTO.userName != null and exportComMngCarExcelDTO.userName.trim() != &quot;&quot;'>" +
            " and t.user_name LIKE concat( #{exportComMngCarExcelDTO.userName}, '%' )  " +
            " </if> " +
            " order by t.create_at desc" +
            "</script>")
    List<ComMngCarExcelVO> exportRealCar(@Param(value = "exportComMngCarExcelDTO") ExportComMngCarExcelDTO exportComMngCarExcelDTO);


}

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

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
@@ -132,7 +131,6 @@
            "cmp.act_id, " +
            "cmp.village_id, " +
            "cmp.sex, " +
            "cmp.age, " +
            "cmp.card_no, " +
            "cmp.road, " +
            "cmp.door_no, " +
@@ -148,7 +146,6 @@
            "cmp.native_place, " +
            "cmp.nation,  " +
            "cmp.label,  " +
            "cmp.relation,  " +
            "cmp.marriage,  " +
            "cmp.culture_level,  " +
            "cmp.out_or_local,  " +
@@ -156,6 +153,7 @@
            "cmp.healthy,  " +
            "cmp.birthday,  " +
            "cmp.update_at,  " +
            "cmp.address,  " +
            "cmp.is_rent  " +
            "FROM  " +
            "com_mng_population AS cmp " +
@@ -163,6 +161,9 @@
            "<where>" +
            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
            "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
            " </if> " +
            "<if test='comMngPopulationVO.label != null and comMngPopulationVO.label != &quot;&quot;'>" +
            "AND cmp.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
            " </if> " +
            "<if test='comMngPopulationVO.actId != null'>" +
            " and cmp.act_id = #{comMngPopulationVO.actId} " +
@@ -215,6 +216,9 @@
            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
            "AND cmp.remark = #{comMngPopulationVO.remark} " +
            " </if> " +
            "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != &quot;&quot;'>" +
            "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%')  " +
            " </if> " +
            " </where>" +
            " order by cmp.create_at desc" +
            "</script>")
@@ -235,6 +239,15 @@
            " order by cmp.create_at desc " +
            "</script>")
    IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);

    @Select("<script> " +
            "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag where community_id = #{comMngUserTagDTO.communityId}" +
            "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != &quot;&quot;'>" +
            " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " +
            " </if> " +
            " order by create_at desc " +
            "</script>")
    IPage<ComMngTagVO> specialInputUserTags(Page page, @Param("comMngUserTagDTO") PageInputUserDTO comMngUserTagDTO);

    @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}")
    UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard);
@@ -435,8 +448,7 @@
            " label like concat('%',#{label},'%')")
    Integer getSpecialStatisticsByLabel(@Param("label") String label);

    @Select("<script> " +
            "SELECT " +
    @Select("SELECT " +
            " count( egd.id ) AS gridTotal, " +
            " ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
            " ( " +
@@ -448,12 +460,6 @@
            " WHERE " +
            "  egd1.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " ) AS eventTotal, " +
            " ( " +
            " SELECT " +
@@ -464,12 +470,6 @@
            " WHERE " +
            "  egd2.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
            " ( " +
            " SELECT " +
@@ -481,19 +481,12 @@
            "  egd2.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "  AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " ) AS solveEventTotal  " +
            "FROM " +
            " event_grid_data AS egd  " +
            "WHERE " +
            " egd.grid_community_id = #{screenEventDTO.communityId} " +
            " </script>")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
            " egd.grid_community_id = #{communityId}")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);

    @Select("SELECT " +
            " DATE_FORMAT( e.create_at, '%m' ) months  " +
@@ -511,8 +504,7 @@
            " LIMIT 3")
    List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);

    @Select("<script> " +
            "SELECT " +
    @Select("SELECT " +
            " count( e.id ) AS eventZATotal, " +
            " IFNULL(( " +
            "  SELECT " +
@@ -521,16 +513,10 @@
            "   `event` AS e1 " +
            "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  " +
            "  WHERE " +
            "   egd1.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd1.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 1  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventZATotal, " +
@@ -541,16 +527,10 @@
            "   `event` AS e2 " +
            "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " +
            "  WHERE " +
            "   egd2.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd2.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 5  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventTFTotal, " +
@@ -561,16 +541,10 @@
            "   `event` AS e3 " +
            "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " +
            "  WHERE " +
            "   egd3.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd3.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 5  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventTFTotal, " +
@@ -581,16 +555,10 @@
            "   `event` AS e4 " +
            "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " +
            "  WHERE " +
            "   egd4.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd4.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 6  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventTSTotal, " +
@@ -601,16 +569,10 @@
            "   `event` AS e5 " +
            "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " +
            "  WHERE " +
            "   egd5.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd5.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 6  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventTSTotal, " +
@@ -621,16 +583,10 @@
            "   `event` AS e6 " +
            "   LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id  " +
            "  WHERE " +
            "   egd6.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd6.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 3  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventMDTotal, " +
@@ -641,16 +597,10 @@
            "   `event` AS e7 " +
            "   LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id  " +
            "  WHERE " +
            "   egd7.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd7.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 3  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventMDTotal, " +
@@ -661,16 +611,10 @@
            "   `event` AS e8 " +
            "   LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id  " +
            "  WHERE " +
            "   egd8.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd8.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 4  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventBWDTotal, " +
@@ -681,16 +625,10 @@
            "   `event` AS e9 " +
            "   LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id  " +
            "  WHERE " +
            "   egd9.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd9.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 4  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventBWDTotal, " +
@@ -701,16 +639,10 @@
            "   `event` AS e10 " +
            "   LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id  " +
            "  WHERE " +
            "   egd10.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd10.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 2  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventGGTotal, " +
@@ -721,51 +653,24 @@
            "   `event` AS e11 " +
            "   LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id  " +
            "  WHERE " +
            "   egd11.grid_community_id = #{screenEventDTO.communityId}  " +
            "   egd11.grid_community_id = #{communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 2  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventGGTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{screenEventDTO.communityId} " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{screenEventDTO.communityId} " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "), 0 ) AS yesEventSSPTotal  " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{communityId} ), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{communityId} ), 0 ) AS yesEventSSPTotal  " +
            "FROM " +
            " `event` AS e " +
            " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " +
            "WHERE " +
            " egd.grid_community_id = #{screenEventDTO.communityId}  " +
            " egd.grid_community_id = #{communityId}  " +
            " AND event_category = 1  " +
            " AND event_type = 1  " +
            " AND event_status = 2 " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " </script>")
    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
            " AND event_status = 2")
    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);

    @Select("SELECT " +
            " su.nick_name AS userName, " +
@@ -807,8 +712,7 @@
            " egd.grid_community_id = #{communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);

    @Select("<script> " +
            "SELECT " +
    @Select("SELECT " +
            " event_type AS type, " +
            " e.id AS eventId, " +
            " happent_lat_lng AS latLng  " +
@@ -819,31 +723,20 @@
            " e.event_category = 1  " +
            " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " +
            " AND e.event_status = 2  " +
            " AND egd.grid_community_id = #{screenEventDTO.communityId}  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "UNION ALL SELECT " +
            " AND egd.grid_community_id = #{communityId}  " +
            " AND e.create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY) UNION ALL " +
            "SELECT " +
            " IFNULL( NULL, 7 ) AS type, " +
            " id AS eventId, " +
            " lng_lat AS latLng  " +
            "FROM " +
            " com_act_easy_photo  " +
            "WHERE " +
            " community_id = #{screenEventDTO.communityId}  " +
            " community_id = #{communityId}  " +
            " AND del_tag = 0  " +
            " AND lng_lat IS NOT NULL  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " </script>")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
            " AND create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY)")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long communityId);

    @Select("SELECT " +
            " count( id ) AS specialTotal, " +
@@ -879,7 +772,7 @@
    CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);


    @Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
    @Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
    Map<String, Long> countBySex(@Param("communityId") Long communityId);

    @Select(

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

@@ -156,6 +156,9 @@
            "<if test='populationHouseAdminDTO.villageId != null'>" +
            " and cmph.village_id = #{populationHouseAdminDTO.villageId} " +
            " </if> " +
            "<if test='populationHouseAdminDTO.address != null and populationHouseAdminDTO.address != &quot;&quot; '>" +
            " AND cmph.address = #{populationHouseAdminDTO.address}  " +
            " </if> " +
            " </where>" +
            " order by update_at desc" +
            " </script>")

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

New file
@@ -0,0 +1,27 @@
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.ExportRealAssetsExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
import com.panzhihua.service_community.model.dos.ComMngRealAssetsDO;
import com.panzhihua.service_community.model.dos.ComMngUserTagDO;
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/14 10:28
 */
@Mapper
public interface ComMngUserTagDAO extends BaseMapper<ComMngUserTagDO> {


}

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

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

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * @description: 特殊群体标签
 * @author: txb
 * @date: 2021/7/14 10:43
 */
@Data
@TableName(value = "com_mng_user_tag")
public class ComMngUserTagDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 标签名称
     */
    private String tagName;

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

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

    /**
     * 系统预置：1-是 0-否
     */
    private Integer sysFlag;

}

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

@@ -2,9 +2,11 @@

import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;

@@ -52,4 +54,12 @@
     * @return
     */
    R listSaveMngCarExcelVO(List<ComMngCarExcelVO> list, Long communityId);

    /**
     * 车辆导出
     *
     * @param exportComMngCarExcelDTO
     * @return
     */
    R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
}

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

@@ -18,8 +18,13 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

@@ -143,6 +148,27 @@
    R deleteSpecialInputUser(Long id);

    /**
     * 基础数据》特殊群体》分页查询标签列表
     * @param comMngUserTagDTO
     * @return
     */
    R specialInputUserTags(PageInputUserDTO comMngUserTagDTO);

    /**
     * 新增或修改特殊群体标签
     * @param comMngTagVO
     * @return
     */
    R saveSpecialInputUserTags(ComMngTagVO comMngTagVO);

    /**
     * 删除特殊群体标签
     * @param id
     * @return
     */
    R deleteSpecialInputUserTags(Long id);

    /**
     * 查询实有人口电子档信息
     *
     * @param populationId 实有人口id

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

@@ -72,16 +72,22 @@
        if(count > 0){
            return R.fail("在此期间已有活动，请勿重复添加");
        }

        Date nowDate = new Date();
        ComActEasyPhotoActivityDO photoActivityDO = new ComActEasyPhotoActivityDO();
        BeanUtils.copyProperties(addEasyPhotoActivityDTO,photoActivityDO);
        photoActivityDO.setActivityStartAt(DateUtils.stringToDate(addEasyPhotoActivityDTO.getActivityStartAt(),DateUtils.ymdhm_format));
        photoActivityDO.setActivityEndAt(DateUtils.stringToDate(addEasyPhotoActivityDTO.getActivityEndAt(),DateUtils.ymdhm_format));
        photoActivityDO.setCreateAt(new Date());
        photoActivityDO.setReleaseAt(new Date());
        if(new Date().getTime() > photoActivityDO.getActivityStartAt().getTime()){
            photoActivityDO.setStatus(2);
        if(photoActivityDO.getActivityEndAt().getTime() <= nowDate.getTime()){
            return R.fail("活动结束时间不可小于当前时间");
        }

        if(nowDate.getTime() >= photoActivityDO.getActivityStartAt().getTime()){
            photoActivityDO.setStatus(ComActEasyPhotoActivityDO.status.jxz);
        }else{
            photoActivityDO.setStatus(1);
            photoActivityDO.setStatus(ComActEasyPhotoActivityDO.status.dks);
        }

        photoActivityDO.setCount(0);

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

@@ -7,10 +7,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ParamRegularUtil;
@@ -173,4 +175,10 @@
        this.saveBatch(comMngCarDOS);
        return R.ok("共计导入车辆数量：" + comMngCarDOS.size());
    }

    @Override
    public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO) {
        List<ComMngCarExcelVO> list = comMngCarDAO.exportRealCar(exportComMngCarExcelDTO);
        return R.ok(list);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java

@@ -98,7 +98,7 @@
     * @return  网格员列表
     */
    @PostMapping("/member/list")
    public R getGridMemberLists(@RequestParam("communityId") Long communityId){
    public R getGridMemberLists(@RequestParam(value = "communityId",required = false) Long communityId){
        return eventGridDataService.getGridMemberLists(communityId);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -1021,6 +1021,7 @@
        }
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
        eventDO.setHappenTime(publicityEventAddDTO.getPropagandaTime());
        eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
        eventDO.setEventCategory(2l);//宣传事件
        eventDO.setEventStatus(2);//事件状态 2发布
@@ -2281,6 +2282,9 @@
        List<EventWorkVO> list = new ArrayList<>();
        for(EventWorkVO eventWorkVO: listHalfYearByDyn()){
            EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId);
            result.setEventTotal(result.getEventTotal() + result.getSspTotal());
            result.setEventAdd(result.getEventAdd() + result.getSspAdd());
            result.setEventSolve(result.getEventSolve() + result.getSspSolve());
            result.setMonth(eventWorkVO.getMonth());
            list.add(result);
        }
@@ -2303,11 +2307,11 @@
        List<EventWorkVO> dateList = new ArrayList<>();
        Date now  = new Date();
        for(int i= 6;i>=1;i--){
            Date date = DateUtils.getDateM(now,-i);
            Date date = DateUtils.getDateM(now,-(i-1));
            DateTime endDay = DateUtil.endOfMonth(date);

            int m = DateUtil.month(endDay);
            m++;
//            m++;
            if(m == 12){
                m = 0;
            }
@@ -2317,23 +2321,14 @@
            EventWorkVO eventWorkVO = new EventWorkVO();
            eventWorkVO.setMonth(monthStr[m]+"月上旬");
            eventWorkVO.setStart(month+ "-01 00:00:00");
            eventWorkVO.setEnd(month+ "-"+half+" 23:59:58");
            eventWorkVO.setEnd(month+ "-"+half+" 23:59:59");
            dateList.add(eventWorkVO);
            EventWorkVO eventWorkVO1 = new EventWorkVO();
            eventWorkVO1.setMonth(monthStr[m]+"月下旬");
            eventWorkVO1.setStart(month+ "-"+half+" 23:59:58");
            eventWorkVO1.setStart(month+ "-"+half+" 23:59:59");
            eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay,"yyyy-MM-dd HH:mm:ss"));
            dateList.add(eventWorkVO1);
        }
        return dateList;

    }

    public static void main(String[] args) {
        String content = "30,104";
        String re = "[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?";

        System.out.println(content.matches(re));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -177,19 +177,15 @@
    @Transactional
    @Override
    public R delete(IdDTO idDTO, Long communityId) {
        StringBuilder rt = new StringBuilder();
        String[] idarr = idDTO.getId().split(",");
        for(String id:idarr){
            if(StringUtils.isEmpty(id)){
                continue;
        String[] ids = idDTO.getId().split(",");
        for(String id:ids){
            EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(id));
            if(eventVisitingTasksDO != null){
                if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
                    return R.fail("您选择的走访任务中有已解决的不可删除");
                }
                eventVisitingTasksMapper.deleteById(id);
            }
            String error = toDelete(Long.valueOf(id));
            if(!StringUtils.isEmpty(error)){
                rt.append(rt);
            }
        }
        if(!StringUtils.isEmpty(rt)){
            return R.fail("部分删除失败:"+rt.toString());
        }
        return R.ok();
    }
@@ -202,7 +198,7 @@
        if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
            return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
        }
        eventVisitingTasksMapper.deleteById(Long.valueOf(id));
        eventVisitingTasksMapper.deleteById(id);
        return null;
    }

@@ -371,7 +367,7 @@
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
            return R.fail("当前状态不可撤销");
        }
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),5);
        if(rt > 0){
            return R.ok();
        }
@@ -383,7 +379,7 @@
    public R reset(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != 5){
            return R.fail("当前状态不可恢复");
        }
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -44,8 +44,9 @@
        egd.data,
        egd.create_at,
        egd.create_by,
        egd.grid_community_id,
        (select lc_grid_name from lc_compare_code where local_grid_id = egd.id) as lcGirdName,
        (select local_grid_id from lc_compare_code where local_grid_id = egd.id) as lcGirdId,
        (select id from lc_compare_code where local_grid_id = egd.id) as lcGirdId,
        ca.`name` AS communityName
        FROM
        event_grid_data AS egd

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -1106,6 +1106,9 @@
        LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
        WHERE
        egd.grid_community_id = #{communityId} and e.event_status = 2 AND e.create_at <![CDATA[<=]]> #{end}) AS eventTotal,
        (select count(id) from com_act_easy_photo where community_id = #{communityId} and del_tag = 0 and create_at <![CDATA[<=]]> #{end}) as sspTotal,
        (select count(id) from com_act_easy_photo where community_id = #{communityId} and del_tag = 0 and #{start} <![CDATA[<=]]> create_at AND create_at <![CDATA[<=]]> #{end}) as sspAdd,
        (select count(id) from com_act_easy_photo where community_id = #{communityId} and handle_status = 2 and del_tag = 0 and #{start} <![CDATA[<=]]> create_at AND create_at <![CDATA[<=]]> #{end}) as sspSolve,
        (
        SELECT
        COUNT( e1.id )
@@ -1184,7 +1187,7 @@
                AND e5.event_type = 6
                AND egd5.grid_community_id = #{communityId}
            ) AS tsTotal,
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and handle_status = 2) as sspTotal
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and del_tag = 0 and handle_status = 2) as sspTotal
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
@@ -1258,7 +1261,7 @@
                AND e5.event_type = 6
                AND egd5.grid_community_id = #{communityId}
            ) AS tsTotal,
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and handle_status = 1) as sspTotal
            (select count(id) from com_act_easy_photo as caep where community_id = #{communityId} and del_tag = 0 and handle_status = 1) as sspTotal
        FROM
            `event` AS e
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -58,9 +58,10 @@

    <select id="findListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO">
        select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.visiter_sex,vt.visiter_address,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status,
        TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code
        TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code,vt.exception,vt.grid_member_name,vt.grid_menber_tele,egd.grid_name AS gridName
        from event_visiting_tasks vt left join com_mng_population p on vt.visiter_id = p.id
        left join sys_user u on vt.create_by = u.user_id
        left join event_grid_data egd on egd.id = vt.grid_id
        where 1=1
        <if test = "query.communityId != null">
            and p.act_id = #{query.communityId}
@@ -108,7 +109,7 @@
    </select>

    <select id="list" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.AppVisitTasksVO">
        SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,u.name as creator,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
        SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.grid_menber_tele,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,u.name as creator,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
        p.card_no_str,vt.exception,p.name,REPLACE(p.label,',','#')
        FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id
        left join sys_user u on vt.create_by = u.user_id
@@ -172,7 +173,7 @@
    </select>

    <select id="countNoneComplete" resultType="java.lang.Integer">
        SELECT count(id) from event_visiting_tasks where visiter_id = #{id} and (event_status = 1 or event_status = 2 or event_status = 4)
        SELECT count(id) from event_visiting_tasks where visiter_id = #{id} and event_status = 1
    </select>

    <update id="updateEventStatus">