Skip to content

Y
yn-health-science
Commit 1a47cb16 authored by 徐俊's avatar 徐俊
Browse files
Options

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

parents ba0c0026 3e24b7b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 378 deletions
.gitignore
View file @ 1a47cb16
......@@ -3,6 +3,7 @@ out/
!**/src/main/**/out/
!**/src/test/**/out/
target/
.idea
### Eclipse ###
.apt_generated
......
science-admin/src/main/java/com/yiboshi/science/config/aspect/LogAspect.java
View file @ 1a47cb16
package com.yiboshi.science.config.aspect;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.LogsLogin;
import com.yiboshi.science.entity.LogsOperation;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.service.LogsExceptionService;
......@@ -26,7 +24,6 @@ import org.springframework.web.context.request.RequestContextHolder;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.Date;
/**
* class: 系统日志切面
......
science-admin/src/main/java/com/yiboshi/science/config/exception/GlobalExceptionHandler.java
View file @ 1a47cb16
package com.yiboshi.science.config.exception;
import com.alibaba.fastjson.JSON;
import com.yiboshi.arch.base.ResponseCode;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.arch.exception.BusinessException;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.LogsException;
import com.yiboshi.science.service.LogsExceptionService;
import com.yiboshi.science.utils.CustomerIPAddress;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.authentication.InternalAuthenticationServiceException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
import org.springframework.web.bind.MethodArgumentNotValidException;
......@@ -25,10 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.method.HandlerMethod;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.ParameterizedType;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
/**
* class: GlobalExceptionHandler(全局异常处理)
......
science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionFundsDAO.java
View file @ 1a47cb16
......@@ -3,12 +3,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.entity.ComProjectConclusion;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionResearchersDAO.java
View file @ 1a47cb16
......@@ -2,12 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionThesisDAO.java
View file @ 1a47cb16
......@@ -2,12 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationDAO.java
View file @ 1a47cb16
......@@ -4,7 +4,6 @@ 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.dto.ComUnitDTO;
import com.yiboshi.science.param.query.ComEvaluationQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComExpertGroupAssignDAO.java
View file @ 1a47cb16
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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 org.apache.ibatis.annotations.Param;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComExpertSpecDAO.java
View file @ 1a47cb16
......@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComExpertSpec;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemMenu;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComExpertSpecDTO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComManagerDAO.java
View file @ 1a47cb16
......@@ -4,7 +4,6 @@ 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.dto.ComPersonDTO;
import com.yiboshi.science.param.query.ComManagerQueryVO;
/**
......
science-admin/src/main/java/com/yiboshi/science/dao/ComNoticeDAO.java
View file @ 1a47cb16
......@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComNotice;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.param.dto.ComNoticeDTO;
import com.yiboshi.science.param.query.ComNoticeQueryVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 通知公告表 DAO
*
......
science-admin/src/main/java/com/yiboshi/science/dao/ComPersonDAO.java
View file @ 1a47cb16
......@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComPersonQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectAssignDAO.java
View file @ 1a47cb16
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.AssignCount;
......@@ -9,9 +8,7 @@ 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 org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectBasicDAO.java
View file @ 1a47cb16
......@@ -2,11 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.entity.ComProjectBasic;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.dto.ComProjectBasicDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.param.query.ComProjectBasicQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectConclusionDAO.java
View file @ 1a47cb16
......@@ -3,7 +3,6 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.entity.ComProjectConclusion;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCooperativeUnitsDAO.java
View file @ 1a47cb16
......@@ -15,5 +15,5 @@ import java.util.List;
* @version 2021-08-26
*/
public interface ComProjectCooperativeUnitsDAO extends BaseMapper<ComProjectCooperativeUnits>, BaseDAO<ComProjectCooperativeUnitsQueryVO,ComProjectCooperativeUnitsDTO, ComProjectCooperativeUnits> {
List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId);
List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId, int type);
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectFundCompositionDAO.java
View file @ 1a47cb16
......@@ -2,12 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectBudget;
import com.yiboshi.science.entity.ComProjectFundComposition;
import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
import com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO;
import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectGroupDAO.java
View file @ 1a47cb16
package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComProjectGroup;
import com.yiboshi.science.param.dto.ComProjectAssignDTO;
import com.yiboshi.science.param.dto.ComProjectGroupDTO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDetailDAO.java
View file @ 1a47cb16
......@@ -2,12 +2,10 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProjectKpit;
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.param.query.ComProjectKpitQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectManagementRuleDAO.java
View file @ 1a47cb16
......@@ -2,11 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.entity.ComProjectManagementRule;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.dto.ComProjectManagementRuleDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.param.query.ComProjectManagementRuleQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectResearchDAO.java
View file @ 1a47cb16
......@@ -3,7 +3,6 @@ package com.yiboshi.science.dao;
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.ComProjectManagementRuleDTO;
import com.yiboshi.science.param.dto.ComProjectResearchDTO;
import com.yiboshi.science.param.query.ComProjectResearchQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComProjectSubDAO.java
View file @ 1a47cb16
......@@ -2,11 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.entity.ComProjectSub;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.dto.ComProjectSubDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.param.query.ComProjectSubQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/dao/ComSendingRecordDAO.java
View file @ 1a47cb16
......@@ -2,11 +2,8 @@ package com.yiboshi.science.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.entity.ComSendingRecord;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.dto.ComSendingRecordDTO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import com.yiboshi.science.param.query.ComSendingRecordQueryVO;
/**
......
science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java
View file @ 1a47cb16
......@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yiboshi.science.base.BaseDAO;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.entity.ComUnit;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComUnitDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.query.ComUnitQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/entity/ComExpert.java
View file @ 1a47cb16
......@@ -18,6 +18,9 @@ public class ComExpert extends BaseEntity {
/** 专家状态 1 启用 2 停用 */
@ApiModelProperty(value = "专家状态 1 启用 2 停用", position = 7 )
private Integer expertState;
/** 上报状态 1 未上报 2 已上报 */
@ApiModelProperty(value = "上报状态 1 未上报 2 已上报", position = 7 )
private Integer reportState;
/** 备注 */
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
......
science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java
View file @ 1a47cb16
......@@ -66,7 +66,7 @@ public class ComPerson extends BaseEntity {
private String nation;
/** 职务 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
@Length(max=100, message = "职务不能大于100")
private String duty;
/** 职称 */
@ApiModelProperty(value = "职称", position = 10 )
......@@ -84,6 +84,14 @@ public class ComPerson extends BaseEntity {
@ApiModelProperty(value = "电话号码", position = 13 )
@Length(max=100, message = "电话号码不能大于100")
private String mobile;
/** 电话 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
private String telephone;
/** 传真 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
private String fax;
/** 照片 */
@ApiModelProperty(value = "照片", position = 14 )
@Length(max=36, message = "照片不能大于36")
......@@ -108,6 +116,11 @@ public class ComPerson extends BaseEntity {
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 25)
private Integer auditResult;
......
science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
View file @ 1a47cb16
......@@ -63,7 +63,7 @@ public class ComProject extends BaseEntity {
private Integer projType;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3 )
@Length(max=36, message = "项目类别不能大于36")
@Length(max=100, message = "项目类别不能大于100")
private String projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
......
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
View file @ 1a47cb16
......@@ -27,14 +27,56 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
private String appUnitName;
/** 注册单位类型 */
@ApiModelProperty(value = "注册单位类型", position = 1)
@Length(max=36, message = "注册单位类型不能大于36")
private String unitType;
/** 每年工作时间(月) */
@ApiModelProperty(value = "每年工作时间(月)", position = 1 )
private Integer jobTime;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@Length(max=100, message = "单位联系人姓名不能大于100")
private String unitLinkName;
/** 单位联系人手机 */
@ApiModelProperty(value = "单位联系人手机", position = 16)
@Length(max=50, message = "单位联系人手机不能大于50")
private String unitLinkMobile;
/** 单位电子邮箱 */
@ApiModelProperty(value = "单位电子邮箱", position = 16)
@Length(max=100, message = "单位电子邮箱不能大于100")
private String unitLinkEmail;
/** 单位传真 */
@ApiModelProperty(value = "单位传真", position = 16)
@Length(max=100, message = "单位传真不能大于100")
private String unitLinkFax;
/** 选题范围 */
@ApiModelProperty(value = "选题范围", position = 1 )
@Length(max=200, message = "主要研究领域不能大于200")
private String subjectScope;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
private String remark;
/** 项目摘要 */
@ApiModelProperty(value = "项目摘要", position = 13 )
@Length(max=600, message = "项目摘要不能大于600")
private String projAbstract;
/** 关键词 */
@ApiModelProperty(value = "关键词", position = 26 )
@Length(max=200, message = "关键词不能大于200")
private String projKeywords;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
......@@ -42,7 +84,7 @@ public class ComProjectBasic extends BaseEntity {
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String address;
private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
......@@ -55,7 +97,6 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
......@@ -65,7 +106,6 @@ public class ComProjectBasic extends BaseEntity {
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
......@@ -82,10 +122,11 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 上年度研发经费支出总额(单位:万元) */
@ApiModelProperty(value = "上年度研发经费支出总额(单位:万元)", position = 1 )
private BigDecimal researchTotal;
/** 上年度是否填报了研发活动情况 0 否 1 是 */
@ApiModelProperty(value = "上年度是否填报了研发活动情况", position = 1 )
private Integer isResearchActive;
......@@ -96,6 +137,7 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "上一年度填报的研发人员数", position = 1 )
private Integer researchPersonCount;
/** 项目所属二级学院/部门名称(牵头单位) */
@ApiModelProperty(value = "项目所属二级学院/部门名称(牵头单位)", position = 1 )
@Length(max=100, message = "项目所属二级学院/部门名称(牵头单位)不能大于100")
......@@ -109,7 +151,6 @@ public class ComProjectBasic extends BaseEntity {
@Length(max=100, message = "项目依托的科技创新基地不能大于100")
private String technologyInnovationBase;
/** 项目总经费(万元） */
@ApiModelProperty(value = "项目总经费(万元）", position = 39)
private BigDecimal totalFunding;
......@@ -126,6 +167,7 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "其他", position = 43)
private BigDecimal otherFunding;
/** 项目联系人姓名 */
@ApiModelProperty(value = "项目联系人姓名", position = 16)
@Length(max=100, message = "项目联系人姓名不能大于100")
......@@ -138,15 +180,11 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 项目摘要 */
@ApiModelProperty(value = "项目摘要", position = 13 )
@Length(max=600, message = "项目摘要不能大于600")
private String projAbstract;
/** 关键词 */
@ApiModelProperty(value = "关键词", position = 26 )
@Length(max=200, message = "关键词不能大于200")
private String projKeywords;
/** 项目的意义、必要性 */
@ApiModelProperty(value = "主要研究内容和意义", position = 13 )
......@@ -222,9 +260,4 @@ public class ComProjectBasic extends BaseEntity {
@Length(max=500, message = "第三年目标500")
private String year3Goal;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
private String remark;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectCooperativeUnits.java
View file @ 1a47cb16
......@@ -42,6 +42,9 @@ public class ComProjectCooperativeUnits extends BaseEntity {
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
/** 类型 */
@ApiModelProperty(value = "类型", position = 10 )
private Integer type;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
......
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectMembers.java
View file @ 1a47cb16
......@@ -99,4 +99,7 @@ public class ComProjectMembers extends BaseEntity {
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/entity/ComUnit.java
View file @ 1a47cb16
......@@ -21,13 +21,6 @@ import java.util.Date;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "单位表VO")
public class ComUnit extends BaseEntity {
/** 远程单位id */
@ApiModelProperty(value = "远程单位id", position = 1)
private Long longId;
/** 上级单位Id */
@ApiModelProperty(value = "上级单位Id", position = 1)
private Long parentId;
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 1 , required = true)
@NotNull(message = "树编码不能为空")
......@@ -40,8 +33,6 @@ public class ComUnit extends BaseEntity {
/** 单位类型 */
@ApiModelProperty(value = "单位类型", position = 3 )
private Integer unitType;
/** 是否直属单位 1是 */
private Integer provinceSubjection;
/** 单位性质 */
@ApiModelProperty(value = "单位性质", position = 3 )
private String unitNature;
......@@ -52,10 +43,8 @@ public class ComUnit extends BaseEntity {
@ApiModelProperty(value = "单位地址", position = 6 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 7 )
@Length(max=100, message = "邮编不能大于100")
private String postcode;
/** 联系人姓名 */
@ApiModelProperty(value = "联系人姓名", position = 8 )
@Length(max=100, message = "联系人姓名不能大于100")
......@@ -63,18 +52,64 @@ public class ComUnit extends BaseEntity {
/** 联系人电话 */
@ApiModelProperty(value = "联系人电话", position = 9 )
@Length(max=100, message = "联系人电话不能大于100")
private String linkTel;
private String telephone;
/** 联系人邮箱 */
@ApiModelProperty(value = "联系人邮箱", position = 10 )
@Length(max=100, message = "联系人邮箱不能大于100")
private String linkEmail;
/** 申报项目数量配比 */
@ApiModelProperty(value = "申报项目数量配比", position = 11 )
private Integer projLimit;
private String email;
/** 传真 */
@ApiModelProperty(value = "传真", position = 1 )
@Length(max=50, message = "传真不能大于50")
private String fax;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
private String registeredAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 7 )
@Length(max=100, message = "邮编不能大于100")
private String postCode;
/** 法定代表人 */
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
/** 其中专科以上人员 */
@ApiModelProperty(value = "其中专科以上人员", position = 1 )
private Integer specializedPersonnel;
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
private String depositBank;
/** 银行账号 */
@ApiModelProperty(value = "银行账号", position = 1 )
@Length(max=50, message = "银行账号不能大于50")
private String bankAccount;
/** 开户银行地址 */
@ApiModelProperty(value = "开户银行地址", position = 1 )
@Length(max=100, message = "开户银行地址不能大于100")
private String depositBankAddress;
/** 银行联行号 */
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 备注 */
@ApiModelProperty(value = "备注", position = 12 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 6 )
private Integer auditResult;
......@@ -91,8 +126,7 @@ public class ComUnit extends BaseEntity {
@ApiModelProperty(value = "审核时间", position = 7 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditDate;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/dto/ComExpertDTO.java
View file @ 1a47cb16
......@@ -24,6 +24,9 @@ public class ComExpertDTO extends BaseDTO {
/** 专家状态 1 启用 2 停用 */
@ApiModelProperty(value = "专家状态 1 启用 2 停用", position = 3 )
private Integer expertState;
/** 上报状态 1 未上报 2 已上报 */
@ApiModelProperty(value = "上报状态 1 未上报 2 已上报", position = 7 )
private Integer reportState;
/** 备注 */
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComPersonDTO.java
View file @ 1a47cb16
......@@ -67,6 +67,14 @@ public class ComPersonDTO extends BaseDTO {
/** 电话号码 */
@ApiModelProperty(value = "电话号码", position = 16)
private String mobile;
/** 电话 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
private String telephone;
/** 传真 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
private String fax;
/** 照片 */
@ApiModelProperty(value = "照片", position = 17)
private String photo;
......@@ -87,6 +95,12 @@ public class ComPersonDTO extends BaseDTO {
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 25)
private Integer auditResult;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
View file @ 1a47cb16
......@@ -26,6 +26,16 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
/** 每年工作时间(月) */
@ApiModelProperty(value = "每年工作时间(月)", position = 1 )
private Integer jobTime;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=300, message = "主要研究领域不能大于300")
private String mainResearchAreas;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
......@@ -41,7 +51,7 @@ public class ComProjectBasicDTO extends BaseDTO {
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String address;
private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
......@@ -54,7 +64,6 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
......@@ -64,7 +73,6 @@ public class ComProjectBasicDTO extends BaseDTO {
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
......@@ -81,6 +89,23 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@Length(max=100, message = "单位联系人姓名不能大于100")
private String unitLinkName;
/** 单位联系人手机 */
@ApiModelProperty(value = "单位联系人手机", position = 16)
@Length(max=50, message = "单位联系人手机不能大于50")
private String unitLinkMobile;
/** 单位电子邮箱 */
@ApiModelProperty(value = "单位电子邮箱", position = 16)
@Length(max=100, message = "单位电子邮箱不能大于100")
private String unitLinkEmail;
/** 单位传真 */
@ApiModelProperty(value = "单位传真", position = 16)
@Length(max=100, message = "单位传真不能大于100")
private String unitLinkFax;
/** 上年度研发经费支出总额(单位:万元) */
@ApiModelProperty(value = "上年度研发经费支出总额(单位:万元)", position = 1 )
......@@ -137,6 +162,10 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 项目摘要 */
@ApiModelProperty(value = "项目摘要", position = 13 )
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectCooperativeUnitsDTO.java
View file @ 1a47cb16
......@@ -41,6 +41,9 @@ public class ComProjectCooperativeUnitsDTO extends BaseDTO {
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
/** 类型 */
@ApiModelProperty(value = "类型", position = 10 )
private Integer type;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
View file @ 1a47cb16
......@@ -64,7 +64,7 @@ public class ComProjectDTO extends BaseDTO {
private Integer projType;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3 )
@Length(max=36, message = "项目类别不能大于36")
@Length(max=100, message = "项目类别不能大于100")
private String projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
......@@ -96,6 +96,20 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
/** 每年工作时间(月) */
@ApiModelProperty(value = "每年工作时间(月)", position = 1 )
private Integer jobTime;
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String address;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
......@@ -111,7 +125,7 @@ public class ComProjectDTO extends BaseDTO {
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String address;
private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
......@@ -124,7 +138,6 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1)
private Integer workforce;
......@@ -134,7 +147,6 @@ public class ComProjectDTO extends BaseDTO {
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
......@@ -151,6 +163,22 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@Length(max=100, message = "单位联系人姓名不能大于100")
private String unitLinkName;
/** 单位联系人手机 */
@ApiModelProperty(value = "单位联系人手机", position = 16)
@Length(max=50, message = "单位联系人手机不能大于50")
private String unitLinkMobile;
/** 单位电子邮箱 */
@ApiModelProperty(value = "单位电子邮箱", position = 16)
@Length(max=100, message = "单位电子邮箱不能大于100")
private String unitLinkEmail;
/** 单位传真 */
@ApiModelProperty(value = "单位传真", position = 16)
@Length(max=100, message = "单位传真不能大于100")
private String unitLinkFax;
/** 上年度研发经费支出总额(单位:万元) */
@ApiModelProperty(value = "上年度研发经费支出总额(单位:万元)", position = 1 )
......@@ -207,6 +235,10 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 项目摘要 */
@ApiModelProperty(value = "项目摘要", position = 13 )
......@@ -331,6 +363,7 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "注册单位类型", position = 12)
@Length(max=100, message = "注册单位类型不能大于100")
private String unitTypeName;
/** 项目状态 */
@ApiModelProperty(value = "项目状态", position = 41)
private String projStateName;
......@@ -358,16 +391,24 @@ public class ComProjectDTO extends BaseDTO {
private String sex;
/** 出生年月 */
@ApiModelProperty(value = "出生年月", position = 3)
private String birthday;
private Date birthday;
/** 证件号 */
@ApiModelProperty(value = "证件号", position = 3)
private String certId;
/** 邮箱 */
@ApiModelProperty(value = "邮箱", position = 15)
private String email;
/** 电话号码 */
@ApiModelProperty(value = "电话号码", position = 16)
private String mobile;
/** 民族 */
@ApiModelProperty(value = "民族", position = 3)
private String nationName;
/** 职称 */
@ApiModelProperty(value = "职称", position = 3)
private String titleName;
@ApiModelProperty(value = "职务", position = 12)
private String dutyName;
/** 学位 */
@ApiModelProperty(value = "学位", position = 8)
private String degreeName;
......@@ -383,6 +424,8 @@ public class ComProjectDTO extends BaseDTO {
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
/** 项目主要参与单位 */
private List<ComProjectCooperativeUnitsDTO> participateUnits;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 经费表 */
......@@ -396,7 +439,6 @@ public class ComProjectDTO extends BaseDTO {
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 在研或完成基础研究项目情况 */
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectMembersDTO.java
View file @ 1a47cb16
......@@ -99,6 +99,19 @@ public class ComProjectMembersDTO extends BaseDTO {
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 1 )
@Length(max=36, message = "附件Id不能大于36")
private String downloadId;
/** 附件名 */
@ApiModelProperty(value = "附件名", position = 6)
private String fileName;
/** URL */
@ApiModelProperty(value = "URL", position = 7)
private String downloadUrl;
/** 证件类型 */
@ApiModelProperty(value = "证件类型", position = 9)
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java
View file @ 1a47cb16
......@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
......@@ -22,39 +23,93 @@ import java.util.List;
@ApiModel(description = "单位表DTO")
public class ComUnitDTO extends BaseDTO {
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 1)
@ApiModelProperty(value = "树编码", position = 1 , required = true)
@NotNull(message = "树编码不能为空")
@Length(max=50, message = "树编码不能大于50")
private String treeCode;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 2)
@ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200")
private String unitName;
/** 单位类型 */
@ApiModelProperty(value = "单位类型", position = 3 )
private Integer unitType;
/** 单位性质 */
@ApiModelProperty(value = "单位性质", position = 3 )
private String unitNature;
/** 单位类型 */
@ApiModelProperty(value = "单位类型", position = 3)
private Integer unitType;
/** 状态 1正常 2 注销 */
/** 状态 1正常 2 注销 */
@ApiModelProperty(value = "状态 1正常 2 注销", position = 5)
private Integer unitState;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 6)
@ApiModelProperty(value = "单位地址", position = 6 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 7)
private String postcode;
/** 联系人姓名 */
@ApiModelProperty(value = "联系人姓名", position = 8)
@ApiModelProperty(value = "联系人姓名", position = 8 )
@Length(max=100, message = "联系人姓名不能大于100")
private String linkName;
/** 联系人电话 */
@ApiModelProperty(value = "联系人电话", position = 9)
private String linkTel;
@ApiModelProperty(value = "联系人电话", position = 9 )
@Length(max=100, message = "联系人电话不能大于100")
private String telephone;
/** 联系人邮箱 */
@ApiModelProperty(value = "联系人邮箱", position = 10)
private String linkEmail;
@ApiModelProperty(value = "联系人邮箱", position = 10 )
@Length(max=100, message = "联系人邮箱不能大于100")
private String email;
/** 传真 */
@ApiModelProperty(value = "传真", position = 1 )
@Length(max=50, message = "传真不能大于50")
private String fax;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
private String registeredAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 7 )
@Length(max=100, message = "邮编不能大于100")
private String postCode;
/** 法定代表人 */
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
/** 其中专科以上人员 */
@ApiModelProperty(value = "其中专科以上人员", position = 1 )
private Integer specializedPersonnel;
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
private String depositBank;
/** 银行账号 */
@ApiModelProperty(value = "银行账号", position = 1 )
@Length(max=50, message = "银行账号不能大于50")
private String bankAccount;
/** 开户银行地址 */
@ApiModelProperty(value = "开户银行地址", position = 1 )
@Length(max=100, message = "开户银行地址不能大于100")
private String depositBankAddress;
/** 银行联行号 */
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 备注 */
@ApiModelProperty(value = "备注", position = 11)
@Length(max=200, message = "备注长度不能大于200")
@ApiModelProperty(value = "备注", position = 12 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 6 )
private Integer auditResult;
......@@ -71,10 +126,6 @@ public class ComUnitDTO extends BaseDTO {
@ApiModelProperty(value = "审核时间", position = 7 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditDate;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
/** 单位类型 */
@ApiModelProperty(value = "单位类型", position = 14)
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComExpertQueryVO.java
View file @ 1a47cb16
......@@ -25,16 +25,21 @@ public class ComExpertQueryVO extends PaginationVO {
/** 专家状态 1 启用 2 停用 */
@ApiModelProperty(value = "专家状态 1 启用 2 停用", position = 7 )
private Integer expertState;
/** 上报状态 1 未上报 2 已上报 */
@ApiModelProperty(value = "上报状态 1 未上报 2 已上报", position = 7 )
private Integer reportState;
/** 备注 */
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 专家状态 1 启用 2 停用 */
@ApiModelProperty(value = "专家状态 1 启用 2 停用", position = 4 )
private String expertStateName;
/** 上报状态 1 未上报 2 已上报 */
@ApiModelProperty(value = "上报状态 1 未上报 2 已上报", position = 7 )
private Integer reportStateName;
/** 姓名 */
@ExcelProperty("姓名")
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComPersonQueryVO.java
View file @ 1a47cb16
......@@ -67,6 +67,14 @@ public class ComPersonQueryVO extends PaginationVO {
/** 电话号码 */
@ApiModelProperty(value = "电话号码", position = 16)
private String mobile;
/** 电话 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
private String telephone;
/** 传真 */
@ApiModelProperty(value = "职务", position = 9 )
@Length(max=36, message = "职务不能大于36")
private String fax;
/** 照片 */
@ApiModelProperty(value = "照片", position = 17)
private String photo;
......@@ -87,6 +95,12 @@ public class ComPersonQueryVO extends PaginationVO {
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 25)
private Integer auditResult;
......@@ -104,6 +118,9 @@ public class ComPersonQueryVO extends PaginationVO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditDate;
/** 二级专业Id */
@ApiModelProperty(value = "二级专业Id", position = 39)
private String specParentId;
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
View file @ 1a47cb16
......@@ -25,6 +25,21 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
/** 选题范围 */
@ApiModelProperty(value = "选题范围", position = 1 )
@Length(max=200, message = "主要研究领域不能大于200")
private String subjectScope;
/** 每年工作时间(月) */
@ApiModelProperty(value = "每年工作时间(月)", position = 1 )
private Integer jobTime;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
......@@ -40,7 +55,7 @@ public class ComProjectBasicQueryVO extends PaginationVO{
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
private String address;
private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
......@@ -53,7 +68,6 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
......@@ -63,7 +77,6 @@ public class ComProjectBasicQueryVO extends PaginationVO{
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
......@@ -80,6 +93,22 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@Length(max=100, message = "单位联系人姓名不能大于100")
private String unitLinkName;
/** 单位联系人手机 */
@ApiModelProperty(value = "单位联系人手机", position = 16)
@Length(max=50, message = "单位联系人手机不能大于50")
private String unitLinkMobile;
/** 单位电子邮箱 */
@ApiModelProperty(value = "单位电子邮箱", position = 16)
@Length(max=100, message = "单位电子邮箱不能大于100")
private String unitLinkEmail;
/** 单位传真 */
@ApiModelProperty(value = "单位传真", position = 16)
@Length(max=100, message = "单位传真不能大于100")
private String unitLinkFax;
/** 上年度研发经费支出总额(单位:万元) */
@ApiModelProperty(value = "上年度研发经费支出总额(单位:万元)", position = 1 )
......@@ -136,6 +165,10 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "电子邮箱", position = 16)
@Length(max=100, message = "电子邮箱不能大于100")
private String linkEmail;
/** 传真 */
@ApiModelProperty(value = "传真", position = 16)
@Length(max=100, message = "传真不能大于100")
private String linkFax;
/** 项目摘要 */
@ApiModelProperty(value = "项目摘要", position = 13 )
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectCooperativeUnitsQueryVO.java
View file @ 1a47cb16
......@@ -41,6 +41,9 @@ public class ComProjectCooperativeUnitsQueryVO extends PaginationVO{
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
/** 类型 */
@ApiModelProperty(value = "类型", position = 10 )
private Integer type;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectMembersQueryVO.java
View file @ 1a47cb16
......@@ -84,4 +84,7 @@ public class ComProjectMembersQueryVO extends PaginationVO{
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
View file @ 1a47cb16
......@@ -63,7 +63,7 @@ public class ComProjectQueryVO extends PaginationVO{
private Integer projType;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3 )
@Length(max=36, message = "项目类别不能大于36")
@Length(max=100, message = "项目类别不能大于100")
private String projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
......@@ -90,7 +90,6 @@ public class ComProjectQueryVO extends PaginationVO{
@ApiModelProperty(value = "平均分", position = 4)
private BigDecimal averageScore;
/** 项目Id */
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComUnitQueryVO.java
View file @ 1a47cb16
......@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
......@@ -23,13 +25,16 @@ import java.util.List;
@ApiModel(description = "查询单位表VO")
public class ComUnitQueryVO extends PaginationVO{
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 1)
@ApiModelProperty(value = "树编码", position = 1 , required = true)
@NotNull(message = "树编码不能为空")
@Length(max=50, message = "树编码不能大于50")
private String treeCode;
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 2)
@ApiModelProperty(value = "单位名称", position = 2 )
@Length(max=200, message = "单位名称不能大于200")
private String unitName;
/** 单位类型 */
@ApiModelProperty(value = "单位类型", position = 3)
@ApiModelProperty(value = "单位类型", position = 3 )
private Integer unitType;
/** 单位性质 */
@ApiModelProperty(value = "单位性质", position = 3 )
......@@ -38,23 +43,75 @@ public class ComUnitQueryVO extends PaginationVO{
@ApiModelProperty(value = "状态 1正常 2 注销", position = 5)
private Integer unitState;
/** 单位地址 */
@ApiModelProperty(value = "单位地址", position = 6)
@ApiModelProperty(value = "单位地址", position = 6 )
@Length(max=200, message = "单位地址不能大于200")
private String unitAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 7)
private String postcode;
/** 联系人姓名 */
@ApiModelProperty(value = "联系人姓名", position = 8)
@ApiModelProperty(value = "联系人姓名", position = 8 )
@Length(max=100, message = "联系人姓名不能大于100")
private String linkName;
/** 联系人电话 */
@ApiModelProperty(value = "联系人电话", position = 9)
private String linkTel;
@ApiModelProperty(value = "联系人电话", position = 9 )
@Length(max=100, message = "联系人电话不能大于100")
private String telephone;
/** 联系人邮箱 */
@ApiModelProperty(value = "联系人邮箱", position = 10)
private String linkEmail;
@ApiModelProperty(value = "联系人邮箱", position = 10 )
@Length(max=100, message = "联系人邮箱不能大于100")
private String email;
/** 传真 */
@ApiModelProperty(value = "传真", position = 1 )
@Length(max=50, message = "传真不能大于50")
private String fax;
/** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
private String organizationCode;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
private String registeredAddress;
/** 邮编 */
@ApiModelProperty(value = "邮编", position = 7 )
@Length(max=100, message = "邮编不能大于100")
private String postCode;
/** 法定代表人 */
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
/** 其中专科以上人员 */
@ApiModelProperty(value = "其中专科以上人员", position = 1 )
private Integer specializedPersonnel;
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
private String depositBank;
/** 银行账号 */
@ApiModelProperty(value = "银行账号", position = 1 )
@Length(max=50, message = "银行账号不能大于50")
private String bankAccount;
/** 开户银行地址 */
@ApiModelProperty(value = "开户银行地址", position = 1 )
@Length(max=100, message = "开户银行地址不能大于100")
private String depositBankAddress;
/** 银行联行号 */
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
/** 备注 */
@ApiModelProperty(value = "备注", position = 11)
@ApiModelProperty(value = "备注", position = 12 )
@Length(max=200, message = "备注不能大于200")
private String remark;
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 6 )
private Integer auditResult;
......@@ -72,6 +129,7 @@ public class ComUnitQueryVO extends PaginationVO{
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditDate;
/** 上级单位编码 */
@ApiModelProperty(value = "上级单位编码", position = 17)
private String upTreeCode;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.URLUtil;
import com.alibaba.fastjson.JSON;
import com.google.common.hash.Hashing;
import com.wf.captcha.base.Captcha;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.arch.exception.BusinessException;
import com.yiboshi.science.api.ApiHttpRequest;
import com.yiboshi.science.config.annotation.Anonymous;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.config.bean.SystemProperties;
import com.yiboshi.science.config.security.SecurityUser;
import com.yiboshi.science.config.security.SecurityUserHolder;
......@@ -21,25 +16,19 @@ import com.yiboshi.science.config.verification.VerificationCodeProperties;
import com.yiboshi.science.entity.AuthUser;
import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.entity.SystemUser;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.CheckUserDTO;
import com.yiboshi.science.param.dto.SMSParameterDTO;
import com.yiboshi.science.param.dto.UserDTO;
import com.yiboshi.science.param.dto.UserMenuDTO;
import com.yiboshi.science.service.*;
import com.yiboshi.science.utils.PdfUtil;
import com.yiboshi.science.utils.RedisUtils;
import com.yiboshi.science.utils.StringUtil;
import com.yiboshi.science.utils.SystemSetKey;
import freemarker.cache.ClassTemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.Template;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.velocity.VelocityContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.authority.AuthorityUtils;
......@@ -53,14 +42,10 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* /**
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComConclusionThesisController.java
View file @ 1a47cb16
......@@ -2,21 +2,14 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.dto.ComProjectDTO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import com.yiboshi.science.param.query.ComProjectQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComConclusionThesisService;
import com.yiboshi.science.service.ComProjectService;
import com.yiboshi.science.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComDownloadController.java
View file @ 1a47cb16
......@@ -12,12 +12,9 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.math.BigInteger;
/**
* 功能：附件表 接口
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationContentController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseCode;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComEvaluationContent;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationController.java
View file @ 1a47cb16
......@@ -3,10 +3,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.ComEvaluation;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComEvaluationDTO;
import com.yiboshi.science.param.query.ComEvaluationQueryVO;
import com.yiboshi.science.rest.BaseController;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationValueController.java
View file @ 1a47cb16
......@@ -3,7 +3,6 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
import com.yiboshi.science.rest.BaseController;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertController.java
View file @ 1a47cb16
......@@ -26,9 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import static com.yiboshi.science.utils.StringUtil.hideAllPhoneNum;
import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
@Api(tags = "com-expert", description = "专家表")
@RestController
......@@ -54,6 +51,8 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
vo.setRoleId(CommonEnum.systemRole.expert.getCode().toString());
if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
vo.setUnitId(SecurityUserHolder.getUnitId());
}else{
vo.setReportState(2);
}
Pagination<ComExpertDTO> page = comExpertService.getListByPage(vo);
if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
......@@ -117,11 +116,14 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
private void checkRole(@RequestBody @Validated ComExpertDTO dto) {
if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
dto.setUnitId(SecurityUserHolder.getUnitId());
ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
dto.setUnitName(comUnitDTO.getUnitName());
} else {
if (Objects.nonNull(dto.getTreeCode())) {
ComUnitDTO unit = comUnitService.getByTreeCode(dto.getTreeCode());
if (null != unit) {
dto.setUnitId(unit.getId());
dto.setUnitName(unit.getUnitName());
}
}
}
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertGroupController.java
View file @ 1a47cb16
......@@ -3,17 +3,12 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.ComExpertGroup;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.dto.ComExpertGroupDTO;
import com.yiboshi.science.param.query.ComExpertGroupQueryVO;
import com.yiboshi.science.param.query.ComProjectQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComExpertGroupAssignService;
import com.yiboshi.science.service.ComExpertGroupService;
import com.yiboshi.science.service.ComExpertService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertSpecController.java
View file @ 1a47cb16
......@@ -11,7 +11,6 @@ import com.yiboshi.science.service.ComExpertSpecService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComManagerController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.ComManager;
import com.yiboshi.science.entity.ComPerson;
......@@ -20,9 +19,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.yiboshi.science.utils.StringUtil.hideAllPhoneNum;
import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
/**
* 功能：单位管理员表 接口
*
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComNoticeController.java
View file @ 1a47cb16
......@@ -2,15 +2,9 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.ComNotice;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComNoticeDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.dto.LogsOperationDTO;
import com.yiboshi.science.param.query.ComNoticeQueryVO;
import com.yiboshi.science.param.query.LogsOperationQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComNoticeService;
import io.swagger.annotations.Api;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java
View file @ 1a47cb16
......@@ -11,11 +11,9 @@ 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.param.query.ComProjectQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectAuditService;
import com.yiboshi.science.service.ComUnitService;
import com.yiboshi.science.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,7 +22,6 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectConclusionMaterialController.java
View file @ 1a47cb16
......@@ -3,11 +3,7 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.config.annotation.Anonymous;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.ComProjectAudit;
import com.yiboshi.science.entity.ComProjectConclusionMaterial;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionAuditDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionMaterialDTO;
import com.yiboshi.science.param.query.ComProjectConclusionMaterialQueryVO;
......@@ -19,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "com-project-conclusion-material", description = "结题审核材料表")
@RestController
@RequestMapping("/v1/science-admin/com-project-conclusion-material")
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java
View file @ 1a47cb16
......@@ -15,9 +15,7 @@ import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComFileService;
import com.yiboshi.science.service.ComProjectService;
import com.yiboshi.science.service.ComProjectTaskService;
import com.yiboshi.science.utils.IDCardUtil;
import com.yiboshi.science.utils.StringUtil;
import com.yiboshi.science.utils.WordUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,9 +24,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectFundCompositionController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectBudget;
import com.yiboshi.science.entity.ComProjectFundComposition;
import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectBudgetService;
import com.yiboshi.science.service.ComProjectFundCompositionService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectFundPlanController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectFundComposition;
import com.yiboshi.science.entity.ComProjectFundPlan;
import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectFundCompositionService;
import com.yiboshi.science.service.ComProjectFundPlanService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectGroupAssignController.java
View file @ 1a47cb16
......@@ -14,8 +14,6 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "com-project-group-assign", description = "项目组分配表")
@RestController
@RequestMapping("/v1/science-admin/com-project-group-assign")
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectGroupController.java
View file @ 1a47cb16
......@@ -2,12 +2,10 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.ComProjectGroup;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.*;
import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
import com.yiboshi.science.param.query.ComProjectGroupQueryVO;
import com.yiboshi.science.rest.BaseController;
......@@ -24,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@Api(tags = "com-project-group", description = "项目分组表")
@RestController
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectGroupDetailController.java
View file @ 1a47cb16
......@@ -3,7 +3,6 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComProjectGroupDetail;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.param.dto.ComProjectGroupDetailDTO;
import com.yiboshi.science.param.query.ComProjectGroupDetailQueryVO;
import com.yiboshi.science.rest.BaseController;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectManagementRuleController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.entity.ComProjectManagementRule;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.dto.ComProjectManagementRuleDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.param.query.ComProjectManagementRuleQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComFileService;
import com.yiboshi.science.service.ComProjectManagementRuleService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectSubController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.entity.ComProjectSub;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.dto.ComProjectSubDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.param.query.ComProjectSubQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComFileService;
import com.yiboshi.science.service.ComProjectSubService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java
View file @ 1a47cb16
......@@ -4,7 +4,6 @@ import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.ComDownload;
import com.yiboshi.science.entity.ComProjectAudit;
import com.yiboshi.science.entity.ComProjectTask;
import com.yiboshi.science.entity.SelectListItem;
......@@ -15,7 +14,6 @@ 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.rest.BaseController;
import com.yiboshi.science.service.ComDownloadService;
import com.yiboshi.science.service.ComProjectTaskService;
import com.yiboshi.science.service.SystemParameterService;
import io.swagger.annotations.Api;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectUnitPaymentController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.science.entity.ComProjectFundPlan;
import com.yiboshi.science.entity.ComProjectUnitPayment;
import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectFundPlanService;
import com.yiboshi.science.service.ComProjectUnitPaymentService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComUnitController.java
View file @ 1a47cb16
......@@ -9,7 +9,6 @@ import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.ComUnit;
import com.yiboshi.science.entity.SelectListItem;
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.dto.UnitProjLimitDTO;
import com.yiboshi.science.param.query.ComUnitQueryVO;
......@@ -201,7 +200,6 @@ public class ComUnitController extends BaseController<ComUnitService, ComUnitQue
@GetMapping
@RequestMapping("/processRemoteInfo")
public ResponseDataModel<Map<String, Object>> processRemoteInfo(String id) {
comUnitService.getUnitFromRemoteServer();
comPersonService.getUserFromRemoteServer();
ComUnitDTO ComUnit = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
Map<String, Object> info = new HashMap<String, Object>(2) {
......@@ -213,34 +211,6 @@ public class ComUnitController extends BaseController<ComUnitService, ComUnitQue
return ResponseDataModel.ok(info);
}
@ApiOperation(value = "获取单位项目申报名额配比", httpMethod = "GET", notes = "获取单位项目申报名额配比")
@GetMapping
@RequestMapping("/getUnitProjLimit")
public ResponseDataModel<List<UnitProjLimitDTO>> getUnitProjLimit(int queryType) {
List<ComUnit> list = comUnitService.getUnitProjLimit(queryType);
List<UnitProjLimitDTO> limitList = new ArrayList<>();
if (null != list) {
list.forEach((f) -> {
UnitProjLimitDTO unit = new UnitProjLimitDTO();
unit.setId(f.getId());
unit.setTreeCode(f.getTreeCode());
unit.setUnitType(f.getUnitType());
unit.setUnitName(f.getUnitName());
unit.setProjLimit(f.getProjLimit());
limitList.add(unit);
});
}
return ResponseDataModel.ok(limitList);
}
@ApiOperation(value = "更新单位项目申报配比数量", httpMethod = "PUT", notes = "更新单位项目申报配比数量", consumes = MediaType.APPLICATION_JSON_VALUE)
@PutMapping(value = "/updateUnitProjLimit")
public ResponseDataModel<String> updateUnitProjLimit(@RequestBody List<UnitProjLimitDTO> list) {
if (comUnitService.updateUnitProjLimit(list))
return ResponseDataModel.ok("单位项目申报名额配比更新成功！");
else
return ResponseDataModel.ok("单位项目申报名额配比更新失败！");
}
@ApiOperation(value = "获取当前操作人员的单位信息", httpMethod = "GET", notes = "获取当前操作人员的单位信息")
@GetMapping
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/SystemMenuController.java
View file @ 1a47cb16
......@@ -2,11 +2,9 @@ package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.entity.SystemMenu;
import com.yiboshi.science.param.dto.MenuTreeDTO;
import com.yiboshi.science.param.dto.SystemMenuDTO;
import com.yiboshi.science.param.dto.UserMenuDTO;
import com.yiboshi.science.param.query.SystemMenuQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.SystemMenuService;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/SystemParameterController.java
View file @ 1a47cb16
......@@ -6,9 +6,7 @@ import com.yiboshi.science.config.annotation.Anonymous;
import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameter;
import com.yiboshi.science.entity.SystemParameterType;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComProjectDTO;
import com.yiboshi.science.param.dto.SystemParameterDTO;
import com.yiboshi.science.param.query.SystemParameterQueryVO;
import com.yiboshi.science.rest.BaseController;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/SystemParameterTypeController.java
View file @ 1a47cb16
......@@ -6,7 +6,6 @@ import com.yiboshi.science.config.annotation.Logs;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameterType;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.SystemParameterDTO;
import com.yiboshi.science.param.dto.SystemParameterTypeDTO;
import com.yiboshi.science.param.query.SystemParameterTypeQueryVO;
import com.yiboshi.science.rest.BaseController;
......
science-admin/src/main/java/com/yiboshi/science/rest/v1/SystemSetController.java
View file @ 1a47cb16
package com.yiboshi.science.rest.v1;
import com.yiboshi.arch.base.ResponseDataModel;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.config.security.loginUser;
import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.entity.SystemSet;
import com.yiboshi.science.param.dto.SystemSetDTO;
import com.yiboshi.science.param.query.SystemSetQueryVO;
import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.SystemSetService;
import com.yiboshi.science.utils.StringUtil;
import com.yiboshi.science.utils.SystemSetKey;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -18,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
/**
* 功能：配置表 接口
......
science-admin/src/main/java/com/yiboshi/science/service/ComConclusionFundsService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.entity.ComProjectConclusion;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComConclusionResearchersService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComConclusionThesisService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComDownloadService.java
View file @ 1a47cb16
......@@ -5,8 +5,6 @@ import com.yiboshi.science.param.dto.ComDownloadDTO;
import com.yiboshi.science.param.query.ComDownloadQueryVO;
import org.springframework.web.multipart.MultipartFile;
import java.math.BigInteger;
/**
* 附件表 Service
*
......
science-admin/src/main/java/com/yiboshi/science/service/ComEvaluationValueService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationValue;
import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/service/ComExpertService.java
View file @ 1a47cb16
......@@ -4,7 +4,6 @@ import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComExpert;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.query.ComExpertQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComExpertSpecService.java
View file @ 1a47cb16
......@@ -3,7 +3,6 @@ package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComExpertSpec;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.param.dto.ComExpertDTO;
import com.yiboshi.science.param.dto.ComExpertSpecDTO;
import com.yiboshi.science.param.query.ComExpertSpecQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/service/ComNoticeService.java
View file @ 1a47cb16
......@@ -3,11 +3,8 @@ package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComNotice;
import com.yiboshi.science.param.dto.ComNoticeDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
import com.yiboshi.science.param.query.ComNoticeQueryVO;
import java.util.List;
/**
* 通知公告表 Service
*
......
science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java
View file @ 1a47cb16
......@@ -7,8 +7,6 @@ import com.yiboshi.science.param.dto.ComPersonDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
import com.yiboshi.science.param.dto.UserImportDTO;
import com.yiboshi.science.param.query.ComPersonQueryVO;
import com.yiboshi.science.param.query.ComUnitQueryVO;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.IOException;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectBasicService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComEvaluationNote;
import com.yiboshi.science.entity.ComProjectBasic;
import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
import com.yiboshi.science.param.dto.ComProjectBasicDTO;
import com.yiboshi.science.param.dto.ComProjectDTO;
import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
import com.yiboshi.science.param.query.ComProjectBasicQueryVO;
/**
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectConclusionMaterialService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectAudit;
import com.yiboshi.science.entity.ComProjectConclusionMaterial;
import com.yiboshi.science.param.dto.ComProjectConclusionAuditDTO;
import com.yiboshi.science.param.dto.ComProjectConclusionMaterialDTO;
import com.yiboshi.science.param.query.ComProjectConclusionMaterialQueryVO;
import java.util.List;
public interface ComProjectConclusionMaterialService extends BaseService<ComProjectConclusionMaterialQueryVO, ComProjectConclusionMaterialDTO, ComProjectConclusionMaterial> {
ComProjectConclusionAuditDTO getConclusionMaterialList(String ProjectID);
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
View file @ 1a47cb16
......@@ -18,7 +18,7 @@ public interface ComProjectCooperativeUnitsService extends BaseService<ComProjec
* @param objectId
* @return
*/
List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId);
List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId, int type);
/** 删除对象列表
*
* @param objectId
......@@ -29,5 +29,5 @@ public interface ComProjectCooperativeUnitsService extends BaseService<ComProjec
* @param list
* @param objectId
*/
void insertList(List<ComProjectCooperativeUnitsDTO> list, String objectId);
void insertList(List<ComProjectCooperativeUnitsDTO> list, String objectId, int type);
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/service/ComProjectFundCompositionService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectBudget;
import com.yiboshi.science.entity.ComProjectFundComposition;
import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
import com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO;
import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectFundPlanService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectFundComposition;
import com.yiboshi.science.entity.ComProjectFundPlan;
import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectGroupService.java
View file @ 1a47cb16
......@@ -2,7 +2,6 @@ package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.entity.ComProject;
import com.yiboshi.science.entity.ComProjectGroup;
import com.yiboshi.science.param.dto.ComProjectGroupDTO;
import com.yiboshi.science.param.dto.ComProjectKnowledgeStatisticDTO;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectKpitDetailService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectKpit;
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.param.query.ComProjectKpitQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectManagementRuleService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.entity.ComProjectManagementRule;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.dto.ComProjectManagementRuleDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.param.query.ComProjectManagementRuleQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectResearchService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectResearch;
import com.yiboshi.science.param.dto.ComProjectManagementRuleDTO;
import com.yiboshi.science.param.dto.ComProjectResearchDTO;
import com.yiboshi.science.param.query.ComProjectResearchQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
View file @ 1a47cb16
......@@ -103,7 +103,6 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
*/
void updateAssignState(String id, Integer assignState, Integer completed, BigDecimal totalScore,BigDecimal averageScore);
boolean determineProjectReportCountLimit(String auditObjectId);
DataStatisticsDTO getProjectReportCountByGov(String treeCode);
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectSubService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComFile;
import com.yiboshi.science.entity.ComProjectSub;
import com.yiboshi.science.param.dto.ComFileDTO;
import com.yiboshi.science.param.dto.ComProjectSubDTO;
import com.yiboshi.science.param.query.ComFileQueryVO;
import com.yiboshi.science.param.query.ComProjectSubQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectTaskService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComDownload;
import com.yiboshi.science.entity.ComProjectAudit;
import com.yiboshi.science.entity.ComProjectTask;
import com.yiboshi.science.param.dto.ComDownloadDTO;
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectUnitPaymentService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComProjectFundPlan;
import com.yiboshi.science.entity.ComProjectUnitPayment;
import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/service/ComSendingRecordService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.entity.ComSendingRecord;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.dto.ComSendingRecordDTO;
import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
import com.yiboshi.science.param.query.ComSendingRecordQueryVO;
/**
......
science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.ComPerson;
import com.yiboshi.science.entity.ComUnit;
import com.yiboshi.science.param.dto.ComUnitDTO;
import com.yiboshi.science.param.dto.DataStatisticsDTO;
......@@ -86,11 +85,6 @@ public interface ComUnitService extends BaseService<ComUnitQueryVO, ComUnitDTO,
*/
String deleteUnit(String Id);
/** 获取单位
*
*/
//
void getUnitFromRemoteServer();
/**
* 保存/修改单位
......@@ -99,19 +93,7 @@ public interface ComUnitService extends BaseService<ComUnitQueryVO, ComUnitDTO,
*/
String updateUnitState(ComUnitDTO unit);
/**
* 获取单位项目申报名额配比
* @param queryType 1:省直属单位名额配比 2:州市行政单位
* @return
*/
List<ComUnit> getUnitProjLimit(int queryType);
/**
* 更新单位项目申报配比数量
* @param list
* @return
*/
boolean updateUnitProjLimit(List<UnitProjLimitDTO> list);
/**
* 判断单位是否存在
......
science-admin/src/main/java/com/yiboshi/science/service/SystemParameterTypeService.java
View file @ 1a47cb16
package com.yiboshi.science.service;
import com.yiboshi.science.base.BaseService;
import com.yiboshi.science.entity.SelectListItem;
import com.yiboshi.science.entity.SystemParameterType;
import com.yiboshi.science.param.dto.SystemParameterDTO;
import com.yiboshi.science.param.dto.SystemParameterTypeDTO;
import com.yiboshi.science.param.query.SystemParameterTypeQueryVO;
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComConclusionFundsServiceImpl.java
View file @ 1a47cb16
......@@ -6,18 +6,13 @@ import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.dao.ComConclusionFundsDAO;
import com.yiboshi.science.entity.ComConclusionFunds;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.entity.ComProjectMembers;
import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
import com.yiboshi.science.service.ComConclusionFundsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* 结题经费记录表 Service 实现类
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComConclusionResearchersServiceImpl.java
View file @ 1a47cb16
......@@ -6,11 +6,7 @@ import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.dao.ComConclusionResearchersDAO;
import com.yiboshi.science.entity.ComConclusionResearchers;
import com.yiboshi.science.entity.ComConclusionThesis;
import com.yiboshi.science.entity.ComProjectMembers;
import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
import com.yiboshi.science.param.dto.ComProjectMembersDTO;
import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
import com.yiboshi.science.service.ComConclusionResearchersService;
import org.springframework.beans.factory.annotation.Autowired;
......
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