Преглед изворни кода

[租赁物业合同][修改][审批]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
a81340f223
3 измењених фајлова са 20 додато и 14 уклоњено
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java
  2. +14
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 3
- 1
mallinkService/src/main/java/com/iformall/enums/EnumFlowContractType.java Прегледај датотеку

@@ -11,7 +11,9 @@ public enum EnumFlowContractType {
RENT(1, "租赁合同"),
RENT_POINT(2, "租赁点位合同"),
PROPERTY(3,"物业合同"),
PROPERTY_POINT(4,"点位物业合同")
PROPERTY_POINT(4, "点位物业合同"),
WHOLE_SHOP(5, "合并合同(店铺)"),
WHOLE_POINT(6, "合并合同(点位)")
;

public static EnumFlowContractType getEnum(Integer code) {


+ 14
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Прегледај датотеку

@@ -14,8 +14,10 @@ import com.iformall.domain.vo.FlowUserVo;
import com.iformall.domain.vo.UserTaskVo;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
import com.iformall.mapper.WxFlowConfigMapper;
import com.iformall.mapper.WxFlowModelMapper;
import com.iformall.mapper.WxFlowRecordMapper;
import com.iformall.mapper.WxPropertyContractMapper;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*;
import com.iformall.utils.Constant;
@@ -27,12 +29,13 @@ import org.apache.shiro.SecurityUtils;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.FlowableIllegalArgumentException;
import org.flowable.engine.*;
import org.flowable.engine.ProcessEngine;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.repository.DeploymentBuilder;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.identitylink.api.IdentityLink;
import org.flowable.image.ProcessDiagramGenerator;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.slf4j.Logger;
@@ -41,9 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;

import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -118,8 +119,11 @@ public class WxFlowServiceImpl implements WxFlowService {
}

if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType)){
// 1租赁合同 2点位合同 3物业 4点位物业合同
if(EnumFlowContractType.RENT.getCode().equals(contractType) || EnumFlowContractType.RENT_POINT.getCode().equals(contractType) ){
// 1租赁合同 2点位合同 3物业 4点位物业合同 5 合并合同-店铺 6 合并合同-多经点位
if (EnumFlowContractType.RENT.getCode().equals(contractType) ||
EnumFlowContractType.RENT_POINT.getCode().equals(contractType) ||
EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType) ||
EnumFlowContractType.WHOLE_POINT.getCode().equals(contractType)) {
WxRentContract rent = new WxRentContract();
rent.setId(businessId);
rent.setApplyStatus(applyStatus);


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Прегледај датотеку

@@ -359,7 +359,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
&& record.getMerchantId() != null) {
wxRentContractService.updateRentContractStatus(record.getId());
} else {
record.getFlowParams().put("businessId", record.getId().toString());
record.getFlowParams().put("businessId", record.getRentContractId().toString());
if (record.getMerchantId() != null) {
record.getFlowParams().put("supplement", true); //设置补录
}
@@ -367,10 +367,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService

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


Loading…
Откажи
Сачувај