Commit 858c6d1b authored by wangxl's avatar wangxl

1

parent 81a7987e
......@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComBatch;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.query.ComBatchQueryVO;
import org.apache.ibatis.annotations.Param;
import com.yiboshi.science.enumeration.query.ComBatchQueryVO;
/**
* 人员表 DAO
......
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionCatalog;
import com.yiboshi.science.param.dto.ComConclusionCatalogDTO;
import com.yiboshi.science.param.query.ComConclusionCatalogQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionCatalogQueryVO;
import java.util.List;
/**
* 验收材料目录表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComConclusionCatalogDAO extends BaseMapper<ComConclusionCatalog>, BaseDAO<ComConclusionCatalogQueryVO, ComConclusionCatalogDTO, ComConclusionCatalog> {
List<ComConclusionCatalogDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionFundsQueryVO;
import java.util.List;
/**
* 结题经费记录表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComConclusionFundsDAO extends BaseMapper<ComConclusionFunds>, BaseDAO<ComConclusionFundsQueryVO, ComConclusionFundsDTO, ComConclusionFunds> {
List<ComConclusionFundsDTO> getListByObjectId(String objectId,Integer type);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionResearchersQueryVO;
import java.util.List;
/**
* 结题主要研究人员表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComConclusionResearchersDAO extends BaseMapper<ComConclusionResearchers>, BaseDAO<ComConclusionResearchersQueryVO, ComConclusionResearchersDTO, ComConclusionResearchers> {
List<ComConclusionResearchersDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionThesisQueryVO;
import java.util.List;
/**
* 结题论文记录表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComConclusionThesisDAO extends BaseMapper<ComConclusionThesis>, BaseDAO<ComConclusionThesisQueryVO, ComConclusionThesisDTO, ComConclusionThesis> {
List<ComConclusionThesisDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComDownload;
import com.yiboshi.science.param.dto.ComDownloadDTO;
import com.yiboshi.science.param.query.ComDownloadQueryVO;
import com.yiboshi.science.enumeration.query.ComDownloadQueryVO;
import org.apache.ibatis.annotations.Param;
/**
* 附件表 DAO
*
*
* @author lkl
* @version 2021-08-25
*/
......@@ -20,4 +20,4 @@ public interface ComDownloadDAO extends BaseMapper<ComDownload>, BaseDAO<ComDown
Page<ComDownloadDTO> getAllListByPage(Page<ComDownloadQueryVO> page, @Param("ew") Wrapper<ComDownloadQueryVO> queryWrapper);
ComDownload getDownloadByFileName(String fileName);
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationContentQueryVO;
public interface ComEvaluationContentDAO extends BaseMapper<ComEvaluationContent>, BaseDAO<ComEvaluationContentQueryVO, ComEvaluationContentDTO,ComEvaluationContent> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluation;
import com.yiboshi.science.param.dto.ComEvaluationDTO;
import com.yiboshi.science.param.query.ComEvaluationQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationQueryVO;
public interface ComEvaluationDAO extends BaseMapper<ComEvaluation>, BaseDAO<ComEvaluationQueryVO, ComEvaluationDTO,ComEvaluation> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationItem;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationItemQueryVO;
public interface ComEvaluationItemDAO extends BaseMapper<ComEvaluationItem>, BaseDAO<ComEvaluationItemQueryVO, ComEvaluationItemDTO,ComEvaluationItem> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationItemNote;
import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationItemNoteQueryVO;
public interface ComEvaluationItemNoteDAO extends BaseMapper<ComEvaluationItemNote>, BaseDAO<ComEvaluationItemNoteQueryVO, ComEvaluationItemNoteDTO,ComEvaluationItemNote> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationNoteQueryVO;
public interface ComEvaluationNoteDAO extends BaseMapper<ComEvaluationNote>, BaseDAO<ComEvaluationNoteQueryVO, ComEvaluationNoteDTO,ComEvaluationNote> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationStandard;
import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationStandardQueryVO;
public interface ComEvaluationStandardDAO extends BaseMapper<ComEvaluationStandard>, BaseDAO<ComEvaluationStandardQueryVO, ComEvaluationStandardDTO, ComEvaluationStandard> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationValueQueryVO;
public interface ComEvaluationValueDAO extends BaseMapper<ComEvaluationValue>, BaseDAO<ComEvaluationValueQueryVO, ComEvaluationValueDTO,ComEvaluationValue> {
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComExpertBatch;
import com.yiboshi.science.param.dto.ComExpertBatchDTO;
import com.yiboshi.science.param.query.ComExpertBatchQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertBatchQueryVO;
public interface ComExpertBatchDAO extends BaseMapper<ComExpertBatch>, BaseDAO<ComExpertBatchQueryVO, ComExpertBatchDTO,ComExpertBatch> {
......
......@@ -7,9 +7,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComExpert;
import com.yiboshi.science.entity.SystemMenu;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComProjectAuditDTO;
import com.yiboshi.science.param.query.ComExpertQueryVO;
import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
......@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.AssignCount;
import com.yiboshi.science.entity.ComExpertGroupAssign;
import com.yiboshi.science.param.dto.ComExpertGroupAssignDTO;
import com.yiboshi.science.param.query.ComExpertGroupAssignQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertGroupAssignQueryVO;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComExpertGroup;
import com.yiboshi.science.param.dto.ComExpertGroupDTO;
import com.yiboshi.science.param.query.ComExpertGroupQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertGroupQueryVO;
public interface ComExpertGroupDAO extends BaseMapper<ComExpertGroup>, BaseDAO<ComExpertGroupQueryVO, ComExpertGroupDTO,ComExpertGroup> {
......
......@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComExpertGroupMembers;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.param.dto.ComExpertGroupMembersDTO;
import com.yiboshi.science.param.query.ComExpertGroupMembersQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertGroupMembersQueryVO;
import java.util.List;
......
......@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComExpertSpec;
import com.yiboshi.science.entity.SystemMenu;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComExpertSpecDTO;
import com.yiboshi.science.param.query.ComExpertSpecQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertSpecQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.enumeration.query.ComFileQueryVO;
import java.util.List;
......@@ -16,4 +16,4 @@ import java.util.List;
*/
public interface ComFileDAO extends BaseMapper<ComFile>, BaseDAO<ComFileQueryVO,ComFileDTO, ComFile> {
List<ComFileDTO> getListByObjectId(String objectId, int fileType);
}
\ No newline at end of file
}
......@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComManager;
import com.yiboshi.science.param.dto.ComManagerDTO;
import com.yiboshi.science.param.query.ComManagerQueryVO;
import com.yiboshi.science.enumeration.query.ComManagerQueryVO;
/**
* 单位管理员表 DAO
*
*
* @author lkl
* @version 2021-08-25
*/
......@@ -16,4 +16,4 @@ public interface ComManagerDAO extends BaseMapper<ComManager>, BaseDAO<ComManage
ComManagerDTO getManagerById(String id);
ComManagerDTO getManagerByCertId(String certId);
}
\ No newline at end of file
}
......@@ -5,15 +5,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComNotice;
import com.yiboshi.science.param.dto.ComNoticeDTO;
import com.yiboshi.science.param.query.ComNoticeQueryVO;
import com.yiboshi.science.enumeration.query.ComNoticeQueryVO;
import org.apache.ibatis.annotations.Param;
/**
* 通知公告表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComNoticeDAO extends BaseMapper<ComNotice>, BaseDAO<ComNoticeQueryVO, ComNoticeDTO, ComNotice> {
ComNoticeDTO getLatestNotice(@Param("ew") Wrapper<ComNotice> queryWrapper);
}
\ No newline at end of file
}
......@@ -7,7 +7,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComPersonQueryVO;
import com.yiboshi.science.enumeration.query.ComPersonQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComPersonResume;
import com.yiboshi.science.param.dto.ComPersonResumeDTO;
import com.yiboshi.science.param.query.ComPersonResumeQueryVO;
import com.yiboshi.science.enumeration.query.ComPersonResumeQueryVO;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComPersonScientificGain;
import com.yiboshi.science.param.dto.ComPersonScientificGainDTO;
import com.yiboshi.science.param.query.ComPersonScientificGainQueryVO;
import com.yiboshi.science.enumeration.query.ComPersonScientificGainQueryVO;
import java.util.List;
......
......@@ -3,11 +3,10 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.AssignCount;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.entity.ComProjectAssign;
import com.yiboshi.science.param.dto.ComProjectAssignDTO;
import com.yiboshi.science.param.dto.ComProjectGroupDTO;
import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectAssignQueryVO;
import java.util.List;
......
......@@ -7,14 +7,14 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.entity.ComProjectAudit;
import com.yiboshi.science.param.dto.*;
import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectAuditQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 审核表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
......@@ -49,4 +49,4 @@ public interface ComProjectAuditDAO extends BaseMapper<ComProjectAudit>, BaseDAO
List<EvaluationStatisticDTO> getEvaluationStatistic(Integer reportYear);
List<ProjectGroupScoreOrderDTO> getProjectGroupScoreOrder(Integer reportYear);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectAuditNote;
import com.yiboshi.science.param.dto.ComProjectAuditNoteDTO;
import com.yiboshi.science.param.query.ComProjectAuditNoteQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectAuditNoteQueryVO;
import java.util.List;
/**
* 审核表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectAuditNoteDAO extends BaseMapper<ComProjectAuditNote>, BaseDAO<ComProjectAuditNoteQueryVO,ComProjectAuditNoteDTO, ComProjectAuditNote> {
List<ComProjectAuditNoteDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectBasic;
import com.yiboshi.science.param.dto.ComProjectBasicDTO;
import com.yiboshi.science.param.query.ComProjectBasicQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectBasicQueryVO;
public interface ComProjectBasicDAO extends BaseMapper<ComProjectBasic>, BaseDAO<ComProjectBasicQueryVO, ComProjectBasicDTO,ComProjectBasic> {
......
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectBudget;
import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectBudgetQueryVO;
import java.util.List;
/**
* 经费申请表(任务书/项目申请书) DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectBudgetDAO extends BaseMapper<ComProjectBudget>, BaseDAO<ComProjectBudgetQueryVO,ComProjectBudgetDTO, ComProjectBudget> {
List<ComProjectBudgetDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -5,15 +5,15 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectCheck;
import com.yiboshi.science.param.dto.ComProjectCheckDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComProjectCheckQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectCheckQueryVO;
import org.apache.ibatis.annotations.Param;
/**
* 中期考核表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectCheckDAO extends BaseMapper<ComProjectCheck>, BaseDAO<ComProjectCheckQueryVO, ComProjectCheckDTO,ComProjectCheck> {
DataStatisticsDTO getCount(@Param("ew") Wrapper<ComProjectCheck> queryWrapper);
}
\ No newline at end of file
}
......@@ -6,16 +6,16 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectConclusion;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectConclusionQueryVO;
import org.apache.ibatis.annotations.Param;
/**
* 结题信息表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectConclusionDAO extends BaseMapper<ComProjectConclusion>, BaseDAO<ComProjectConclusionQueryVO, ComProjectConclusionDTO, ComProjectConclusion> {
ComProjectConclusionDTO getConclusionByProjId(String projId);
DataStatisticsDTO getCount(@Param("ew") Wrapper<ComProjectConclusion> queryWrapper);
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectConclusionMaterial;
import com.yiboshi.science.param.dto.ComProjectConclusionMaterialDTO;
import com.yiboshi.science.param.query.ComProjectConclusionMaterialQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectConclusionMaterialQueryVO;
import java.util.List;
......
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectCooperativeUnits;
import com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO;
import com.yiboshi.science.param.query.ComProjectCooperativeUnitsQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectCooperativeUnitsQueryVO;
import java.util.List;
/**
* 合作单位表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectCooperativeUnitsDAO extends BaseMapper<ComProjectCooperativeUnits>, BaseDAO<ComProjectCooperativeUnitsQueryVO,ComProjectCooperativeUnitsDTO, ComProjectCooperativeUnits> {
List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId, int type);
}
\ No newline at end of file
}
......@@ -6,12 +6,12 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.param.dto.ComProjectDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComProjectQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectQueryVO;
import org.apache.ibatis.annotations.Param;
/**
* 项目表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
......@@ -21,4 +21,4 @@ public interface ComProjectDAO extends BaseMapper<ComProject>, BaseDAO<ComProjec
ComProjectDTO getById(String id);
DataStatisticsDTO getProjectReportCountByGov(String treeCode);
DataStatisticsDTO getProjectReportCountByUnitId(String appUnitId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectEquipment;
import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
import com.yiboshi.science.param.query.ComProjectEquipmentQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectEquipmentQueryVO;
import java.util.List;
/**
* 经费申请表(任务书/项目申请书) DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectEquipmentDAO extends BaseMapper<ComProjectEquipment>, BaseDAO<ComProjectEquipmentQueryVO,ComProjectEquipmentDTO, ComProjectEquipment> {
List<ComProjectEquipmentDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectFundComposition;
import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectFundCompositionQueryVO;
import java.util.List;
/**
* 经费申请表(任务书/项目申请书) DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectFundCompositionDAO extends BaseMapper<ComProjectFundComposition>, BaseDAO<ComProjectFundCompositionQueryVO, ComProjectFundCompositionDTO, ComProjectFundComposition> {
List<ComProjectFundCompositionDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,17 +4,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectFundPlan;
import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectFundPlanQueryVO;
import java.util.List;
/**
* 经费申请表(任务书/项目申请书) DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectFundPlanDAO extends BaseMapper<ComProjectFundPlan>, BaseDAO<ComProjectFundPlanQueryVO, ComProjectFundPlanDTO, ComProjectFundPlan> {
List<ComProjectFundPlanDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectGroupAssign;
import com.yiboshi.science.param.dto.ComProjectAssignDTO;
import com.yiboshi.science.param.dto.ComProjectGroupAssignDTO;
import com.yiboshi.science.param.query.ComProjectGroupAssignQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectGroupAssignQueryVO;
import java.util.List;
......
......@@ -6,7 +6,7 @@ import com.yiboshi.science.entity.ComProjectGroup;
import com.yiboshi.science.param.dto.ComProjectAssignDTO;
import com.yiboshi.science.param.dto.ComProjectGroupDTO;
import com.yiboshi.science.param.dto.ComProjectKnowledgeStatisticDTO;
import com.yiboshi.science.param.query.ComProjectGroupQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectGroupQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectGroupDetail;
import com.yiboshi.science.param.dto.ComProjectGroupDetailDTO;
import com.yiboshi.science.param.query.ComProjectGroupDetailQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectGroupDetailQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectKpit;
import com.yiboshi.science.param.dto.ComProjectKpitDTO;
import com.yiboshi.science.param.query.ComProjectKpitQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectKpitQueryVO;
import java.util.List;
......
......@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectKpitDetail;
import com.yiboshi.science.param.dto.ComProjectKpitDTO;
import com.yiboshi.science.param.dto.ComProjectKpitDetailDTO;
import com.yiboshi.science.param.query.ComProjectKpitDetailQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectKpitDetailQueryVO;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectManagementRule;
import com.yiboshi.science.param.dto.ComProjectManagementRuleDTO;
import com.yiboshi.science.param.query.ComProjectManagementRuleQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectManagementRuleQueryVO;
import java.util.List;
......@@ -16,4 +16,4 @@ import java.util.List;
*/
public interface ComProjectManagementRuleDAO extends BaseMapper<ComProjectManagementRule>, BaseDAO<ComProjectManagementRuleQueryVO, ComProjectManagementRuleDTO, ComProjectManagementRule> {
List<ComProjectManagementRuleDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectManufacture;
import com.yiboshi.science.param.dto.ComProjectManufactureDTO;
import com.yiboshi.science.param.query.ComProjectManufactureQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectManufactureQueryVO;
import java.util.List;
/**
* 试制设备预算明细表 DAO
*
*
* @author xujun
* @version 2024-12-16
*/
public interface ComProjectManufactureDAO extends BaseMapper<ComProjectManufacture>, BaseDAO<ComProjectManufactureQueryVO, ComProjectManufactureDTO, ComProjectManufacture> {
List<ComProjectManufactureDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectMembers;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComProjectMembersQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectMembersQueryVO;
import java.util.List;
......@@ -18,4 +18,4 @@ public interface ComProjectMembersDAO extends BaseMapper<ComProjectMembers>, Bas
List<ComProjectMembersDTO> getListByObjectId(String objectId);
ComProjectMembersDTO getMemCountById(String objectId);
Integer getMemWorkCountByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectResearch;
import com.yiboshi.science.param.dto.ComProjectResearchDTO;
import com.yiboshi.science.param.query.ComProjectResearchQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectResearchQueryVO;
import java.util.List;
/**
* 项目申请书在研项目情况表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectResearchDAO extends BaseMapper<ComProjectResearch>, BaseDAO<ComProjectResearchQueryVO, ComProjectResearchDTO, ComProjectResearch> {
List<ComProjectResearchDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectResults;
import com.yiboshi.science.param.dto.ComProjectResultsDTO;
import com.yiboshi.science.param.query.ComProjectResultsQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectResultsQueryVO;
import java.util.List;
/**
* 预期成果 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
......@@ -18,4 +18,4 @@ public interface ComProjectResultsDAO extends BaseMapper<ComProjectResults> , Ba
List<ComProjectResultsDTO> getListByObjectId(String objectId);
List<String> getArrayByObjectId(String objectId);
List<String> getNameByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectStageGoal;
import com.yiboshi.science.param.dto.ComProjectStageGoalDTO;
import com.yiboshi.science.param.query.ComProjectStageGoalQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectStageGoalQueryVO;
import java.util.List;
/**
* 任务书主要研发内容 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectStageGoalDAO extends BaseMapper<ComProjectStageGoal>, BaseDAO<ComProjectStageGoalQueryVO, ComProjectStageGoalDTO, ComProjectStageGoal> {
List<ComProjectStageGoalDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectSub;
import com.yiboshi.science.param.dto.ComProjectSubDTO;
import com.yiboshi.science.param.query.ComProjectSubQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectSubQueryVO;
import java.util.List;
......@@ -16,4 +16,4 @@ import java.util.List;
*/
public interface ComProjectSubDAO extends BaseMapper<ComProjectSub>, BaseDAO<ComProjectSubQueryVO, ComProjectSubDTO, ComProjectSub> {
List<ComProjectSubDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -6,12 +6,12 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectTask;
import com.yiboshi.science.param.dto.ComProjectTaskDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComProjectTaskQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectTaskQueryVO;
import org.apache.ibatis.annotations.Param;
/**
* 任务书表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
......@@ -19,4 +19,4 @@ public interface ComProjectTaskDAO extends BaseMapper<ComProjectTask>, BaseDAO<C
DataStatisticsDTO getCount(@Param("ew") Wrapper<ComProjectTask> queryWrapper);
ComProjectTaskDTO getByProjId(String id);
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectUnitPayment;
import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectUnitPaymentQueryVO;
import java.util.List;
/**
* 经费申请表(任务书/项目申请书) DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComProjectUnitPaymentDAO extends BaseMapper<ComProjectUnitPayment>, BaseDAO<ComProjectUnitPaymentQueryVO, ComProjectUnitPaymentDTO, ComProjectUnitPayment> {
List<ComProjectUnitPaymentDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComSendingRecord;
import com.yiboshi.science.param.dto.ComSendingRecordDTO;
import com.yiboshi.science.param.query.ComSendingRecordQueryVO;
import com.yiboshi.science.enumeration.query.ComSendingRecordQueryVO;
/**
* 信息发送记录表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComSendingRecordDAO extends BaseMapper<ComSendingRecord>, BaseDAO<ComSendingRecordQueryVO, ComSendingRecordDTO, ComSendingRecord> {
}
\ No newline at end of file
}
......@@ -6,7 +6,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComTalentApply;
import com.yiboshi.science.param.dto.ComTalentApplyDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComTalentApplyQueryVO;
import com.yiboshi.science.enumeration.query.ComTalentApplyQueryVO;
import org.apache.ibatis.annotations.Param;
/**
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComTalentBudget;
import com.yiboshi.science.param.dto.ComTalentBudgetDTO;
import com.yiboshi.science.param.query.ComTalentBudgetQueryVO;
import com.yiboshi.science.enumeration.query.ComTalentBudgetQueryVO;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComTalentMembers;
import com.yiboshi.science.param.dto.ComTalentMembersDTO;
import com.yiboshi.science.param.query.ComTalentMembersQueryVO;
import com.yiboshi.science.enumeration.query.ComTalentMembersQueryVO;
import java.util.List;
......
......@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComTaskTarget;
import com.yiboshi.science.param.dto.ComTaskTargetDTO;
import com.yiboshi.science.param.query.ComTaskTargetQueryVO;
import com.yiboshi.science.enumeration.query.ComTaskTargetQueryVO;
import java.util.List;
/**
* 任务书预期成果表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface ComTaskTargetDAO extends BaseMapper<ComTaskTarget>, BaseDAO<ComTaskTargetQueryVO, ComTaskTargetDTO, ComTaskTarget> {
List<ComTaskTargetDTO> getListByObjectId(String objectId);
}
\ No newline at end of file
}
......@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.entity.ComUnit;
import com.yiboshi.science.param.dto.ComUnitDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComUnitQueryVO;
import com.yiboshi.science.enumeration.query.ComUnitQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
......@@ -3,14 +3,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.LogsException;
import com.yiboshi.science.param.dto.LogsExceptionDTO;
import com.yiboshi.science.param.query.LogsExceptionQueryVO;
import com.yiboshi.science.enumeration.query.LogsExceptionQueryVO;
/**
* 异常日志 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface LogsExceptionDAO extends BaseMapper<LogsException>, BaseDAO<LogsExceptionQueryVO, LogsExceptionDTO,LogsException> {
}
\ No newline at end of file
}
......@@ -4,16 +4,16 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.LogsLogin;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.dto.LogsLoginDTO;
import com.yiboshi.science.param.query.LogsLoginQueryVO;
import com.yiboshi.science.enumeration.query.LogsLoginQueryVO;
/**
* 登录日志表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface LogsLoginDAO extends BaseMapper<LogsLogin>, BaseDAO<LogsLoginQueryVO, LogsLoginDTO,LogsLogin> {
DataStatisticsDTO getCount();
DataStatisticsDTO getCountByDay();
}
\ No newline at end of file
}
......@@ -3,14 +3,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.LogsOperation;
import com.yiboshi.science.param.dto.LogsOperationDTO;
import com.yiboshi.science.param.query.LogsOperationQueryVO;
import com.yiboshi.science.enumeration.query.LogsOperationQueryVO;
/**
* 操作日志表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface LogsOperationDAO extends BaseMapper<LogsOperation>, BaseDAO<LogsOperationQueryVO, LogsOperationDTO,LogsOperation> {
}
\ No newline at end of file
}
......@@ -3,14 +3,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.LogsRequestException;
import com.yiboshi.science.param.dto.LogsRequestExceptionDTO;
import com.yiboshi.science.param.query.LogsRequestExceptionQueryVO;
import com.yiboshi.science.enumeration.query.LogsRequestExceptionQueryVO;
/**
* 请求异常日志表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface LogsRequestExceptionDAO extends BaseMapper<LogsRequestException>, BaseDAO<LogsRequestExceptionQueryVO, LogsRequestExceptionDTO,LogsRequestException> {
}
\ No newline at end of file
}
......@@ -4,18 +4,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemMenu;
import com.yiboshi.science.param.dto.SystemMenuDTO;
import com.yiboshi.science.param.query.SystemMenuQueryVO;
import com.yiboshi.science.enumeration.query.SystemMenuQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 菜单表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface SystemMenuDAO extends BaseMapper<SystemMenu>, BaseDAO<SystemMenuQueryVO,SystemMenuDTO,SystemMenu> {
List<SystemMenuDTO> findByRoleId( @Param("ew") Wrapper<SystemMenu> queryWrapper);
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemMenuRole;
import com.yiboshi.science.param.dto.SystemMenuRoleDTO;
import com.yiboshi.science.param.query.SystemMenuRoleQueryVO;
import com.yiboshi.science.enumeration.query.SystemMenuRoleQueryVO;
import java.util.List;
......@@ -21,4 +21,4 @@ public interface SystemMenuRoleDAO extends BaseMapper<SystemMenuRole>, BaseDAO<S
void deleteMenuRole(int roleId, String menuId);
List<SystemMenuRole> getMenuListById(int roleId, String parentId, String menuId);
}
\ No newline at end of file
}
......@@ -5,14 +5,14 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.param.dto.SpecDTO;
import com.yiboshi.science.param.dto.SystemParameterDTO;
import com.yiboshi.science.param.query.SystemParameterQueryVO;
import com.yiboshi.science.enumeration.query.SystemParameterQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 参数表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
......@@ -20,4 +20,4 @@ public interface SystemParameterDAO extends BaseMapper<SystemParameter>, BaseDAO
List<SystemParameter> getList(@Param("ew") Wrapper<SystemParameter> queryWrapper);
List<SystemParameter> getParentParameterList();
List<SpecDTO> getParameterArray(Integer typeId);
}
\ No newline at end of file
}
......@@ -5,18 +5,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemParameterType;
import com.yiboshi.science.param.dto.SystemParameterTypeDTO;
import com.yiboshi.science.param.query.SystemParameterTypeQueryVO;
import com.yiboshi.science.enumeration.query.SystemParameterTypeQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 参数类型表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface SystemParameterTypeDAO extends BaseMapper<SystemParameterType>, BaseDAO<SystemParameterTypeQueryVO, SystemParameterTypeDTO,SystemParameterType> {
List<SystemParameterType> getList(@Param("ew") QueryWrapper queryWrapper);
Integer getMaxTypeId();
}
\ No newline at end of file
}
......@@ -3,14 +3,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemRole;
import com.yiboshi.science.param.dto.SystemRoleDTO;
import com.yiboshi.science.param.query.SystemRoleQueryVO;
import com.yiboshi.science.enumeration.query.SystemRoleQueryVO;
/**
* 系统角色表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface SystemRoleDAO extends BaseMapper<SystemRole>, BaseDAO<SystemRoleQueryVO, SystemRoleDTO,SystemRole> {
Integer getMaxRoleId();
}
\ No newline at end of file
}
......@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemSet;
import com.yiboshi.science.param.dto.SystemSetDTO;
import com.yiboshi.science.param.query.SystemSetQueryVO;
import com.yiboshi.science.enumeration.query.SystemSetQueryVO;
/**
* 配置表 DAO
*
*
* @author lkl
* @version 2021-08-26
*/
public interface SystemSetDAO extends BaseMapper<SystemSet>, BaseDAO<SystemSetQueryVO, SystemSetDTO,SystemSet> {
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemUser;
import com.yiboshi.science.param.dto.SystemUserDTO;
import com.yiboshi.science.param.query.SystemUserQueryVO;
import com.yiboshi.science.enumeration.query.SystemUserQueryVO;
/**
* 用户信息表 DAO
......
......@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.SystemUserRole;
import com.yiboshi.science.param.dto.SystemUserDTO;
import com.yiboshi.science.param.dto.SystemUserRoleDTO;
import com.yiboshi.science.param.query.SystemUserRoleQueryVO;
import com.yiboshi.science.enumeration.query.SystemUserRoleQueryVO;
import java.util.List;
......
......@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComBatch;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.query.ComBatchQueryVO;
import com.yiboshi.science.enumeration.query.ComBatchQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComBatchService;
import io.swagger.annotations.Api;
......@@ -115,4 +115,4 @@ public class ComBatchController extends BaseController<ComBatchService, ComBatch
public ResponseDataModel<ComBatchDTO> getCurrentYearTalentBatch(int type) {
return ResponseDataModel.ok(comBatchService.getCurrentYearTalentBatch(type));
}
}
\ No newline at end of file
}
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComConclusionCatalog;
import com.yiboshi.science.param.dto.ComConclusionCatalogDTO;
import com.yiboshi.science.param.query.ComConclusionCatalogQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionCatalogQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComConclusionCatalogService;
import io.swagger.annotations.Api;
......@@ -19,4 +19,4 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/v1/science-admin/com-conclusion-thesis ")
public class ComConclusionCatalogController extends BaseController<ComConclusionCatalogService, ComConclusionCatalogQueryVO, ComConclusionCatalogDTO, ComConclusionCatalog> {
}
\ No newline at end of file
}
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComConclusionFundsService;
import io.swagger.annotations.Api;
......@@ -19,4 +19,4 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/v1/science-admin/com-conclusion-funds")
public class ComConclusionFundsController extends BaseController<ComConclusionFundsService, ComConclusionFundsQueryVO, ComConclusionFundsDTO, ComConclusionFunds> {
}
\ No newline at end of file
}
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionResearchersQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComConclusionResearchersService;
import io.swagger.annotations.Api;
......@@ -19,4 +19,4 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/v1/science-admin/com-conclusion-researchers")
public class ComConclusionResearchersController extends BaseController<ComConclusionResearchersService, ComConclusionResearchersQueryVO, ComConclusionResearchersDTO, ComConclusionResearchers> {
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import com.yiboshi.science.enumeration.query.ComConclusionThesisQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComConclusionThesisService;
import io.swagger.annotations.Api;
......@@ -44,4 +44,4 @@ public class ComConclusionThesisController extends BaseController<ComConclusionT
}
return ResponseDataModel.ok(page);
}
}
\ No newline at end of file
}
......@@ -6,11 +6,10 @@ import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.ComDownload;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComDownloadDTO;
import com.yiboshi.science.param.query.ComDownloadQueryVO;
import com.yiboshi.science.enumeration.query.ComDownloadQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComDownloadService;
import com.yiboshi.science.service.SystemSetService;
import com.yiboshi.science.utils.SystemSetKey;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
......@@ -21,10 +20,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.List;
import java.util.UUID;
/**
* 功能:附件表 接口
......@@ -75,4 +70,4 @@ public class ComDownloadController extends BaseController<ComDownloadService, Co
return ResponseDataModel.ok(page);
}
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationContentQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationContentService;
import io.swagger.annotations.Api;
......
......@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComEvaluation;
import com.yiboshi.science.param.dto.ComEvaluationDTO;
import com.yiboshi.science.param.query.ComEvaluationQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationService;
import io.swagger.annotations.Api;
......
......@@ -4,7 +4,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComEvaluationItem;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationItemQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationItemService;
import io.swagger.annotations.Api;
......
......@@ -3,7 +3,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComEvaluationItemNote;
import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationItemNoteQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationItemNoteService;
import io.swagger.annotations.Api;
......
......@@ -3,7 +3,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationNoteService;
import io.swagger.annotations.Api;
......
......@@ -5,7 +5,7 @@ import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComEvaluationStandard;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationStandardQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationStandardService;
import io.swagger.annotations.Api;
......
......@@ -4,7 +4,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
import com.yiboshi.science.enumeration.query.ComEvaluationValueQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComEvaluationValueService;
import io.swagger.annotations.Api;
......
......@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComExpertBatch;
import com.yiboshi.science.param.dto.ComExpertBatchDTO;
import com.yiboshi.science.param.query.ComExpertBatchQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertBatchQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertBatchService;
import io.swagger.annotations.Api;
......
......@@ -11,7 +11,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComExpertSpecDTO;
import com.yiboshi.science.param.dto.ComUnitDTO;
import com.yiboshi.science.param.query.ComExpertQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.*;
import io.swagger.annotations.Api;
......@@ -27,9 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
import static com.yiboshi.science.utils.StringUtil.hideAllPhoneNum;
@Api(tags = "com-expert", description = "专家表")
@RestController
......
......@@ -4,7 +4,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComExpertGroupAssign;
import com.yiboshi.science.param.dto.ComExpertGroupAssignDTO;
import com.yiboshi.science.param.query.ComExpertGroupAssignQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertGroupAssignQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertGroupAssignService;
import io.swagger.annotations.Api;
......
......@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComExpertGroup;
import com.yiboshi.science.param.dto.ComExpertGroupDTO;
import com.yiboshi.science.param.query.ComExpertGroupQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertGroupQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertGroupAssignService;
import com.yiboshi.science.service.ComExpertGroupService;
......
......@@ -3,7 +3,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComExpertGroupMembers;
import com.yiboshi.science.param.dto.ComExpertGroupMembersDTO;
import com.yiboshi.science.param.query.ComExpertGroupMembersQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertGroupMembersQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertGroupMembersService;
import io.swagger.annotations.Api;
......
......@@ -5,12 +5,9 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComExpertSpec;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.param.dto.ComExpertSpecDTO;
import com.yiboshi.science.param.dto.ComProjectGroupDetailDTO;
import com.yiboshi.science.param.query.ComExpertSpecQueryVO;
import com.yiboshi.science.enumeration.query.ComExpertSpecQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertSpecService;
import com.yiboshi.science.service.ComProjectGroupDetailService;
import com.yiboshi.science.service.ComProjectGroupService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.enumeration.query.ComFileQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComFileService;
import io.swagger.annotations.Api;
......@@ -19,4 +19,4 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/v1/science-admin/com-project-file")
public class ComFileController extends BaseController<ComFileService, ComFileQueryVO, ComFileDTO, ComFile> {
}
\ No newline at end of file
}
......@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComManagerDTO;
import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.query.ComManagerQueryVO;
import com.yiboshi.science.enumeration.query.ComManagerQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComManagerService;
import io.swagger.annotations.Api;
......@@ -73,4 +73,4 @@ public class ComManagerController extends BaseController<ComManagerService, ComM
public ResponseDataModel<String> delete(@Validated @RequestBody ComPersonDTO dto) {
return ResponseDataModel.ok(comManagerService.deleteManagerById(dto));
}
}
\ No newline at end of file
}
......@@ -4,7 +4,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComNotice;
import com.yiboshi.science.param.dto.ComNoticeDTO;
import com.yiboshi.science.param.query.ComNoticeQueryVO;
import com.yiboshi.science.enumeration.query.ComNoticeQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComNoticeService;
import io.swagger.annotations.Api;
......@@ -61,4 +61,4 @@ public class ComNoticeController extends BaseController<ComNoticeService, ComNot
public ResponseDataModel<ComNoticeDTO> getLatestNotice() {
return ResponseDataModel.ok(comNoticeService.getLatestNotice());
}
}
\ No newline at end of file
}
......@@ -9,13 +9,12 @@ import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.dto.ComUnitDTO;
import com.yiboshi.science.param.query.ComPersonQueryVO;
import com.yiboshi.science.enumeration.query.ComPersonQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComPersonService;
import com.yiboshi.science.service.ComUnitService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.BindingResult;
......
......@@ -7,7 +7,7 @@ import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.ComProjectAssign;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComProjectAssignDTO;
import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectAssignQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertSpecService;
import com.yiboshi.science.service.ComProjectAssignService;
......
......@@ -10,7 +10,7 @@ import com.yiboshi.science.entity.ComProjectAudit;
import com.yiboshi.science.entity.ComUnit;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.*;
import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectAuditQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectAssignService;
import com.yiboshi.science.service.ComProjectAuditService;
......
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectAuditNote;
import com.yiboshi.science.param.dto.ComProjectAuditNoteDTO;
import com.yiboshi.science.param.query.ComProjectAuditNoteQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectAuditNoteQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectAuditNoteService;
import io.swagger.annotations.Api;
......@@ -19,4 +19,4 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/v1/science-admin/com-project-audit-note")
public class ComProjectAuditNoteController extends BaseController<ComProjectAuditNoteService, ComProjectAuditNoteQueryVO, ComProjectAuditNoteDTO, ComProjectAuditNote> {
}
\ No newline at end of file
}
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectBasic;
import com.yiboshi.science.param.dto.ComProjectBasicDTO;
import com.yiboshi.science.param.query.ComProjectBasicQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectBasicQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectBasicService;
import io.swagger.annotations.Api;
......
......@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectBudget;
import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectBudgetService;
import io.swagger.annotations.Api;
......@@ -22,4 +22,4 @@ public class ComProjectBudgetController extends BaseController<ComProjectBudgetS
}
\ No newline at end of file
}
......@@ -10,7 +10,7 @@ import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComProjectCheckDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComProjectCheckQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectCheckQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectCheckService;
import io.swagger.annotations.Api;
......@@ -131,4 +131,4 @@ public class ComProjectCheckController extends BaseController<ComProjectCheckSer
}
return ResponseDataModel.ok(list);
}
}
\ No newline at end of file
}
......@@ -11,7 +11,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.dto.ComUnitDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
import com.yiboshi.science.enumeration.query.ComProjectConclusionQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectConclusionService;
import com.yiboshi.science.service.ComUnitService;
......@@ -175,4 +175,4 @@ public class ComProjectConclusionController extends BaseController<ComProjectCon
public void getPdfById(@Validated String id)throws IOException{
comProjectConclusionService.exportPdfById(response,id);
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment