bug修改

xuhy

2025-04-27 fe846ceac8c8395477b0181d70f192d32be10894

bug修改

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java

@@ -37,6 +37,7 @@
import com.ruoyi.system.bo.*;
import com.ruoyi.system.mapper.StateProcessTemplateMapper;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.TContractRentTypeMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.ProcessDetailVO;
@@ -85,6 +86,8 @@
    private ISysUserService sysUserService;
    @Autowired
    private TContractMapper contractMapper;
    @Autowired
    private TContractRentTypeMapper contractRentTypeMapper;

    /**
     * 流程模版分页
@@ -1301,6 +1304,12 @@
        }
        BeanUtil.copyProperties(contract, processDetailVO);

        // 查询递增递减
        TContractRentType tContractRentType = contractRentTypeMapper.selectOne(Wrappers.lambdaQuery(TContractRentType.class)
                .eq(TContractRentType::getContractId, contract.getId())
                .last("LIMIT 1"));
        processDetailVO.setContractRentType(tContractRentType);

        // 查询历史任务
        List<FlwHisTask> flwHisTasks = flwHisTaskMapper.selectList(Wrappers.<FlwHisTask>lambdaQuery().eq(FlwHisTask::getInstanceId, instanceId));
        processDetailVO.setInstanceId(String.valueOf(instanceId));

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessDetailVO.java

@@ -3,6 +3,7 @@
import com.aizuda.bpm.engine.entity.FlwHisTask;
import com.ruoyi.system.model.StateProcessInstanceAction;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TContractRentType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,4 +19,7 @@
    @ApiModelProperty(value = "历史任务")
    private List<FlwHisTask> flwHisTasks;

    @ApiModelProperty(value = "合同递增递减")
    private TContractRentType contractRentType;

}