|
|
|
@@ -120,7 +120,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType)){ |
|
|
|
// 1租赁合同 2点位合同 3物业 4点位物业合同 |
|
|
|
if(contractType.intValue() == 1 || contractType.intValue() == 2){ |
|
|
|
if(EnumFlowContractType.RENT.getCode().equals(contractType) || EnumFlowContractType.RENT_POINT.getCode().equals(contractType) ){ |
|
|
|
WxRentContract rent = new WxRentContract(); |
|
|
|
rent.setId(businessId); |
|
|
|
rent.setApplyStatus(applyStatus); |
|
|
|
@@ -131,7 +131,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
if(supplement!=null && supplement && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { |
|
|
|
wxRentContractService.updateRentContractStatus(businessId); |
|
|
|
} |
|
|
|
}else if(contractType.intValue() == 3 || contractType.intValue() == 4){ |
|
|
|
}else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
wxPropertyContract.setId(businessId); |
|
|
|
wxPropertyContract.setApplyStatus(applyStatus); |
|
|
|
@@ -144,7 +144,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
} |
|
|
|
} |
|
|
|
}else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType)){ |
|
|
|
if(contractType.intValue() == 1 || contractType.intValue() == 2){ |
|
|
|
if(EnumFlowContractType.RENT.getCode().equals(contractType) || EnumFlowContractType.RENT_POINT.getCode().equals(contractType) ){ |
|
|
|
WxRentContract rent = new WxRentContract(); |
|
|
|
rent.setId(businessId); |
|
|
|
rent.setApplyStatus(applyStatus); |
|
|
|
@@ -159,7 +159,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxRentContractService.endContract(rent); |
|
|
|
} |
|
|
|
wxRentContractService.updateApplyStatus(rent); |
|
|
|
}else if(contractType.intValue() == 3 || contractType.intValue() == 4){ |
|
|
|
}else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
wxPropertyContract.setId(businessId); |
|
|
|
wxPropertyContract.setApplyStatus(applyStatus); |
|
|
|
@@ -1140,11 +1140,8 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
for (FlowUserVo userVo:taskVo.getUserList()) { |
|
|
|
userIdList.add(userVo.getId() + ""); |
|
|
|
} |
|
|
|
|
|
|
|
if (EnumTaskType.NORMAL.getCode().equals(taskVo.getType()) || EnumTaskType.OR.getCode().equals(taskVo.getType())) { |
|
|
|
userTask.setCandidateUsers(userIdList); |
|
|
|
} else if (EnumTaskType.AND.getCode().equals(taskVo.getType())) { |
|
|
|
userTask.setCandidateUsers(userIdList); |
|
|
|
userTask.setCandidateUsers(userIdList); |
|
|
|
if (EnumTaskType.AND.getCode().equals(taskVo.getType())) { |
|
|
|
MultiInstanceLoopCharacteristics mi = new MultiInstanceLoopCharacteristics(); |
|
|
|
mi.setLoopCardinality(userIdList.size()+""); |
|
|
|
userTask.setLoopCharacteristics(mi); |
|
|
|
|