|
|
|
@@ -1,5 +1,6 @@ |
|
|
|
package com.iformall.controller.contract; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.annotation.UserDataRuleAnnotation; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
@@ -36,6 +37,7 @@ import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@@ -67,7 +69,19 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
wxPropertyContract = new WxPropertyContract(); |
|
|
|
} |
|
|
|
wxPropertyContract.updateTenantInfo(getTenantInfo()); |
|
|
|
Map<String, Object> result = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); |
|
|
|
if (null != pageInfo && null != pageInfo.getList()) { |
|
|
|
for (WxPropertyContract wpc : pageInfo.getList()) { |
|
|
|
if(propertyContractHasWorkFlow(wpc)) { |
|
|
|
wpc.setFlowHas(1); |
|
|
|
}else { |
|
|
|
wpc.setFlowHas(0); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
result.put("pageInfo", pageInfo); |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|
|
|
|
|