花城E+防疫修改

101captain

2022-04-26 2c8a9c85cdc5c10faaa37beb1087ad5810932942

花城E+防疫修改

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

@@ -132,6 +132,9 @@
        String name = "防疫登记信息导出.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        // 用户搜索了就下载搜索的用户否则下载所有用户
        if(StringUtils.isEmpty(comActAcidRecordDTO.getLocalCity())){
            comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName());
        }
        R r = communityService.exportComActAcidRecord(comActAcidRecordDTO);
        if (R.isOk(r)) {
            try {

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

@@ -81,7 +81,7 @@
            <if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
                and departure_city like concat('%',#{commonPage.departureCity},'%')
            </if>
            <if test="commonPage.localCity !=null and commonPage.localCity !=''">
            <if test="commonPage.localCity !=null and commonPage.localCity !='' and commonPage.localCity !='panzhihua'">
                and local_city like concat('%',#{commonPage.localCity},'%')
            </if>
            <if test="commonPage.colorMark !=null and commonPage.colorMark !=''">