| @@ -71,13 +71,17 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | wxPropertyContract.updateTenantInfo(getTenantInfo()); | ||||
| Map<String, Object> result = new HashMap<>(); | Map<String, Object> result = new HashMap<>(); | ||||
| PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | PageInfo<WxPropertyContract> pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | |||||
| if (null != pageInfo && null != pageInfo.getList()) { | if (null != pageInfo && null != pageInfo.getList()) { | ||||
| for (WxPropertyContract wpc : pageInfo.getList()) { | for (WxPropertyContract wpc : pageInfo.getList()) { | ||||
| if(propertyContractHasWorkFlow(wpc)) { | |||||
| wpc.setFlowHas(1); | |||||
| }else { | |||||
| wpc.setFlowHas(0); | |||||
| if (null == hasFlow) { | |||||
| if(propertyContractHasWorkFlow(wpc)) { | |||||
| hasFlow = 1; | |||||
| }else { | |||||
| hasFlow = 0; | |||||
| } | |||||
| } | } | ||||
| wpc.setFlowHas(hasFlow); | |||||
| } | } | ||||
| } | } | ||||
| @@ -88,13 +88,17 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| wxRentContract.setSortColumns(SortField.Createtime_DESC); | wxRentContract.setSortColumns(SortField.Createtime_DESC); | ||||
| //Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | //Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); | ||||
| PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | |||||
| if (null != page && null != page.getList()) { | if (null != page && null != page.getList()) { | ||||
| for (WxRentContract wrc: page.getList()) { | for (WxRentContract wrc: page.getList()) { | ||||
| if(rentContractHasWorkFlow(wrc)) { | |||||
| wrc.setFlowHas(1); | |||||
| }else { | |||||
| wrc.setFlowHas(0); | |||||
| if (null == hasFlow) { | |||||
| if(rentContractHasWorkFlow(wrc)) { | |||||
| hasFlow = 1; | |||||
| }else { | |||||
| hasFlow = 0; | |||||
| } | |||||
| } | } | ||||
| wrc.setFlowHas(hasFlow); | |||||
| } | } | ||||
| } | } | ||||
| @@ -40,13 +40,17 @@ public class WxRentPropertyContractController extends WxContractBaseController { | |||||
| } | } | ||||
| wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); | wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); | ||||
| PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); | ||||
| Integer hasFlow = null; | |||||
| if (null != page && null != page.getList()) { | if (null != page && null != page.getList()) { | ||||
| for (WxRentPropertyContractVo wrc: page.getList()) { | for (WxRentPropertyContractVo wrc: page.getList()) { | ||||
| if(rentPropertyHasWorkFlow(wrc)) { | |||||
| wrc.setFlowHas(1); | |||||
| }else { | |||||
| wrc.setFlowHas(0); | |||||
| if (null == hasFlow) { | |||||
| if(rentPropertyHasWorkFlow(wrc)) { | |||||
| hasFlow = 1; | |||||
| }else { | |||||
| hasFlow = 0; | |||||
| } | |||||
| } | } | ||||
| wrc.setFlowHas(hasFlow); | |||||
| } | } | ||||
| } | } | ||||