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

[审批流][修改][物业合同发起审批合并]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
eafd1dcacd
1 измененных файлов: 9 добавлений и 5 удалений
  1. +9
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -192,10 +192,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }


try { try {
// 如果是补录,启动审批流
if(record.getMerchantId() != null && record.getFlowParams() != null){
// 启动审批流
if(record.getFlowParams() != null){
record.getFlowParams().put("businessId",record.getId().toString()); record.getFlowParams().put("businessId",record.getId().toString());
record.getFlowParams().put("supplement",true);
if(record.getMerchantId() != null) {
record.getFlowParams().put("supplement", true); //设置补录
}
wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId());


// 合同状态改成待签约 // 合同状态改成待签约
@@ -648,7 +650,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
logger.error("deleteProcessInstance error",e); logger.error("deleteProcessInstance error",e);
} }
} }

} }


//把状态为意见而商户未关联的数据改为待签约状态 //把状态为意见而商户未关联的数据改为待签约状态
@@ -807,9 +808,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
public ResultData updateFile(WxRentContract record, Long userId,String userName) { public ResultData updateFile(WxRentContract record, Long userId,String userName) {
ResultData resultData = getResultDataForUpdate(record, userId); ResultData resultData = getResultDataForUpdate(record, userId);
try { try {
// 启动审批流
if(record.getFlowParams() != null){ if(record.getFlowParams() != null){
record.getFlowParams().put("businessId",record.getId().toString()); record.getFlowParams().put("businessId",record.getId().toString());
record.getFlowParams().put("supplement",false);
if(record.getMerchantId() != null) {
record.getFlowParams().put("supplement", true); //设置补录
}
wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId());


// 合同状态改成待签约 // 合同状态改成待签约


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