77

science-admin/src/main/java/com/yiboshi/science/config/aspect/LogAspect.java

 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

 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

@@ -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

@@ -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

@@ -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

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

 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

@@ -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

@@ -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/ComProjectFundCompositionDAO.java

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/ComPerson.java

@@ -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")

science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java

@@ -138,6 +138,10 @@ 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 )

science-admin/src/main/java/com/yiboshi/science/entity/ComUnit.java

@@ -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/ComPersonDTO.java

@@ -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;

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java

@@ -137,6 +137,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/ComProjectDTO.java

@@ -207,6 +207,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 +335,23 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "注册单位类型", position = 12)
     @Length(max=100, message = "注册单位类型不能大于100")
     private String unitTypeName;
+    /** 项目联系人姓名 */
+    @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 = 41)
     private String projStateName;

science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java

@@ -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/ComPersonQueryVO.java

@@ -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;

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java

@@ -136,6 +136,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/ComUnitQueryVO.java

@@ -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

 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

@@ -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

@@ -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

 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

@@ -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

@@ -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

@@ -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

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertGroupController.java

@@ -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

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

 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

 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

@@ -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

@@ -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

@@ -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

 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

 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

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

 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

 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

 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

 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

@@ -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

 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

@@ -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

@@ -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

@@ -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

@@ -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

 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

 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/ComProjectFundCompositionService.java

 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

 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

@@ -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

 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

 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

 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

@@ -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

 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

 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

 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

 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

 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

 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

@@ -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

@@ -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;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComConclusionThesisServiceImpl.java

@@ -6,9 +6,7 @@ import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.dao.ComConclusionThesisDAO;
 import com.yiboshi.science.entity.ComConclusionThesis;
-import com.yiboshi.science.entity.ComProjectMembers;
 import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
-import com.yiboshi.science.param.dto.ComProjectMembersDTO;
 import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
 import com.yiboshi.science.service.ComConclusionThesisService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +15,6 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Objects;
 
