diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index 68af5e963..0cece0e27 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -47,6 +47,7 @@ public class WxFlowModel extends BaseEntity { @Transient private Integer flowType; + //流程节点列表 @Transient private List lists; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java new file mode 100644 index 000000000..c66b0e2b1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java @@ -0,0 +1,41 @@ +package com.iformall.enums; + + +/** + * @author luozukai + */ + +public enum EnumFlowContractType { + + // 1租赁合同 2点位合同 3物业 4点位物业合同 + RENT(1, "租赁合同"), + RENT_POINT(2, "租赁点位合同"), + PROPERTY(3,"物业合同"), + PROPERTY_POINT(4,"点位物业合同") + ; + + public static EnumFlowContractType getEnum(Integer code) { + for (EnumFlowContractType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumFlowContractType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index e93f8db3a..f5fc81f72 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -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);