| @@ -1308,56 +1308,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| if (null == flowModle) { | if (null == flowModle) { | ||||
| return new ResultData(Result.ERROR, "编号["+record.getId()+"]租金合同配置的流程["+String.valueOf(bussinessType)+"]未找到流程模板."); | return new ResultData(Result.ERROR, "编号["+record.getId()+"]租金合同配置的流程["+String.valueOf(bussinessType)+"]未找到流程模板."); | ||||
| } | } | ||||
| // | |||||
| // | |||||
| // | |||||
| // if (record.getOperationType().equals(EnumContractOperationType.PART.getCode())) { | |||||
| // if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null) { | |||||
| // updatePropertyContractStatus(record.getId()); | |||||
| // } else { | |||||
| // record.getFlowParams().put("businessId", record.getId().toString()); | |||||
| // wxFlowService.start(record.getFlowParams(), userId, userName, record); | |||||
| // | |||||
| // // 合同状态改成待签约 | |||||
| // WxPropertyContract updateRentContract = new WxPropertyContract(); | |||||
| // updateRentContract.setId(record.getId()); | |||||
| // updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); | |||||
| // wxPropertyContractMapper.updateStatus(updateRentContract); | |||||
| // logger.info("id:{},启动审批流成功", record.getId().toString()); | |||||
| // } | |||||
| // } else { | |||||
| // if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null | |||||
| // && record.getMerchantId() != null) { | |||||
| // wxRentContractService.updateRentContractStatus(record.getId()); | |||||
| // } else { | |||||
| // record.getFlowParams().put("businessId", record.getRentContractId().toString()); | |||||
| // if (record.getMerchantId() != null) { | |||||
| // record.getFlowParams().put("supplement", true); //设置补录 | |||||
| // } | |||||
| // wxFlowService.start(record.getFlowParams(), userId, userName, record); | |||||
| // | |||||
| // // 合同状态改成待签约 | |||||
| // WxRentContract updateRentContract = new WxRentContract(); | |||||
| // updateRentContract.setId(record.getRentContractId()); | |||||
| // updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); | |||||
| // if(wxRentContract.getStatus().equals(EnumRentContractStatus.SUPPLE.getCode())){ | |||||
| // updateRentContract.setStatus(EnumRentContractStatus.SUPPLE.getCode()); | |||||
| // } | |||||
| // wxRentContractMapper.updateStatus(updateRentContract); | |||||
| // logger.info("id:{},启动审批流成功,是否补录:{}", record.getRentContractId().toString(), record.getMerchantId() != null); | |||||
| // } | |||||
| // } | |||||
| rentContract.getFlowParams().put("businessId", rentContract.getId().toString()); | |||||
| wxFlowService.start(rentContract.getFlowParams(), user.getId(), user.getName(), rentContract); | wxFlowService.start(rentContract.getFlowParams(), user.getId(), user.getName(), rentContract); | ||||
| return new ResultData(Result.SUCCESS,"提交审批成功",rentContract); | return new ResultData(Result.SUCCESS,"提交审批成功",rentContract); | ||||
| }else { | }else { | ||||
| return new ResultData(Result.ERROR, "编号["+record.getId()+"]租金合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]"); | |||||
| return new ResultData(Result.ERROR, "编号["+record.getId()+"]物业合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]"); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||