java/xizang.git

			@@ -1,5 +1,7 @@
			package com.ruoyi.system.service.impl;

			import com.aizuda.bpm.engine.entity.FlwHisTask;
			import com.aizuda.bpm.mybatisplus.mapper.FlwHisTaskMapper;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.ruoyi.common.basic.PageInfo;
			@@ -28,6 +30,7 @@
			import com.ruoyi.system.vo.CheckAcceptRecordVO;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			@@ -36,6 +39,7 @@
			import java.time.temporal.ChronoUnit;
			import java.time.temporal.TemporalAdjusters;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -59,6 +63,8 @@
			private TContractMapper contractMapper;
			@Autowired
			private StateProcessTemplateService stateProcessTemplateService;
			@Autowired
			private FlwHisTaskMapper flwHisTaskMapper;

			@Override
			public PageInfo<TContract> contractList(TContractQuery query) {
			@@ -80,6 +86,12 @@
			for (TContract tContract : list) {
			tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
			tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus()));
			FlwHisTask flwHisTask = flwHisTaskMapper.selectOne(new LambdaQueryWrapper<FlwHisTask>()
			.like(FlwHisTask::getVariable, tContract.getId())
			.last("LIMIT 1"));
			if (Objects.nonNull(flwHisTask)){
			tContract.setInstanceId(flwHisTask.getInstanceId());
			}
			}
			pageInfo.setRecords(list);
			return pageInfo;
			@@ -184,7 +196,7 @@
			variable.put("projectId", dto.getId());
			processStartBO.setVariable(variable);
			//开启工作流程
			stateProcessTemplateService.start(processStartBO);
			stateProcessTemplateService.startApplet(processStartBO);

			List<TContractRentType> contractRentTypes = contractRentTypeService.list();
			// 生成第一笔账单