Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 11 mesi fa
parent
commit
5b3637520f
1 ha cambiato i file con 11 aggiunte e 7 eliminazioni
  1. +11
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java

+ 11
- 7
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java Vedi File

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


Caricamento…
Annulla
Salva