|
@@ -1,7 +1,9 @@
|
|
|
package com.happy.service.impl;
|
|
package com.happy.service.impl;
|
|
|
|
|
|
|
|
import com.happy.Model.BookingComment;
|
|
import com.happy.Model.BookingComment;
|
|
|
|
|
+import com.happy.Model.FileInfo;
|
|
|
import com.happy.Model.Workflow;
|
|
import com.happy.Model.Workflow;
|
|
|
|
|
+import com.happy.dao.FileInfoDao;
|
|
|
import com.happy.dao.HouseNumberDao;
|
|
import com.happy.dao.HouseNumberDao;
|
|
|
import com.happy.dao.WorkflowDao;
|
|
import com.happy.dao.WorkflowDao;
|
|
|
import com.happy.dto.IPage;
|
|
import com.happy.dto.IPage;
|
|
@@ -16,6 +18,8 @@ public class WorkflowImplService implements WorkflowService {
|
|
|
@Resource
|
|
@Resource
|
|
|
public WorkflowDao workflowDao;
|
|
public WorkflowDao workflowDao;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ public FileInfoDao fileDao;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public int insert(Workflow workflow) {
|
|
public int insert(Workflow workflow) {
|
|
@@ -36,6 +40,17 @@ public class WorkflowImplService implements WorkflowService {
|
|
|
public IPage<Workflow> queryList(String sqlx, int page, int rows) {
|
|
public IPage<Workflow> queryList(String sqlx, int page, int rows) {
|
|
|
IPage<Workflow> iPage = new IPage();
|
|
IPage<Workflow> iPage = new IPage();
|
|
|
List<Workflow> workflows = workflowDao.queryList(sqlx,page,rows);
|
|
List<Workflow> workflows = workflowDao.queryList(sqlx,page,rows);
|
|
|
|
|
+ if (workflows != null){
|
|
|
|
|
+ workflows.forEach(workflow -> {
|
|
|
|
|
+ List<FileInfo> fileInfoList;
|
|
|
|
|
+ if (workflow.getStatus() == 2 && workflow.getType() == 1){
|
|
|
|
|
+ fileInfoList = fileDao.queryList("and link_id = '"+workflow.getLinkId()+"'");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ fileInfoList = fileDao.queryList("and link_id = '"+workflow.getId()+"'");
|
|
|
|
|
+ }
|
|
|
|
|
+ workflow.setFileInfoList(fileInfoList);
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
int total = workflowDao.queryTotal(sqlx);
|
|
int total = workflowDao.queryTotal(sqlx);
|
|
|
iPage.setPageList(workflows);
|
|
iPage.setPageList(workflows);
|
|
|
iPage.setPage(page);
|
|
iPage.setPage(page);
|