Browse Source

fix

release_toaliyun_real
winter 11 months ago
parent
commit
70c5ef3c7c
2 changed files with 2 additions and 6 deletions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  2. +0
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java View File

@@ -172,7 +172,8 @@ public class WxFlowServiceImpl implements WxFlowService {
Integer operateType = getIngeter(getVariableByKey(variables,"approvalType"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

if(/*EnumFlowKey.CONTRACT.getCode().equals(flowType) || */EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType)){
if(/*EnumFlowKey.CONTRACT.getCode().equals(flowType) || */EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) ||
EnumFlowKey.NEW_EDIT_VALID_CONTRACT.getCode().equals(flowType)){
// 1租赁合同 2点位合同 3物业 4点位物业合同 5 合并合同-店铺 6 合并合同-多经点位
WxRentContract rent = new WxRentContract();
//租金+合同的bussinessId 特殊


+ 0
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -658,11 +658,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (null != clist && clist.size() > 0 ) {
return new ResultData(Result.ERROR, "房间资源存在其他审批中的租金合同。请先作完成。");
}
// Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId());
// if (null != count && count.intValue()>0) {
// return new ResultData(Result.ERROR, "当前存在其他草稿状态或者履约驳回的合同。请先作废其他草稿或者审批拒绝或者撤回的合同。");
// }
if (CollectionUtils.isEmpty(rentContract.getFlowParams())) {
return new ResultData(Result.ERROR, "编号["+rentContract.getId()+"]租金合同没有审批流程.");
}


Loading…
Cancel
Save