花城E+bug更新

101captain

2022-05-24 7ad9e32b7d63c372ba502a696ed0aaf5f7dcb754

花城E+bug更新

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

@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.net.URL;
@@ -120,4 +121,11 @@
    private String vaccinationImage;

    private Integer status;


    @ApiModelProperty("交通方式")
    private String transport;

    @ApiModelProperty("行程信息")
    private String transportInfo;
}

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

@@ -119,4 +119,10 @@

    @ExcelProperty("疫苗接种截图")
    private URL vaccinationImage;

    @ApiModelProperty("交通方式")
    private String transport;

    @ApiModelProperty("行程信息")
    private String transportInfo;
}

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

@@ -153,6 +153,12 @@
    @ApiModelProperty("疫苗接种截图")
    private String vaccinationImage;

    @ApiModelProperty("交通方式")
    private String transport;

    @ApiModelProperty("行程信息")
    private String transportInfo;


    public interface type{
        int zj=1;

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

@@ -162,6 +162,13 @@
    @ApiModelProperty("核对状态 0未核对 1已核对")
    private Integer checkStatus;


    @ApiModelProperty("交通方式")
    private String transport;

    @ApiModelProperty("行程信息")
    private String transportInfo;

    public interface type{
        int zj=1;
        int tr=2;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java

@@ -171,4 +171,10 @@

    @ApiModelProperty("是否删除 1是 2否")
    private Integer isDel;

    @ApiModelProperty("交通方式")
    private String transport;

    @ApiModelProperty("行程信息")
    private String transportInfo;
}

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

@@ -139,6 +139,8 @@
    private String aesKey;
    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;
    @Resource
    private ComMngBuildingDAO comMngBuildingDAO;

    /**
     * 新增实有人口
@@ -937,6 +939,17 @@
                    }
                }
                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -1247,7 +1260,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -1558,7 +1583,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -1869,7 +1906,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -2180,7 +2229,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -2493,7 +2554,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -2803,7 +2876,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -3113,7 +3198,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -3423,7 +3520,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -3733,7 +3842,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -4048,7 +4169,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -4357,7 +4490,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());
@@ -4665,7 +4810,19 @@
                        mistakes.add(mistake);
                    }
                }

                log.info("查询实有人口存在社区信息完成");

                log.info("开始处理楼栋信息");
                List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
                if(comMngBuildingDOList.isEmpty()){
                   ComMngBuildingDO  comMngBuildingDO=new ComMngBuildingDO();
                   comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
                   comMngBuildingDO.setName(vo.getFloor());
                   comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
                   comMngBuildingDO.setStreetId(comMngBuildingDO.getStreetId());
                   comMngBuildingDAO.insert(comMngBuildingDO);
                }
            }
        } catch (Exception e) {
            log.info("出现错误，错误原因：" + e.getMessage());