Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-16 8d493a008ce655963f0363b116d5b55e02eff3d6

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java

@@ -9,13 +9,16 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.utlis.RSAUtils;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

import static java.util.Objects.nonNull;

/**
 * (ComPropertyRepair)表服务实现类
@@ -31,8 +34,13 @@

    @Override
    public R pageList(CommonPage commonPage) {
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        return R.ok(list);
        if (nonNull(commonPage.getPropertyCheck()) && nonNull(commonPage.getPropertyId())){
            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList2(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
            return R.ok(list);
        }else{
            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
            return R.ok(list);
        }
    }

    @Override
@@ -51,13 +59,6 @@
        }
        return R.ok(list);
    }

    @Override
    public R selectDetail(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
        return R.ok(vo);
    }

    @Override
    public R selectDetailDesensitize(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
@@ -66,4 +67,18 @@
        vo.setFeedback(DesensitizedUtil.chineseName(vo.getFeedback()));
        return R.ok(vo);
    }

    @Override
    public R pageListProperty(CommonPage commonPage) {
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        return R.ok(list);
    }

    @Override
    public R selectDetail(Long id) {
        ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
        return R.ok(vo);
    }


}