From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 三月 2025 15:50:03 +0800 Subject: [PATCH] fix: resolve merge conflicts in .gitignore --- ruoyi-system/src/main/java/com/ruoyi/system/service/TContractService.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TContractService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TContractService.java index 1cb1fd5..00b2a31 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TContractService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TContractService.java @@ -1,7 +1,18 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.dto.SignContractDTO; +import com.ruoyi.system.dto.TerminateContractDTO; import com.ruoyi.system.model.TContract; +import com.ruoyi.system.query.TContractAppletQuery; +import com.ruoyi.system.query.TContractBillQuery; +import com.ruoyi.system.query.TContractQuery; +import com.ruoyi.system.vo.BillVO; +import com.ruoyi.system.vo.CheckAcceptRecordVO; + +import java.util.List; /** * <p> @@ -13,4 +24,23 @@ */ public interface TContractService extends IService<TContract> { + PageInfo<TContract> contractList(TContractQuery query); + + PageInfo<TContract> contractAppletList(TContractAppletQuery query); + + PageInfo<BillVO> contractBillList(TContractBillQuery query); + + + void terminateContract(TerminateContractDTO dto); + + CheckAcceptRecordVO getCheckByContractId(String id); + + R signContract(SignContractDTO dto); + + void export(TContractQuery query); + + List<TContract> contractExportList(TContractQuery query); + + Boolean updateContractAuditStatus(String projectId, Integer submitStatus); + } -- Gitblit v1.7.1