From 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 16:30:02 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
index 44cae34..a86b6e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
+++ b/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
@@ -45,10 +53,24 @@
}
IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
for (ComPropertyRepairVO record : list.getRecords()) {
- record.setRepairName(DesensitizedUtil.mobilePhone(record.getRepairPhone()));
+ record.setRepairPhone(DesensitizedUtil.mobilePhone(record.getRepairPhone()));
record.setRepairName(DesensitizedUtil.chineseName(record.getRepairName()));
record.setFeedback(DesensitizedUtil.chineseName(record.getFeedback()));
}
+ return R.ok(list);
+ }
+ @Override
+ public R selectDetailDesensitize(Long id) {
+ ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
+ vo.setRepairPhone(DesensitizedUtil.mobilePhone(vo.getRepairPhone()));
+ vo.setRepairName(DesensitizedUtil.chineseName(vo.getRepairName()));
+ 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);
}
@@ -58,12 +80,9 @@
return R.ok(vo);
}
- @Override
- public R selectDetailDesensitize(Long id) {
- ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
- vo.setRepairPhone(DesensitizedUtil.mobilePhone(vo.getRepairPhone()));
- vo.setRepairName(DesensitizedUtil.chineseName(vo.getRepairName()));
- vo.setFeedback(DesensitizedUtil.chineseName(vo.getFeedback()));
- return R.ok(vo);
+
+ public static void main(String[] args) {
+ System.out.println(DesensitizedUtil.mobilePhone("13980594622"));
}
+
}
--
Gitblit v1.7.1