ソースを参照

[审批][修改][会签]

release_toaliyun_real
luozukai 7年前
コミット
81e09e31c8
2個のファイルの変更31行の追加35行の削除
  1. +5
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +26
    -29
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 5
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java ファイルの表示

@@ -331,11 +331,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
}

//启动审批流
if(!CollectionUtils.isEmpty(record.getFlowParams())) {
Integer flowType = (Integer)record.getFlowParams().get("businessType");
if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId()) == null){
updatePropertyContractStatus(record.getId());
}else{
if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){
updatePropertyContractStatus(record.getId());
}else{
if(!CollectionUtils.isEmpty(record.getFlowParams())) {
record.getFlowParams().put("businessId", record.getId().toString());
wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId());

@@ -344,7 +343,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
updateRentContract.setId(record.getId());
updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
wxPropertyContractMapper.updateStatus(updateRentContract);
logger.info("id:{},启动审批流成功",record.getId().toString());
logger.info("id:{},启动审批流成功", record.getId().toString());
}
}
return new ResultData(Result.SUCCESS, message, record);


+ 26
- 29
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java ファイルの表示

@@ -355,23 +355,22 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

// 启动审批流
if(record.getFlowParams() != null){
Integer flowType = (Integer)record.getFlowParams().get("businessType");
if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId()) == null){
updateRentContractStatus(record.getId());
}else{
record.getFlowParams().put("businessId",record.getId().toString());
if(record.getMerchantId() != null) {
if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){
updateRentContractStatus(record.getId());
}else{
if(record.getFlowParams() != null) {
record.getFlowParams().put("businessId", record.getId().toString());
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());

// 合同状态改成待签约
WxRentContract updateRentContract = new WxRentContract();
updateRentContract.setId(record.getId());
updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
wxRentContractMapper.updateStatus(updateRentContract);
logger.info("id:{},启动审批流成功, 是否补录:{}",record.getId().toString(),record.getMerchantId() != null);
logger.info("id:{},启动审批流成功, 是否补录:{}", record.getId().toString(), record.getMerchantId() != null);
}
}

@@ -412,23 +411,22 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

//启动审批流
if(record.getFlowParams() != null){
Integer flowType = (Integer)record.getFlowParams().get("businessType");
if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId()) == null){
updateRentContractStatus(record.getId());
}else{
record.getFlowParams().put("businessId",record.getId().toString());
if(record.getMerchantId() != null) {
if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){
updateRentContractStatus(record.getId());
}else{
if(record.getFlowParams() != null) {
record.getFlowParams().put("businessId", record.getId().toString());
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());

//合同状态改成待签约
WxRentContract updateRentContract = new WxRentContract();
updateRentContract.setId(record.getId());
updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
wxRentContractMapper.updateStatus(updateRentContract);
logger.info("id:{},启动审批流成功 ,是否补录:{}",record.getId().toString(),record.getMerchantId() != null);
logger.info("id:{},启动审批流成功 ,是否补录:{}", record.getId().toString(), record.getMerchantId() != null);
}
}

@@ -1299,25 +1297,24 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (resultData.code != Result.SUCCESS) {
return resultData;
}
// 启动审批流
if(record.getFlowParams() != null){
//判断是否配置模板
Integer flowType = (Integer)record.getFlowParams().get("businessType");
if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId())==null){
updateRentContractStatus(record.getId());
}else{
record.getFlowParams().put("businessId",record.getId().toString());
if(record.getMerchantId() != null) {
//启动审批流
//判断是否配置模板
if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){
updateRentContractStatus(record.getId());
}else{
if(record.getFlowParams() != null) {
record.getFlowParams().put("businessId", record.getId().toString());
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());

// 合同状态改成待签约
WxRentContract updateRentContract = new WxRentContract();
updateRentContract.setId(record.getId());
updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode());
wxRentContractMapper.updateStatus(updateRentContract);
logger.info("id:{},启动审批流成功,是否补录:{}",record.getId().toString(),record.getMerchantId() != null);
logger.info("id:{},启动审批流成功,是否补录:{}", record.getId().toString(), record.getMerchantId() != null);
}
}
return resultData;


読み込み中…
キャンセル
保存