|
@@ -65,8 +65,6 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
|
|
private String outerSceneVrHost;
|
|
private String outerSceneVrHost;
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
public List<TmHouse> getListByEstate(String estateId){
|
|
public List<TmHouse> getListByEstate(String estateId){
|
|
LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
|
|
lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
|
|
@@ -78,29 +76,39 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
|
|
public IPage<TmHouse> getAuditHouseList(String houseTitle, Integer status, Integer type,
|
|
public IPage<TmHouse> getAuditHouseList(String houseTitle, Integer status, Integer type,
|
|
String belongCompany, String estateName, String token,
|
|
String belongCompany, String estateName, String token,
|
|
String startTime, String endTime,
|
|
String startTime, String endTime,
|
|
- Long pageNum, Long pageSize, ContextTokenBean tokenMap, Integer online) {
|
|
|
|
|
|
+ Long pageNum, Long pageSize, ContextTokenBean tokenMap, Integer online,String statuslist) {
|
|
LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
lambdaQueryWrapper.eq(TmHouse::getIsShow, 1);
|
|
lambdaQueryWrapper.eq(TmHouse::getIsShow, 1);
|
|
if (StringUtils.isNotBlank(houseTitle)) {
|
|
if (StringUtils.isNotBlank(houseTitle)) {
|
|
lambdaQueryWrapper.like(TmHouse::getHouseTitle, houseTitle);
|
|
lambdaQueryWrapper.like(TmHouse::getHouseTitle, houseTitle);
|
|
}
|
|
}
|
|
lambdaQueryWrapper.orderByDesc(TmHouse::getSubmitAuditTime);
|
|
lambdaQueryWrapper.orderByDesc(TmHouse::getSubmitAuditTime);
|
|
- if (null != status) {
|
|
|
|
- if (HouseStatus.ALL.getCode().compareTo(status) != 0) {
|
|
|
|
- //当获取的是未通过的数据时,获取所有<=-1的数据
|
|
|
|
- if(HouseStatus.REJECT.getCode().compareTo(status) == 0){
|
|
|
|
- lambdaQueryWrapper.le(TmHouse::getStatus, status);
|
|
|
|
- }else {
|
|
|
|
- //其余根据状态获取
|
|
|
|
- lambdaQueryWrapper.eq(TmHouse::getStatus, status);
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- lambdaQueryWrapper.ne(TmHouse::getStatus, HouseStatus.DRAFT.getCode());
|
|
|
|
|
|
+// if (null != status) {
|
|
|
|
+// if (HouseStatus.ALL.getCode().compareTo(status) != 0) {
|
|
|
|
+// //当获取的是未通过的数据时,获取所有<=-1的数据
|
|
|
|
+// if(HouseStatus.REJECT.getCode().compareTo(status) == 0){
|
|
|
|
+// lambdaQueryWrapper.le(TmHouse::getStatus, status);
|
|
|
|
+// }else {
|
|
|
|
+// //其余根据状态获取
|
|
|
|
+// lambdaQueryWrapper.eq(TmHouse::getStatus, status);
|
|
|
|
+// }
|
|
|
|
+// } else {
|
|
|
|
+// lambdaQueryWrapper.ne(TmHouse::getStatus, HouseStatus.DRAFT.getCode());
|
|
|
|
+// }
|
|
|
|
+// //捞取所有状态,默认不设置status的过滤条件
|
|
|
|
+// } else {
|
|
|
|
+// lambdaQueryWrapper.eq(TmHouse::getStatus, HouseStatus.WAITING_AUDIT.getCode());
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+ if(StringUtils.isNotEmpty(statuslist)){
|
|
|
|
+ String[] statuslists = statuslist.split(",");
|
|
|
|
+ List<Integer> slist = new ArrayList<>();
|
|
|
|
+ for(String sl:statuslists){
|
|
|
|
+ slist.add(Integer.valueOf(sl));
|
|
}
|
|
}
|
|
- //捞取所有状态,默认不设置status的过滤条件
|
|
|
|
- } else {
|
|
|
|
- lambdaQueryWrapper.eq(TmHouse::getStatus, HouseStatus.WAITING_AUDIT.getCode());
|
|
|
|
|
|
+ lambdaQueryWrapper.in(TmHouse::getStatus,slist);
|
|
}
|
|
}
|
|
|
|
+
|
|
if (StringUtils.isNotBlank(estateName)) {
|
|
if (StringUtils.isNotBlank(estateName)) {
|
|
lambdaQueryWrapper.like(TmHouse::getEstateName, estateName);
|
|
lambdaQueryWrapper.like(TmHouse::getEstateName, estateName);
|
|
}
|
|
}
|
|
@@ -124,6 +132,12 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
|
|
if(StringUtils.isNotBlank(startTime)){
|
|
if(StringUtils.isNotBlank(startTime)){
|
|
lambdaQueryWrapper.ge(TmHouse::getSubmitAuditTime, startTime);
|
|
lambdaQueryWrapper.ge(TmHouse::getSubmitAuditTime, startTime);
|
|
}
|
|
}
|
|
|
|
+//
|
|
|
|
+// if(statues!=null && statues.size()>0){
|
|
|
|
+// lambdaQueryWrapper.in(TmHouse::getStatus,statues);
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+
|
|
if(StringUtils.isNotBlank(startTime)){
|
|
if(StringUtils.isNotBlank(startTime)){
|
|
lambdaQueryWrapper.le(TmHouse::getSubmitAuditTime, endTime);
|
|
lambdaQueryWrapper.le(TmHouse::getSubmitAuditTime, endTime);
|
|
}
|
|
}
|