-import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
-
 /**
  * 结题论文记录表 Service 实现类
  *

science-admin/src/main/java/com/yiboshi/science/service/impl/ComDownloadServiceImpl.java

@@ -18,7 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.math.BigInteger;
 import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.Objects;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationItemServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComEvaluationItemDAO;
 import com.yiboshi.science.entity.ComEvaluationItem;
-import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
 import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
 import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationStandardServiceImpl.java

@@ -18,7 +18,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComEvaluationValueServiceImpl.java

@@ -3,7 +3,6 @@ package com.yiboshi.science.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComEvaluationValueDAO;
-import com.yiboshi.science.entity.ComEvaluationItem;
 import com.yiboshi.science.entity.ComEvaluationValue;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
 import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertGroupServiceImpl.java

@@ -8,7 +8,6 @@ import com.yiboshi.science.dao.ComExpertGroupDAO;
 import com.yiboshi.science.entity.ComExpertGroup;
 import com.yiboshi.science.param.dto.ComExpertGroupDTO;
 import com.yiboshi.science.param.query.ComExpertGroupQueryVO;
-import com.yiboshi.science.param.query.ComPersonQueryVO;
 import com.yiboshi.science.service.ComExpertGroupMembersService;
 import com.yiboshi.science.service.ComExpertGroupService;
 import lombok.AllArgsConstructor;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertServiceImpl.java

@@ -9,7 +9,6 @@ import com.yiboshi.science.dao.ComExpertDAO;
 import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComExpertDTO;
-import com.yiboshi.science.param.dto.ComPersonDTO;
 import com.yiboshi.science.param.query.ComExpertQueryVO;
 import com.yiboshi.science.service.*;
 import com.yiboshi.science.utils.ChineseToPinyin;
@@ -22,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.yiboshi.science.utils.StringUtil.hideAllPhoneNum;
 import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
 
 @Service

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertSpecServiceImpl.java

@@ -11,7 +11,6 @@ import com.yiboshi.science.param.dto.ComExpertSpecDTO;
 import com.yiboshi.science.param.query.ComExpertSpecQueryVO;
 import com.yiboshi.science.service.ComExpertSpecService;
 import com.yiboshi.science.utils.AgeUtil;
-import com.yiboshi.science.utils.StringUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComFileServiceImpl.java

@@ -4,7 +4,6 @@ package com.yiboshi.science.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComFileDAO;
-import com.yiboshi.science.entity.ComConclusionResearchers;
 import com.yiboshi.science.entity.ComFile;
 import com.yiboshi.science.param.dto.ComFileDTO;
 import com.yiboshi.science.param.query.ComFileQueryVO;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComNoticeServiceImpl.java

@@ -2,15 +2,11 @@ package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.dao.ComNoticeDAO;
 import com.yiboshi.science.entity.ComNotice;
-import com.yiboshi.science.entity.ComProjectConclusion;
-import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComNoticeDTO;
-import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
 import com.yiboshi.science.param.query.ComNoticeQueryVO;
 import com.yiboshi.science.service.ComNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java

@@ -10,9 +10,9 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.bean.SystemProperties;
 import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComPersonDAO;
-import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
+import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.param.query.ComPersonQueryVO;
 import com.yiboshi.science.service.ComPersonService;
 import com.yiboshi.science.service.ComSendingRecordService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditNoteServiceImpl.java

@@ -2,15 +2,12 @@ package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComProjectAuditNoteDAO;
-import com.yiboshi.science.entity.ComProjectAudit;
 import com.yiboshi.science.entity.ComProjectAuditNote;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComProjectAuditNoteDTO;
 import com.yiboshi.science.param.query.ComProjectAuditNoteQueryVO;
 import com.yiboshi.science.service.ComProjectAuditNoteService;
-import com.yiboshi.science.service.ComProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -8,7 +8,6 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.bean.SystemProperties;
 import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComProjectAuditDAO;
-import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.entity.ComProjectAuditNote;
 import com.yiboshi.science.entity.ComProjectAudit;
 import com.yiboshi.science.enumeration.CommonEnum;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectBasicServiceImpl.java

 package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.dao.ComEvaluationNoteDAO;
 import com.yiboshi.science.dao.ComProjectBasicDAO;
-import com.yiboshi.science.entity.ComEvaluationNote;
-import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.entity.ComProjectBasic;
-import com.yiboshi.science.entity.ComProjectFundComposition;
-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;
-import com.yiboshi.science.service.ComEvaluationNoteService;
 import com.yiboshi.science.service.ComProjectBasicService;
 import com.yiboshi.science.utils.StringUtil;
 import lombok.AllArgsConstructor;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectBudgetServiceImpl.java

@@ -6,7 +6,6 @@ import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectBudgetDAO;
 import com.yiboshi.science.entity.ComProjectBudget;
 import com.yiboshi.science.entity.SystemParameter;
-import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
 import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
 import com.yiboshi.science.service.ComProjectBudgetService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCheckServiceImpl.java

@@ -10,7 +10,6 @@ import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComProjectAuditNoteDTO;
 import com.yiboshi.science.param.dto.ComProjectCheckDTO;
-import com.yiboshi.science.param.dto.ComProjectResultsDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
 import com.yiboshi.science.param.query.ComProjectCheckQueryVO;
 import com.yiboshi.science.service.*;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java

@@ -9,9 +9,11 @@ import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComProjectConclusionDAO;
-import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
+import com.yiboshi.science.entity.ComProject;
+import com.yiboshi.science.entity.ComProjectAudit;
+import com.yiboshi.science.entity.ComProjectConclusion;
 import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
 import com.yiboshi.science.service.*;
 import com.yiboshi.science.utils.DateUtils;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java

@@ -4,9 +4,7 @@ package com.yiboshi.science.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectCooperativeUnitsDAO;
-import com.yiboshi.science.entity.ComProjectBudget;
 import com.yiboshi.science.entity.ComProjectCooperativeUnits;
-import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
 import com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO;
 import com.yiboshi.science.param.query.ComProjectCooperativeUnitsQueryVO;
 import com.yiboshi.science.service.ComProjectCooperativeUnitsService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectEquipmentServiceImpl.java

@@ -8,8 +8,6 @@ import com.yiboshi.science.entity.ComProjectEquipment;
 import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
 import com.yiboshi.science.param.query.ComProjectEquipmentQueryVO;
 import com.yiboshi.science.service.ComProjectEquipmentService;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectFundCompositionServiceImpl.java

 package com.yiboshi.science.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.dao.ComEvaluationNoteDAO;
 import com.yiboshi.science.dao.ComProjectFundCompositionDAO;
-import com.yiboshi.science.entity.*;
-import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
-import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
 import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
-import com.yiboshi.science.param.dto.ComProjectStageGoalDTO;
-import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
+import com.yiboshi.science.entity.ComProjectFundComposition;
 import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
-import com.yiboshi.science.service.ComEvaluationNoteService;
 import com.yiboshi.science.service.ComProjectFundCompositionService;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectFundPlanServiceImpl.java

@@ -7,7 +7,6 @@ import com.yiboshi.science.dao.ComProjectFundPlanDAO;
 import com.yiboshi.science.entity.ComProjectFundPlan;
 
 import com.yiboshi.science.entity.SystemParameter;
-import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
 import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
 import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
 import com.yiboshi.science.service.ComProjectFundPlanService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectGroupAssignServiceImpl.java

 package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectGroupAssignDAO;
-import com.yiboshi.science.entity.ComProjectAssign;
 import com.yiboshi.science.entity.ComProjectGroupAssign;
 import com.yiboshi.science.param.dto.ComExpertSpecDTO;
 import com.yiboshi.science.param.dto.ComProjectAssignDTO;
 import com.yiboshi.science.param.dto.ComProjectGroupAssignDTO;
 import com.yiboshi.science.param.query.ComProjectGroupAssignQueryVO;
 import com.yiboshi.science.service.ComExpertSpecService;
-import com.yiboshi.science.service.ComProjectAssignService;
 import com.yiboshi.science.service.ComProjectGroupAssignService;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Objects;
 
 @Service
 @AllArgsConstructor

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectGroupDetailServiceImpl.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
-import com.yiboshi.science.dao.ComProjectGroupDAO;
 import com.yiboshi.science.dao.ComProjectGroupDetailDAO;
-import com.yiboshi.science.entity.ComProjectGroup;
 import com.yiboshi.science.entity.ComProjectGroupDetail;
 import com.yiboshi.science.param.dto.ComProjectGroupDetailDTO;
 import com.yiboshi.science.param.query.ComProjectGroupDetailQueryVO;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitDetailServiceImpl.java

@@ -2,29 +2,17 @@ package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.dao.ComProjectKpitDAO;
 import com.yiboshi.science.dao.ComProjectKpitDetailDAO;
-import com.yiboshi.science.entity.ComProjectFundComposition;
-import com.yiboshi.science.entity.ComProjectFundPlan;
-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 com.yiboshi.science.service.ComProjectKpitDetailService;
-import com.yiboshi.science.service.ComProjectKpitService;
-import com.yiboshi.science.utils.RedisKey;
-import com.yiboshi.science.utils.RedisUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectKpitServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectKpitDAO;
 import com.yiboshi.science.entity.ComProjectKpit;
-import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.param.dto.ComProjectKpitDTO;
 import com.yiboshi.science.param.query.ComProjectKpitQueryVO;
 import com.yiboshi.science.service.ComProjectKpitService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectManagementRuleServiceImpl.java

@@ -3,21 +3,15 @@ package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.dao.ComFileDAO;
 import com.yiboshi.science.dao.ComProjectManagementRuleDAO;
-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.service.ComFileService;
 import com.yiboshi.science.service.ComProjectManagementRuleService;
 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/ComProjectMembersServiceImpl.java

@@ -14,8 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import static com.yiboshi.science.utils.StringUtil.hideAllIdCardNum;
-
 /**
  * 项目组成员表 Service 实现类
  *

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectResearchServiceImpl.java

@@ -2,11 +2,8 @@ package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.dao.ComProjectManagementRuleDAO;
 import com.yiboshi.science.dao.ComProjectResearchDAO;
-import com.yiboshi.science.entity.ComProjectManagementRule;
 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;
 import com.yiboshi.science.service.ComProjectResearchService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectResultsServiceImpl.java

@@ -3,11 +3,8 @@ package com.yiboshi.science.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectResultsDAO;
-import com.yiboshi.science.entity.ComProjectBudget;
 import com.yiboshi.science.entity.ComProjectResults;
-import com.yiboshi.science.entity.ComProjectStageGoal;
 import com.yiboshi.science.entity.SystemParameter;
-import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
 import com.yiboshi.science.param.dto.ComProjectResultsDTO;
 import com.yiboshi.science.param.query.ComProjectResultsQueryVO;
 import com.yiboshi.science.service.ComProjectResultsService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -8,9 +8,12 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.bean.SystemProperties;
 import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComProjectDAO;
-import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
+import com.yiboshi.science.entity.ComProject;
+import com.yiboshi.science.entity.ComProjectAudit;
+import com.yiboshi.science.entity.ComUnit;
+import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.param.query.ComProjectQueryVO;
 import com.yiboshi.science.service.*;
 import com.yiboshi.science.utils.*;
@@ -253,8 +256,27 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         if (null != comUnitDTO) {
             dto.setAppUnitName(comUnitDTO.getUnitName());
             dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-            dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
             dto.setAddress(comUnitDTO.getUnitAddress());
+
+            dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
+            dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
+            dto.setPostCode(comUnitDTO.getPostCode());
+
+            dto.setUnitLinkName(comUnitDTO.getLinkName());
+            dto.setUnitLinkMobile(comUnitDTO.getTelephone());
+            dto.setUnitLinkEmail(comUnitDTO.getEmail());
+            dto.setUnitLinkFax(comUnitDTO.getFax());
+
+            dto.setLegalPerson(comUnitDTO.getLegalPerson());
+            dto.setWorkforce(comUnitDTO.getWorkforce());
+            dto.setSpecializedPersonnel(comUnitDTO.getSpecializedPersonnel());
+            dto.setResearchPersonnel(comUnitDTO.getResearchPersonnel());
+
+            dto.setDepositBank(comUnitDTO.getDepositBank());
+            dto.setBankAccount(comUnitDTO.getBankAccount());
+            dto.setDepositBankAddress(comUnitDTO.getDepositBankAddress());
+            dto.setInterbankNumber(comUnitDTO.getInterbankNumber());
+
         }
         //经费表
         List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
@@ -897,29 +919,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         return date.format(nowTime);
     }
 
-    /**
-     * 判断项目上报数量限制 true可以继续上报，false已经到达上限不能上报
-     *
-     * @param id
-     * @return
-     */
-    public boolean determineProjectReportCountLimit(String id) {
-        ComProjectAudit reportEntity = comProjectAuditService.getById(id);
-        ComUnit unitEntity = comUnitService.getById(reportEntity.getAuditUnitId());
-        //州市級行政單位
-        if (unitEntity.getUnitType().equals(0) && unitEntity.getTreeCode().length() == properties.getDefaultCodeLength() * 2) {
-            DataStatisticsDTO dto = comProjectDAO.getProjectReportCountByGov(unitEntity.getTreeCode());
-            if (null != unitEntity.getProjLimit() && dto.getCount1() >= unitEntity.getProjLimit())
-                return false;
-        }
-        //省直属医疗机构
-        if (!unitEntity.getUnitType().equals(0) && unitEntity.getTreeCode().length() == properties.getDefaultCodeLength() * 2) {
-            DataStatisticsDTO dto = comProjectDAO.getProjectReportCountByUnitId(unitEntity.getId());
-            if (null != unitEntity.getProjLimit() && dto.getCount1() >= unitEntity.getProjLimit())
-                return false;
-        }
-        return true;
-    }
 
     public DataStatisticsDTO getProjectReportCountByGov(String treeCode) {
         return comProjectDAO.getProjectReportCountByGov(treeCode);

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectStageGoalServiceImpl.java

@@ -3,10 +3,7 @@ package com.yiboshi.science.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectStageGoalDAO;
-import com.yiboshi.science.entity.ComProjectBudget;
-import com.yiboshi.science.entity.ComProjectCooperativeUnits;
 import com.yiboshi.science.entity.ComProjectStageGoal;
-import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
 import com.yiboshi.science.param.dto.ComProjectStageGoalDTO;
 import com.yiboshi.science.param.query.ComProjectStageGoalQueryVO;
 import com.yiboshi.science.service.ComProjectStageGoalService;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectSubServiceImpl.java

@@ -3,21 +3,15 @@ package com.yiboshi.science.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
-import com.yiboshi.science.dao.ComFileDAO;
 import com.yiboshi.science.dao.ComProjectSubDAO;
-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.service.ComFileService;
 import com.yiboshi.science.service.ComProjectSubService;
 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/ComProjectTaskServiceImpl.java

@@ -174,10 +174,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
         ComUnitDTO comUnit = comUnitService.getUnitById(comProject.getAppUnitId());
         if (null != comUnit) {
             test.setAppUnitName(comUnit.getUnitName());
-            test.setLinkEmail(comUnit.getLinkEmail());
-            test.setLinkTel(comUnit.getLinkTel());
-            test.setLinkAddress(comUnit.getUnitAddress());
-            test.setPostcode(comUnit.getPostcode());
+
             test.setAuthority(comUnit.getUpUnitName());
         }
         //项目组成员

science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java

@@ -14,14 +14,12 @@ import com.yiboshi.science.entity.ComPerson;
 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.ComUnitQueryVO;
 import com.yiboshi.science.service.*;
 import com.yiboshi.science.utils.RedisKey;
 import com.yiboshi.science.utils.RedisUtils;
 import com.yiboshi.yac.model.OrgInfo;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -143,27 +141,6 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
         return dto;
     }
 
