|
|
@@ -4,6 +4,7 @@ import com.baidubce.model.User;
|
|
|
import com.happy.Model.AdminManager;
|
|
|
import com.happy.Model.Hotel;
|
|
|
import com.happy.Model.House;
|
|
|
+import com.happy.Model.Workflow;
|
|
|
import com.happy.Model.weixin.Users;
|
|
|
import com.happy.Until.*;
|
|
|
import com.happy.Until.Enum.B;
|
|
|
@@ -55,6 +56,8 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
|
|
|
public AdminManagerService adminManagerService;
|
|
|
@Resource(name = "housePriceService")
|
|
|
private HousePriceService housePriceService;
|
|
|
+ @Resource
|
|
|
+ public WorkflowService workflowService;
|
|
|
|
|
|
public int page; // 当前页
|
|
|
public int rows;// 每页显示的行数rows
|
|
|
@@ -561,7 +564,10 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
|
|
|
String endDate = DateUtil.parseDateToStr((Func.parseDate(queryEndTime)), DateUtil.Time_Formatter_Day);
|
|
|
|
|
|
Hotel hotel = appHomePageService.getHotelAndHouseByHotelId(hotelId, startDate, endDate);
|
|
|
- hotel.setHotelFileInfoList(fileService.queryListByLinkId(hotel.getManagerId() + ""));
|
|
|
+ Workflow workflow = workflowService.queryById(hotel.getWorkflowId());
|
|
|
+ if (workflow==null || workflow.getStatus()==2){
|
|
|
+ hotel.setHotelFileInfoList(fileService.queryListByLinkId(hotel.getManagerId() + ""));
|
|
|
+ }
|
|
|
|
|
|
AdminManager adminManager = adminManagerService.getById(hotel.getManagerId());
|
|
|
hotel.setType(String.valueOf(adminManager.getType()));
|