花城E+防疫修改

101captain

2022-05-07 7f0110ed488419b0500562f2514bf3b9e2c2f6b9

花城E+防疫修改

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

@@ -191,7 +191,7 @@
    @Override
    public R statics(String date) {
        List<ComAcidStaticVO> comAcidStaticVOS=new ArrayList<>();
        String[] area={"东区","西区","仁和区","米易县","盐边县","钒钛新城"};
        String[] area={"攀枝花市","东区","西区","仁和区","米易县","盐边县","钒钛新城"};
        String[] country={"上海市","吉林省","广东省","江苏省","浙江省","山东省","湖北省","山西省","黑龙江省","广西壮族自治区","河北省","辽宁省","河南省","福建省","安徽省","南昌市","西宁市","西安市","文山州","兰州市","邵阳市"};
        for(String areaName:area){
            ComAcidStaticVO comAcidStaticVO=this.baseMapper.areaStatics(areaName,date);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml

@@ -104,16 +104,16 @@
    </select>

    <select id="areaStatics" resultType="com.panzhihua.common.model.vos.community.acid.ComAcidStaticVO">
        select (select count(*) from com_act_acid_record <if test="localCity!=null and localCity!=''"> where local_city like concat('%',#{localCity},'%')</if> <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) allCount,
        (select count(*) from com_act_acid_record where danger_area = '是' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if> <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) dangerCount,
        (select count(*) from com_act_acid_record where color_mark = '绿码' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) greenMark,
        (select count(*) from com_act_acid_record where color_mark = '红码' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) redMark,
        (select count(*) from com_act_acid_record where color_mark = '黄码' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) yellowMark,
        (select count(*) from com_act_acid_record where travel_card = '是' <if test="localCity!=null and localCity!=''"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) travelCount
        select (select count(*) from com_act_acid_record <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> where local_city like concat('%',#{localCity},'%')</if> <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) allCount,
        (select count(*) from com_act_acid_record where danger_area = '是' <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> and local_city like concat('%',#{localCity},'%')</if> <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) dangerCount,
        (select count(*) from com_act_acid_record where color_mark = '绿码' <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) greenMark,
        (select count(*) from com_act_acid_record where color_mark = '红码' <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) redMark,
        (select count(*) from com_act_acid_record where color_mark = '黄码' <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) yellowMark,
        (select count(*) from com_act_acid_record where travel_card = '是' <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> and local_city like concat('%',#{localCity},'%')</if><if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) travelCount
    </select>

    <select id="countryStatics" resultType="Integer">
        select count(*) from com_act_acid_record where departure_city like concat('%',#{departureCity},'%') <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> and local_city like concat('%',#{localCity},'%')
        select count(*) from com_act_acid_record where departure_city like concat('%',#{departureCity},'%') <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity!='攀枝花市'"> and local_city like concat('%',#{localCity},'%')</if>
    </select>

    <select id="fiveCountPlus" resultType="com.panzhihua.common.model.vos.community.reserve.FiveCount">

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -677,8 +677,7 @@
        if (StringUtils.isNotEmpty(partyBuildingMemberVO.getFunction())) {
            comPbMemberDO.setFunction(partyBuildingMemberVO.getFunction());
        }
        if (nonNull(partyBuildingMemberVO.getSpecialtyCategory())) {
            comPbMemberDO.setSpecialtyCategory(partyBuildingMemberVO.getSpecialtyCategory());
        if (nonNull(partyBuildingMemberVO.getSpecialtyName())) {
            comPbMemberDO.setSpecialtyName(partyBuildingMemberVO.getSpecialtyName());
        }
        if(nonNull(partyBuildingMemberVO.getPhone())){