花城优化

puhanshu

2022-05-09 8e8792728a554c7f2af6bda67244ce7c41a9d022

花城优化

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

@@ -32,6 +32,7 @@

import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotEmpty;
import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull;
import static org.apache.commons.lang3.StringUtils.isBlank;

/**
 * (ComActAcidRecord)表服务实现类
@@ -238,6 +239,19 @@
    public R updateLocalCity(ComActAcidRecordVO comActAcidRecordVO) {
        ComActAcidRecord comActAcidRecord = new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO, comActAcidRecord);
        String idCard = comActAcidRecordVO.getIdCard();
        if (isBlank(idCard)) {
            //只修改地址，其他信息需要查询
            ComActAcidRecord comActAcidRecord1 = this.baseMapper.selectById(comActAcidRecordVO.getId());
            if (isNull(comActAcidRecord1)) {
                return R.fail("填报纪录不存在");
            }
            String localCity = comActAcidRecordVO.getLocalCity();
            String localAddress = comActAcidRecordVO.getLocalAddress();
            BeanUtils.copyProperties(comActAcidRecord1, comActAcidRecordVO);
            comActAcidRecordVO.setLocalCity(localCity);
            comActAcidRecordVO.setLocalAddress(localAddress);
        }
        ComActAcidDangerMember comActAcidDangerMember =
            comActAcidDangerMemberDao.selectOne(new QueryWrapper<ComActAcidDangerMember>().lambda()
                .eq(ComActAcidDangerMember::getRecordId, comActAcidRecordVO.getId()));

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

@@ -88,10 +88,10 @@
            </if>
            <if test="pageDangerMemberDTO.isFill != null">
                <if test="pageDangerMemberDTO.isFill == 1">
                    AND t2.local_city IS NOT NULL
                    AND t2.local_city IS NOT NULL AND LENGTH(TRIM(t2.local_city)) > 0
                </if>
                <if test="pageDangerMemberDTO.isFill == 2">
                    AND t2.local_city IS NULL
                    AND (t2.local_city IS NULL OR LENGTH(TRIM(t2.local_city)) = 0)
                </if>
            </if>
            <if test="pageDangerMemberDTO.type != null">