|
@@ -9,6 +9,7 @@ import com.happy.Model.Workflow;
|
|
|
import com.happy.Until.GetHttpParam;
|
|
import com.happy.Until.GetHttpParam;
|
|
|
import com.happy.Until.ResUtil;
|
|
import com.happy.Until.ResUtil;
|
|
|
import com.happy.Until.UUIDUtil;
|
|
import com.happy.Until.UUIDUtil;
|
|
|
|
|
+import com.happy.dto.IPage;
|
|
|
import com.happy.service.BookingCommentService;
|
|
import com.happy.service.BookingCommentService;
|
|
|
import com.happy.service.FileService;
|
|
import com.happy.service.FileService;
|
|
|
import com.happy.service.WorkflowService;
|
|
import com.happy.service.WorkflowService;
|
|
@@ -31,6 +32,8 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
public String id;//流程id
|
|
public String id;//流程id
|
|
|
public String hotelId;//民宿id
|
|
public String hotelId;//民宿id
|
|
|
public Integer status; //状态 1、正在审批 2、审批通过3、拒绝
|
|
public Integer status; //状态 1、正在审批 2、审批通过3、拒绝
|
|
|
|
|
+ public Integer page = 1; // 当前页
|
|
|
|
|
+ public Integer rows = 10;// 每页显示的行数rows
|
|
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
|
public WorkflowService workflowService;
|
|
public WorkflowService workflowService;
|
|
@@ -205,7 +208,7 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
if (status != null){
|
|
if (status != null){
|
|
|
s1.append(" and a.status = ").append(status).append(" ");
|
|
s1.append(" and a.status = ").append(status).append(" ");
|
|
|
}
|
|
}
|
|
|
- List<Workflow> list = workflowService.queryList(s1.toString());
|
|
|
|
|
|
|
+ IPage<Workflow> list = workflowService.queryList(s1.toString(), page, rows);
|
|
|
resultJson.put("message", "查询成功");
|
|
resultJson.put("message", "查询成功");
|
|
|
resultJson.put("code", 200);
|
|
resultJson.put("code", 200);
|
|
|
resultJson.put("data", list);
|
|
resultJson.put("data", list);
|
|
@@ -221,7 +224,7 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
JSONObject resultJson = new JSONObject();
|
|
JSONObject resultJson = new JSONObject();
|
|
|
StringBuilder s1 = new StringBuilder("");
|
|
StringBuilder s1 = new StringBuilder("");
|
|
|
s1.append(" and a.status = 1 ");
|
|
s1.append(" and a.status = 1 ");
|
|
|
- List<Workflow> list = workflowService.queryList(s1.toString());
|
|
|
|
|
|
|
+ IPage<Workflow> list = workflowService.queryList(s1.toString(), page, rows);
|
|
|
resultJson.put("message", "查询成功");
|
|
resultJson.put("message", "查询成功");
|
|
|
resultJson.put("code", 200);
|
|
resultJson.put("code", 200);
|
|
|
resultJson.put("data", list);
|
|
resultJson.put("data", list);
|
|
@@ -236,7 +239,7 @@ public class WorkflowAction extends ActionSupport implements ServletRequestAwar
|
|
|
JSONObject resultJson = new JSONObject();
|
|
JSONObject resultJson = new JSONObject();
|
|
|
StringBuilder s1 = new StringBuilder("");
|
|
StringBuilder s1 = new StringBuilder("");
|
|
|
s1.append(" and a.status != 1 ");
|
|
s1.append(" and a.status != 1 ");
|
|
|
- List<Workflow> list = workflowService.queryList(s1.toString());
|
|
|
|
|
|
|
+ IPage<Workflow> list = workflowService.queryList(s1.toString(), page, rows);
|
|
|
resultJson.put("message", "查询成功");
|
|
resultJson.put("message", "查询成功");
|
|
|
resultJson.put("code", 200);
|
|
resultJson.put("code", 200);
|
|
|
resultJson.put("data", list);
|
|
resultJson.put("data", list);
|