Просмотр исходного кода

Merge branch 'release_real_202008' of https://git.youlane.cn/server/formallProject into release_real_202008

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
9cb9ea0090
2 измененных файлов: 8 добавлений и 54 удалений
  1. +7
    -7
      mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java
  2. +1
    -47
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 7
- 7
mallinkService/src/main/java/com/iformall/enums/EnumRentContractStatus.java Просмотреть файл

@@ -7,13 +7,13 @@ package com.iformall.enums;

public enum EnumRentContractStatus {

DRAFT(11,"草稿"),
PAING(12,"计租"),
READY_FOR_PAING(13,"已签约未计租"),
TERMINATE(14,"提前终止"),
OUT_DATE(15,"正常到期"),
INVALID(16,"作废"),
PERFORMANCE(17,"履约中(审批中)"),
DRAFT(1,"草稿"),
READY_FOR_PAING(2,"已签约未计租"),
PAING(3,"计租"),
OUT_DATE(5,"正常到期"),
TERMINATE(6,"提前终止"),
INVALID(7,"作废"),
PERFORMANCE(10,"履约中(审批中)"),


+ 1
- 47
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -1308,56 +1308,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (null == flowModle) {
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);
return new ResultData(Result.SUCCESS,"提交审批成功",rentContract);
}else {
return new ResultData(Result.ERROR, "编号["+record.getId()+"]租金合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]");
return new ResultData(Result.ERROR, "编号["+record.getId()+"]物业合同状态不能提交审批.允许提交的状态为 [草稿+未提交审批],[履约中+审批驳回]");
}
}
}


Загрузка…
Отмена
Сохранить