-    public List<ComUnit> getUnitProjLimit(int queryType) {
-        List<ComUnit> list = this.entityList(new ComUnit());
-        if (queryType == 1) {
-            list = list.stream().filter(e -> e.getUnitType().equals(0) && e.getTreeCode().length() == properties.getDefaultCodeLength() * 2).collect(Collectors.toList());
-        } else {
-            list = list.stream().filter(e -> !e.getUnitType().equals(0) && e.getTreeCode().length() == properties.getDefaultCodeLength() * 2 && e.getProvinceSubjection().equals(1)).collect(Collectors.toList());
-        }
-        return list;
-    }
-
-    public boolean updateUnitProjLimit(List<UnitProjLimitDTO> list) {
-        list.forEach(f -> {
-            ComUnit unit = new ComUnit();
-            unit.setId(f.getId());
-            unit.setProjLimit(f.getProjLimit());
-            comUnitDAO.updateById(unit);
-        });
-
-        return true;
-    }
-
     @Override
     protected void setCriteriaOrder(QueryWrapper<ComUnit> wrapper) {
         wrapper.orderByAsc("unit_type");
@@ -433,49 +410,7 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
         return new ComUnit();
     }
 
-    @Override
-    public void getUnitFromRemoteServer() {
-        OrgInfo orgInfo = apiHttpRequest.remoteUnitInfo();
-        if (null != orgInfo) {
-            ComUnit unit = this.getUnitInfoByLongId(orgInfo.getId());
-            if (null == unit) {
-                unit = new ComUnit();
-                unit.setId(orgInfo.getId().toString());
-                unit.setLongId(orgInfo.getId());
-                unit.setParentId(orgInfo.getParentId());
-                unit.setUnitName(orgInfo.getUnitName());
-                unit.setTreeCode(orgInfo.getTreeCode());
-                unit.setCreated(new Date());
-                this.save(unit);
-            } else {
-                if (!unit.getUnitName().equals(orgInfo.getUnitName())) {
-                    unit.setUnitName(orgInfo.getUnitName());
-                    this.update(unit);
-                }
-                if (null == unit.getParentId()) {
-                    unit.setParentId(orgInfo.getParentId());
-                    this.update(unit);
-                }
-            }
-            if (null != orgInfo.getParentId()) {
-                ComUnit parentUnit = this.getUnitInfoByLongId(orgInfo.getParentId());
-                if (null == parentUnit) {
-                    OrgInfo patent = apiHttpRequest.remoteParentUnit(orgInfo.getParentId().toString());
-                    if (null != patent) {
-                        unit = new ComUnit();
-                        unit.setId(patent.getId().toString());
-                        unit.setLongId(patent.getId());
-                        unit.setParentId(patent.getParentId());
-                        unit.setUnitName(patent.getUnitName());
-                        unit.setTreeCode(orgInfo.getTreeCode().substring(0, orgInfo.getTreeCode().length() - properties.getDefaultCodeLength()));
-                        unit.setCreated(new Date());
-                        this.save(unit);
-                    }
-                }
-            }
-            refreshRedis();
-        }
-    }
+
 
     /**
      * 刷新Redis单位信息

science-admin/src/main/java/com/yiboshi/science/service/impl/LogsLoginServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
-import com.yiboshi.science.config.security.SecurityUser;
 import com.yiboshi.science.dao.LogsLoginDAO;
 import com.yiboshi.science.entity.LogsLogin;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
@@ -13,10 +12,6 @@ import com.yiboshi.science.param.query.LogsLoginQueryVO;
 import com.yiboshi.science.service.LogsLoginService;
 import com.yiboshi.science.utils.CustomerIPAddress;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemMenuServiceImpl.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
-import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.SystemMenuDAO;
 import com.yiboshi.science.entity.SystemMenu;
-import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.MenuTreeDTO;
 import com.yiboshi.science.param.dto.Slots;
 import com.yiboshi.science.param.dto.SystemMenuDTO;

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemParameterTypeServiceImpl.java

@@ -7,10 +7,7 @@ import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.dao.SystemParameterTypeDAO;
-import com.yiboshi.science.entity.SelectListItem;
-import com.yiboshi.science.entity.SystemParameter;
 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;
 import com.yiboshi.science.service.SystemParameterTypeService;
@@ -20,7 +17,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemRoleServiceImpl.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.dao.SystemRoleDAO;
-import com.yiboshi.science.entity.SystemMenu;
-import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.entity.SystemRole;
-import com.yiboshi.science.param.dto.SystemMenuDTO;
 import com.yiboshi.science.param.dto.SystemRoleDTO;
 import com.yiboshi.science.param.query.SystemRoleQueryVO;
 import com.yiboshi.science.service.SystemRoleService;
@@ -18,7 +15,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

science-admin/src/main/java/com/yiboshi/science/service/impl/SystemSetServiceImpl.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.SystemSetDAO;
-import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.entity.SystemSet;
-import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.SystemSetDTO;
 import com.yiboshi.science.param.query.SystemSetQueryVO;
 import com.yiboshi.science.service.SystemSetService;

science-admin/src/main/java/com/yiboshi/science/utils/ExcelUtils.java

@@ -3,19 +3,14 @@ package com.yiboshi.science.utils;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.yiboshi.science.entity.ComDownload;
-import com.yiboshi.science.entity.ComFile;
 import com.yiboshi.science.param.dto.ProjectImportDTO;
 import com.yiboshi.science.param.dto.UserImportDTO;
-import com.yiboshi.science.service.ComDownloadService;
-import com.yiboshi.science.service.ComFileService;
 import com.yiboshi.science.service.SystemSetService;
 import lombok.Cleanup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.*;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;