bug修改

101captain

2022-06-06 560db6a1036201e7e2ac50f34ad4a418f17eaba6

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

@@ -353,12 +353,21 @@
            }
            String localCity = comActAcidRecordVO.getLocalCity();
            String localAddress = comActAcidRecordVO.getLocalAddress();
            Integer checkStatus=comActAcidRecordVO.getCheckStatus();
            String remark=comActAcidRecordVO.getRemark();
            BeanUtils.copyProperties(comActAcidRecord1, comActAcidRecordVO);
            if(StringUtils.isNotEmpty(localCity)){
                comActAcidRecordVO.setLocalCity(localCity);
            }
            if(StringUtils.isNotEmpty(localAddress)){
                comActAcidRecordVO.setLocalAddress(localAddress);
            }
            BeanUtils.copyProperties(comActAcidRecord1,comActAcidRecord);
            if(checkStatus>0){
                comActAcidRecord.setCheckStatus(checkStatus);
            }
            if(StringUtils.isNotEmpty(remark)){
                comActAcidRecord.setRemark(remark);
            }
        }
        ComActAcidDangerMember comActAcidDangerMember =
@@ -394,32 +403,21 @@
        ComActAcidRecord comActAcidRecord = new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO, comActAcidRecord);
        String idCard = comActAcidRecordVO.getIdCard();
        if(StringUtils.isNotEmpty(comActAcidRecordVO.getAcidImage())){
            comActAcidRecord.setAcidImage(" ");
        }
        if(StringUtils.isNotEmpty(comActAcidRecordVO.getColorImage())){
            comActAcidRecord.setColorImage(" ");
        }
        if(StringUtils.isNotEmpty(comActAcidRecordVO.getTravelImage())){
            comActAcidRecord.setTravelImage(" ");
        }
        if(StringUtils.isNotEmpty(comActAcidRecordVO.getVaccinationImage())){
            comActAcidRecord.setVaccinationImage(" ");
        }
        if (isBlank(idCard)) {
            //只修改地址，其他信息需要查询
            //只修改核对状态，其他信息需要查询
            ComActAcidRecord comActAcidRecord1 = this.baseMapper.selectById(comActAcidRecordVO.getId());
            if (isNull(comActAcidRecord1)) {
                return R.fail("填报纪录不存在");
            }
            String localCity = comActAcidRecordVO.getLocalCity();
            String localAddress = comActAcidRecordVO.getLocalAddress();
            Integer checkStatus=comActAcidRecordVO.getCheckStatus();
            String remark=comActAcidRecordVO.getRemark();
            BeanUtils.copyProperties(comActAcidRecord1, comActAcidRecordVO);
            if(StringUtils.isNotEmpty(localCity)){
                comActAcidRecordVO.setLocalCity(localCity);
            BeanUtils.copyProperties(comActAcidRecord1,comActAcidRecord);
            if(checkStatus>0){
                comActAcidRecord.setCheckStatus(checkStatus);
            }
            if(StringUtils.isNotEmpty(localAddress)){
                comActAcidRecordVO.setLocalAddress(localAddress);
            if(StringUtils.isNotEmpty(remark)){
                comActAcidRecord.setRemark(remark);
            }
        }
        ComActAcidDangerMember comActAcidDangerMember =