|
|
|
@@ -86,6 +86,8 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
private WxCouponMapper wxCouponMapper; |
|
|
|
@Autowired |
|
|
|
private WxCouponService wxCouponService; |
|
|
|
@Autowired |
|
|
|
private WxRentContractMapper wxRentContractMapper; |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取流程key |
|
|
|
@@ -113,7 +115,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); |
|
|
|
Integer flowType = (Integer)mapInfo.get("flowType"); |
|
|
|
List<Map<String,Object>> variables = (List)mapInfo.get("variables"); |
|
|
|
Boolean supplement = (Boolean)mapInfo.get("supplement"); |
|
|
|
Integer contractType = 0; |
|
|
|
String str = (String)getVariableByKey(variables,"contractType"); |
|
|
|
Integer operateType = (Integer)getVariableByKey(variables,"approvalType"); |
|
|
|
@@ -141,8 +142,9 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
rent.setBusinessType(flowType); |
|
|
|
wxRentContractService.updateApplyStatus(rent); |
|
|
|
|
|
|
|
// 如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约) |
|
|
|
if(supplement!=null && supplement && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { |
|
|
|
//如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约) |
|
|
|
WxRentContract record = wxRentContractMapper.selectByPrimaryKey(businessId); |
|
|
|
if(record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { |
|
|
|
wxRentContractService.updateRentContractStatus(businessId); |
|
|
|
} |
|
|
|
}else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ |
|
|
|
@@ -325,7 +327,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
Long businessId = Long.parseLong(params.get("businessId").toString()); |
|
|
|
Integer flowType = getIngeter(params.get("businessType")); |
|
|
|
List<Map<String,Object>> variables = (List)params.get("variables"); |
|
|
|
Boolean supplement = (Boolean)params.get("supplement"); |
|
|
|
|
|
|
|
WxFlowModel flowModel = getModelByType(flowType,tenantId); |
|
|
|
if(flowModel== null || StringUtils.isBlank(flowModel.getFlowId())){ |
|
|
|
@@ -343,7 +344,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
map.put("businessId",businessId+""); |
|
|
|
map.put("flowType",flowType); |
|
|
|
map.put("variables",variables); |
|
|
|
map.put("supplement",supplement); |
|
|
|
map.put("taskAssignee",flowModel.getFlow()); |
|
|
|
setSignAssignee(map,flowModel.getFlow()); |
|
|
|
map.put("tenantId",tenantId); |
|
|
|
|