| @@ -96,24 +96,28 @@ public class WxAgileContractController extends WxContractBaseController { | |||||
| wxRentContract.setMainContract(EnumYesOrNo.YES.getCode()); | wxRentContract.setMainContract(EnumYesOrNo.YES.getCode()); | ||||
| PageInfo<WxRentContract> page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| Integer yingziHasFlow = null; | |||||
| if (null != page && null != page.getList()) { | if (null != page && null != page.getList()) { | ||||
| for (WxRentContract wrc: page.getList()) { | for (WxRentContract wrc: page.getList()) { | ||||
| if (null == hasFlow) { | if (null == hasFlow) { | ||||
| if(rentContractHasWorkFlow(wrc)) { | if(rentContractHasWorkFlow(wrc)) { | ||||
| wrc.setFlowHas(1); | |||||
| hasFlow = 1 ; | |||||
| }else { | }else { | ||||
| wrc.setFlowHas(0); | |||||
| hasFlow = 0; | |||||
| } | } | ||||
| } | } | ||||
| wrc.setFlowHas(hasFlow); | wrc.setFlowHas(hasFlow); | ||||
| //查询影子合同 | //查询影子合同 | ||||
| WxRentContract yingzi = wxAgileContractService.findYingZiContract(wrc.getId(), wrc); | WxRentContract yingzi = wxAgileContractService.findYingZiContract(wrc.getId(), wrc); | ||||
| if (null != yingzi) { | if (null != yingzi) { | ||||
| if(rentContractHasWorkFlow(yingzi)) { | |||||
| yingzi.setFlowHas(1) ; | |||||
| }else { | |||||
| yingzi.setFlowHas(0) ; | |||||
| } | |||||
| if (null == yingziHasFlow) { | |||||
| if(rentContractHasWorkFlow(yingzi)) { | |||||
| yingziHasFlow = 1 ; | |||||
| }else { | |||||
| yingziHasFlow = 0 ; | |||||
| } | |||||
| } | |||||
| yingzi.setFlowHas(yingziHasFlow); | |||||
| } | } | ||||
| wrc.setChild(yingzi); | wrc.setChild(yingzi); | ||||
| } | } | ||||