|
|
|
@@ -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); |
|
|
|
|