whywhyo
2023-05-13 78694f580367d8825025a0d32beccbd9662764b7
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfCleanMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfCleanService;
@@ -60,6 +61,19 @@
                .like(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
                .eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime())
                .between(zfClean.getHappenStartTime() != null && zfClean.getHappenEndTime() != null, ZfClean::getHappenTime, zfClean.getHappenStartTime(), zfClean.getHappenEndTime());
        return lqw;
    }
    private LambdaQueryWrapper<ZfClean> uniqueCondition(ZfClean zfClean) {
        LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
        lqw.eq(zfClean.getKind() != null, ZfClean::getKind, zfClean.getKind())
                .eq(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())
                .eq(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())
                .eq(StringUtils.isNotEmpty(zfClean.getMethod()), ZfClean::getMethod, zfClean.getMethod())
                .eq(StringUtils.isNotEmpty(zfClean.getPlace()), ZfClean::getPlace, zfClean.getPlace())
                .eq(StringUtils.isNotEmpty(zfClean.getLocation()), ZfClean::getLocation, zfClean.getLocation())
                .eq(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
                .eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime());
        return lqw;
    }
@@ -279,6 +293,13 @@
            zfClean.setFamilyId(myFamilyId);
        }
        //判断是否有重复数据
        LambdaQueryWrapper<ZfClean> lqw = uniqueCondition(zfClean);
        List<ZfClean> list = list(lqw);
        if(list.size()>0){
            throw new RuntimeException("请勿新增重复数据");
        }
        if (save(zfClean)) {
            return AjaxResult.success();
        } else {
@@ -287,6 +308,8 @@
    }
    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {