| @@ -100,14 +100,22 @@ public class WxAgileContractController extends WxContractBaseController { | |||||
| for (WxRentContract wrc: page.getList()) { | for (WxRentContract wrc: page.getList()) { | ||||
| if (null == hasFlow) { | if (null == hasFlow) { | ||||
| if(rentContractHasWorkFlow(wrc)) { | if(rentContractHasWorkFlow(wrc)) { | ||||
| hasFlow = 1; | |||||
| wrc.setFlowHas(1); | |||||
| }else { | }else { | ||||
| hasFlow = 0; | |||||
| wrc.setFlowHas(0); | |||||
| } | } | ||||
| } | } | ||||
| wrc.setFlowHas(hasFlow); | wrc.setFlowHas(hasFlow); | ||||
| //查询影子合同 | //查询影子合同 | ||||
| wrc.setChild(wxAgileContractService.findYingZiContract(wrc.getId(), wrc)); | |||||
| WxRentContract yingzi = wxAgileContractService.findYingZiContract(wrc.getId(), wrc); | |||||
| if (null != yingzi) { | |||||
| if(rentContractHasWorkFlow(yingzi)) { | |||||
| yingzi.setFlowHas(1) ; | |||||
| }else { | |||||
| yingzi.setFlowHas(0) ; | |||||
| } | |||||
| } | |||||
| wrc.setChild(yingzi); | |||||
| } | } | ||||
| } | } | ||||
| return new ResultData(page); | return new ResultData(page); | ||||