111

.gitignore

@@ -80,7 +80,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/dao/ComManagerDAO.class
 /science-admin/target/classes/com/yiboshi/science/dao/ComNoticeDAO.class
 /science-admin/target/classes/com/yiboshi/science/dao/ComPersonDAO.class
-/science-admin/target/classes/com/yiboshi/science/dao/ComProjcetResearchDAO.class
+/science-admin/target/classes/com/yiboshi/science/dao/ComProjectResearchDAO.class
 /science-admin/target/classes/com/yiboshi/science/dao/ComProjectAssignDAO.class
 /science-admin/target/classes/com/yiboshi/science/dao/ComProjectAuditDAO.class
 /science-admin/target/classes/com/yiboshi/science/dao/ComProjectAuditNoteDAO.class
@@ -138,7 +138,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/entity/ComManager.class
 /science-admin/target/classes/com/yiboshi/science/entity/ComNotice.class
 /science-admin/target/classes/com/yiboshi/science/entity/ComPerson.class
-/science-admin/target/classes/com/yiboshi/science/entity/ComProjcetResearch.class
+/science-admin/target/classes/com/yiboshi/science/entity/ComProjectResearch.class
 /science-admin/target/classes/com/yiboshi/science/entity/ComProject.class
 /science-admin/target/classes/com/yiboshi/science/entity/ComProjectAssign.class
 /science-admin/target/classes/com/yiboshi/science/entity/ComProjectAudit.class
@@ -219,7 +219,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/param/dto/ComManagerDTO.class
 /science-admin/target/classes/com/yiboshi/science/param/dto/ComNoticeDTO.class
 /science-admin/target/classes/com/yiboshi/science/param/dto/ComPersonDTO.class
-/science-admin/target/classes/com/yiboshi/science/param/dto/ComProjcetResearchDTO.class
+/science-admin/target/classes/com/yiboshi/science/param/dto/ComProjectResearchDTO.class
 /science-admin/target/classes/com/yiboshi/science/param/dto/ComProjectAssignDTO.class
 /science-admin/target/classes/com/yiboshi/science/param/dto/ComProjectAuditDTO.class
 /science-admin/target/classes/com/yiboshi/science/param/dto/ComProjectAuditNoteDTO.class
@@ -294,7 +294,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/param/query/ComManagerQueryVO.class
 /science-admin/target/classes/com/yiboshi/science/param/query/ComNoticeQueryVO.class
 /science-admin/target/classes/com/yiboshi/science/param/query/ComPersonQueryVO.class
-/science-admin/target/classes/com/yiboshi/science/param/query/ComProjcetResearchQueryVO.class
+/science-admin/target/classes/com/yiboshi/science/param/query/ComProjectResearchQueryVO.class
 /science-admin/target/classes/com/yiboshi/science/param/query/ComProjectAssignQueryVO.class
 /science-admin/target/classes/com/yiboshi/science/param/query/ComProjectAuditNoteQueryVO.class
 /science-admin/target/classes/com/yiboshi/science/param/query/ComProjectAuditQueryVO.class
@@ -356,7 +356,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/rest/v1/ComNoticeController.class
 /science-admin/target/classes/com/yiboshi/science/rest/v1/ComPersonController$1.class
 /science-admin/target/classes/com/yiboshi/science/rest/v1/ComPersonController.class
-/science-admin/target/classes/com/yiboshi/science/rest/v1/ComProjcetResearchController.class
+/science-admin/target/classes/com/yiboshi/science/rest/v1/ComProjectResearchController.class
 /science-admin/target/classes/com/yiboshi/science/rest/v1/ComProjectAssignController.class
 /science-admin/target/classes/com/yiboshi/science/rest/v1/ComProjectAuditController.class
 /science-admin/target/classes/com/yiboshi/science/rest/v1/ComProjectAuditNoteController.class
@@ -417,7 +417,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/service/ComManagerService.class
 /science-admin/target/classes/com/yiboshi/science/service/ComNoticeService.class
 /science-admin/target/classes/com/yiboshi/science/service/ComPersonService.class
-/science-admin/target/classes/com/yiboshi/science/service/ComProjcetResearchService.class
+/science-admin/target/classes/com/yiboshi/science/service/ComProjectResearchService.class
 /science-admin/target/classes/com/yiboshi/science/service/ComProjectAssignService.class
 /science-admin/target/classes/com/yiboshi/science/service/ComProjectAuditNoteService.class
 /science-admin/target/classes/com/yiboshi/science/service/ComProjectAuditService.class
@@ -474,7 +474,7 @@ bin/
 /science-admin/target/classes/com/yiboshi/science/service/impl/ComManagerServiceImpl.class
 /science-admin/target/classes/com/yiboshi/science/service/impl/ComNoticeServiceImpl.class
 /science-admin/target/classes/com/yiboshi/science/service/impl/ComPersonServiceImpl.class
-/science-admin/target/classes/com/yiboshi/science/service/impl/ComProjcetResearchServiceImpl.class
+/science-admin/target/classes/com/yiboshi/science/service/impl/ComProjectResearchServiceImpl.class
 /science-admin/target/classes/com/yiboshi/science/service/impl/ComProjectAssignServiceImpl.class
 /science-admin/target/classes/com/yiboshi/science/service/impl/ComProjectAuditNoteServiceImpl.class
 /science-admin/target/classes/com/yiboshi/science/service/impl/ComProjectBudgetServiceImpl.class
@@ -539,7 +539,7 @@ bin/
 /science-admin/target/classes/mapper/ComManagerDAO.xml
 /science-admin/target/classes/mapper/ComNoticeDAO.xml
 /science-admin/target/classes/mapper/ComPersonDAO.xml
-/science-admin/target/classes/mapper/ComProjcetResearchDAO.xml
+/science-admin/target/classes/mapper/ComProjectResearchDAO.xml
 /science-admin/target/classes/mapper/ComProjectAssignDAO.xml
 /science-admin/target/classes/mapper/ComProjectAuditDAO.xml
 /science-admin/target/classes/mapper/ComProjectAuditNoteDAO.xml

science-admin/src/main/java/com/yiboshi/science/dao/ComProjcetResearchDAO.java → science-admin/src/main/java/com/yiboshi/science/dao/ComProjectResearchDAO.java

@@ -2,9 +2,12 @@ package com.yiboshi.science.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
-import com.yiboshi.science.entity.ComProjcetResearch;
-import com.yiboshi.science.param.dto.ComProjcetResearchDTO;
-import com.yiboshi.science.param.query.ComProjcetResearchQueryVO;
+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 java.util.List;
 
 /**
  * 项目申请书在研项目情况表 DAO
@@ -12,6 +15,6 @@ import com.yiboshi.science.param.query.ComProjcetResearchQueryVO;
  * @author lkl
  * @version 2021-08-26
  */
-public interface ComProjcetResearchDAO extends BaseMapper<ComProjcetResearch>, BaseDAO<ComProjcetResearchQueryVO, ComProjcetResearchDTO, ComProjcetResearch> {
-
+public interface ComProjectResearchDAO extends BaseMapper<ComProjectResearch>, BaseDAO<ComProjectResearchQueryVO, ComProjectResearchDTO, ComProjectResearch> {
+    List<ComProjectResearchDTO> getListByObjectId(String objectId);
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/entity/ComProjcetResearch.java → science-admin/src/main/java/com/yiboshi/science/entity/ComProjectResearch.java

@@ -18,35 +18,37 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper=true)
 @ApiModel(description = "项目申请书在研项目情况表VO")
-public class ComProjcetResearch extends BaseEntity {
-    /** 项目id */
+public class ComProjectResearch extends BaseEntity {
+    /** 项目id / */
     @ApiModelProperty(value = "项目id", position = 1 )
     @Length(max=36, message = "项目id不能大于36")
-    private String projId;
+    private String objectId;
     /** 项目编号 */
     @ApiModelProperty(value = "项目编号", position = 2 )
-    @Length(max=50, message = "项目编号不能大于50")
+    @Length(max=50, message = "项目编号不能大于100")
     private String projNo;
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 3 )
-    @Length(max=200, message = "项目名称不能大于200")
+    @Length(max=200, message = "项目名称不能大于100")
     private String projName;
-    /** 项目来源 */
-    @ApiModelProperty(value = "项目来源", position = 4 )
-    @Length(max=200, message = "项目来源不能大于200")
+    /** 批准单位 */
+    @ApiModelProperty(value = "批准单位", position = 4 )
+    @Length(max=200, message = "批准单位不能大于100")
     private String approveUnit;
     /** 负责人 */
     @ApiModelProperty(value = "负责人", position = 5 )
-    @Length(max=60, message = "负责人不能大于60")
-    private String headName;
-    /** 起止年限 */
+    @Length(max=60, message = "负责人不能大于100")
+    private String leader;
+    /** 起止年限（开始） */
     @ApiModelProperty(value = "起止年限", position = 6 )
-    private Integer ageLimit;
+    private Data startDate;
+    /** 起止年限（结束） */
+    @ApiModelProperty(value = "起止年限", position = 6 )
+    private Data endDate;
     /** 项目经费 */
     @ApiModelProperty(value = "项目经费", position = 7 )
-    private BigDecimal funding;
-    /** 与本项目关系 */
-    @ApiModelProperty(value = "与本项目关系", position = 8 )
-    @Length(max=200, message = "与本项目关系不能大于200")
-    private String relation;
+    private BigDecimal funds;
+    /** 排序 */
+    @ApiModelProperty(value = "排序", position = 10 )
+    private Integer showIndex;
 }
\ No newline at end of file

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

@@ -386,6 +386,8 @@ public class ComProjectDTO extends BaseDTO {
 
     /** 项目经费构成表   */
     private List<ComProjectFundCompositionDTO> fundCompositions;
+    /** 在研或完成基础研究项目情况 */
+    private List<ComProjectResearchDTO> researchList;
     /** 项目课颖设置表 */
     private List<ComProjectSubDTO> projectSubList;
     /** 单位科研项目及资金管理制度表 */

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjcetResearchDTO.java → science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectResearchDTO.java

 package com.yiboshi.science.param.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yiboshi.science.base.BaseDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 项目申请书在研项目情况表DTO
@@ -19,29 +18,37 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=true)
 @ApiModel(description = "项目申请书在研项目情况表DTO")
-public class ComProjcetResearchDTO extends BaseDTO {
-    /** 项目id */
-    @ApiModelProperty(value = "项目id", position = 1)
-    private String projId;
+public class ComProjectResearchDTO extends BaseDTO {
+    /** 项目id / */
+    @ApiModelProperty(value = "项目id", position = 1 )
+    @Length(max=36, message = "项目id不能大于36")
+    private String objectId;
     /** 项目编号 */
-    @ApiModelProperty(value = "项目编号", position = 2)
+    @ApiModelProperty(value = "项目编号", position = 2 )
+    @Length(max=50, message = "项目编号不能大于100")
     private String projNo;
     /** 项目名称 */
-    @ApiModelProperty(value = "项目名称", position = 3)
+    @ApiModelProperty(value = "项目名称", position = 3 )
+    @Length(max=200, message = "项目名称不能大于100")
     private String projName;
-    /** 项目来源 */
-    @ApiModelProperty(value = "项目来源", position = 4)
+    /** 批准单位 */
+    @ApiModelProperty(value = "批准单位", position = 4 )
+    @Length(max=200, message = "批准单位不能大于100")
     private String approveUnit;
     /** 负责人 */
-    @ApiModelProperty(value = "负责人", position = 5)
-    private String headName;
-    /** 起止年限 */
-    @ApiModelProperty(value = "起止年限", position = 6)
-    private Integer ageLimit;
+    @ApiModelProperty(value = "负责人", position = 5 )
+    @Length(max=60, message = "负责人不能大于100")
+    private String leader;
+    /** 起止年限（开始） */
+    @ApiModelProperty(value = "起止年限", position = 6 )
+    private Data startDate;
+    /** 起止年限（结束） */
+    @ApiModelProperty(value = "起止年限", position = 6 )
+    private Data endDate;
     /** 项目经费 */
-    @ApiModelProperty(value = "项目经费", position = 7)
-    private BigDecimal funding;
-    /** 与本项目关系 */
-    @ApiModelProperty(value = "与本项目关系", position = 8)
-    private String relation;
+    @ApiModelProperty(value = "项目经费", position = 7 )
+    private BigDecimal funds;
+    /** 排序 */
+    @ApiModelProperty(value = "排序", position = 10 )
+    private Integer showIndex;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjcetResearchQueryVO.java → science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectResearchQueryVO.java

 package com.yiboshi.science.param.query;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yiboshi.science.base.PaginationVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 查询项目申请书在研项目情况表VO
@@ -19,29 +18,37 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=true)
 @ApiModel(description = "查询项目申请书在研项目情况表VO")
-public class ComProjcetResearchQueryVO extends PaginationVO{
-    /** 项目id */
-    @ApiModelProperty(value = "项目id", position = 1)
-    private String projId;
+public class ComProjectResearchQueryVO extends PaginationVO{
+    /** 项目id / */
+    @ApiModelProperty(value = "项目id", position = 1 )
+    @Length(max=36, message = "项目id不能大于36")
+    private String objectId;
     /** 项目编号 */
-    @ApiModelProperty(value = "项目编号", position = 2)
+    @ApiModelProperty(value = "项目编号", position = 2 )
+    @Length(max=50, message = "项目编号不能大于100")
     private String projNo;
     /** 项目名称 */
-    @ApiModelProperty(value = "项目名称", position = 3)
+    @ApiModelProperty(value = "项目名称", position = 3 )
+    @Length(max=200, message = "项目名称不能大于100")
     private String projName;
-    /** 项目来源 */
-    @ApiModelProperty(value = "项目来源", position = 4)
+    /** 批准单位 */
+    @ApiModelProperty(value = "批准单位", position = 4 )
+    @Length(max=200, message = "批准单位不能大于100")
     private String approveUnit;
     /** 负责人 */
-    @ApiModelProperty(value = "负责人", position = 5)
-    private String headName;
-    /** 起止年限 */
-    @ApiModelProperty(value = "起止年限", position = 6)
-    private Integer ageLimit;
+    @ApiModelProperty(value = "负责人", position = 5 )
+    @Length(max=60, message = "负责人不能大于100")
+    private String leader;
+    /** 起止年限（开始） */
+    @ApiModelProperty(value = "起止年限", position = 6 )
+    private Data startDate;
+    /** 起止年限（结束） */
+    @ApiModelProperty(value = "起止年限", position = 6 )
+    private Data endDate;
     /** 项目经费 */
-    @ApiModelProperty(value = "项目经费", position = 7)
-    private BigDecimal funding;
-    /** 与本项目关系 */
-    @ApiModelProperty(value = "与本项目关系", position = 8)
-    private String relation;
+    @ApiModelProperty(value = "项目经费", position = 7 )
+    private BigDecimal funds;
+    /** 排序 */
+    @ApiModelProperty(value = "排序", position = 10 )
+    private Integer showIndex;
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjcetResearchController.java → science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectResearchController.java

 package com.yiboshi.science.rest.v1;
 
-import com.yiboshi.science.entity.ComProjcetResearch;
-import com.yiboshi.science.param.dto.ComProjcetResearchDTO;
-import com.yiboshi.science.param.query.ComProjcetResearchQueryVO;
+import com.yiboshi.science.entity.ComProjectResearch;
+import com.yiboshi.science.param.dto.ComProjectResearchDTO;
+import com.yiboshi.science.param.query.ComProjectResearchQueryVO;
 import com.yiboshi.science.rest.BaseController;
-import com.yiboshi.science.service.ComProjcetResearchService;
+import com.yiboshi.science.service.ComProjectResearchService;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,6 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "com-projcet-research",description = "项目申请书在研项目情况表")
 @RestController
 @RequestMapping("/v1/science-admin/com-projcet-research")
-public class ComProjcetResearchController extends BaseController<ComProjcetResearchService, ComProjcetResearchQueryVO, ComProjcetResearchDTO, ComProjcetResearch> {
+public class ComProjectResearchController extends BaseController<ComProjectResearchService, ComProjectResearchQueryVO, ComProjectResearchDTO, ComProjectResearch> {
 
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/ComProjcetResearchService.java

-package com.yiboshi.science.service;
-import com.yiboshi.science.base.BaseService;
-import com.yiboshi.science.entity.ComProjcetResearch;
-import com.yiboshi.science.param.dto.ComProjcetResearchDTO;
-import com.yiboshi.science.param.query.ComProjcetResearchQueryVO;
-
-/**
- * 项目申请书在研项目情况表 Service
- * 
- * @author lkl
- * @version 2021-08-26
- */
-public interface ComProjcetResearchService extends BaseService<ComProjcetResearchQueryVO, ComProjcetResearchDTO,ComProjcetResearch> {
-
-}
\ No newline at end of file

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;
+
+import java.util.List;
+
+/**
+ * 项目申请书在研项目情况表 Service
+ * 
+ * @author lkl
+ * @version 2021-08-26
+ */
+public interface ComProjectResearchService extends BaseService<ComProjectResearchQueryVO, ComProjectResearchDTO,ComProjectResearch> {
+    /** 获取列表
+     *
+     * @param objectId
+     * @return
+     */
+    List<ComProjectResearchDTO> getListByObjectId(String objectId);
+
+    /** 插入列表
+     *
+     * @param fileList
+     * @param objectId
+     */
+    void insertList(List<ComProjectResearchDTO> fileList, String objectId);
+    /** 删除对象列表
+     *
+     * @param objectId
+     */
+    void deleteByObjectId(String objectId);
+}
\ No newline at end of file

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

-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.ComProjcetResearchDAO;
-import com.yiboshi.science.entity.ComProjcetResearch;
-import com.yiboshi.science.param.dto.ComProjcetResearchDTO;
-import com.yiboshi.science.param.query.ComProjcetResearchQueryVO;
-import com.yiboshi.science.service.ComProjcetResearchService;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-/**
- * 项目申请书在研项目情况表 Service 实现类
- * 
- * @author lkl
- * @version 2021-08-26
- */
-@Service
-public class ComProjcetResearchServiceImpl extends BaseServiceImpl<ComProjcetResearchDAO,ComProjcetResearchQueryVO, ComProjcetResearchDTO,ComProjcetResearch> implements ComProjcetResearchService {
-    @Override
-    protected void setCriteriaForQuery(ComProjcetResearchQueryVO vo, QueryWrapper<ComProjcetResearchQueryVO> criteria) {
-        if(Objects.nonNull(vo.getProjId())){
-            criteria.eq("proj_id", vo.getProjId());
-        }
-        if(Objects.nonNull(vo.getProjNo())){
-            criteria.eq("proj_no", vo.getProjNo());
-        }
-        if(Objects.nonNull(vo.getProjName())){
-            criteria.eq("proj_name", vo.getProjName());
-        }
-        if(Objects.nonNull(vo.getApproveUnit())){
-            criteria.eq("approve_unit", vo.getApproveUnit());
-        }
-        if(Objects.nonNull(vo.getHeadName())){
-            criteria.eq("head_name", vo.getHeadName());
-        }
-        if(Objects.nonNull(vo.getAgeLimit())){
-            criteria.eq("age_limit", vo.getAgeLimit());
-        }
-        if(Objects.nonNull(vo.getFunding())){
-            criteria.eq("funding", vo.getFunding());
-        }
-        if(Objects.nonNull(vo.getRelation())){
-            criteria.eq("relation", vo.getRelation());
-        }
-    }
-}
\ No newline at end of file

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

+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 项目申请书在研项目情况表 Service 实现类
+ * 
+ * @author lkl
+ * @version 2021-08-26
+ */
+@Service
+public class ComProjectResearchServiceImpl extends BaseServiceImpl<ComProjectResearchDAO,ComProjectResearchQueryVO, ComProjectResearchDTO,ComProjectResearch> implements ComProjectResearchService {
+    @Autowired
+    private ComProjectResearchDAO comProjectResearchDAO;
+
+    @Override
+    protected void setCriteriaForQuery(ComProjectResearchQueryVO vo, QueryWrapper<ComProjectResearchQueryVO> criteria) {
+        if(Objects.nonNull(vo.getObjectId())){
+            criteria.eq("object_id", vo.getObjectId());
+        }
+        if(Objects.nonNull(vo.getProjNo())){
+            criteria.eq("proj_no", vo.getProjNo());
+        }
+        if(Objects.nonNull(vo.getProjName())){
+            criteria.eq("proj_name", vo.getProjName());
+        }
+        if(Objects.nonNull(vo.getApproveUnit())){
+            criteria.eq("approve_unit", vo.getApproveUnit());
+        }
+        if(Objects.nonNull(vo.getLeader())){
+            criteria.eq("leader", vo.getLeader());
+        }
+    }
+    @Override
+    public List<ComProjectResearchDTO> getListByObjectId(String objectId) {
+        return comProjectResearchDAO.getListByObjectId(objectId);
+    }
+
+    public void insertList(List<ComProjectResearchDTO> list, String objectId) {
+        ComProjectResearch file = new ComProjectResearch();
+        file.setObjectId(objectId);
+        this.delete(file);
+        if (null != list) {
+            for (int i = 0; i < list.size(); i++) {
+                if (!isObjectNull(list.get(i))) {
+                    list.get(i).setObjectId(objectId);
+                    list.get(i).setShowIndex(i + 1);
+                    ComProjectResearch comProjectResearch = convert2Entity(list.get(i));
+                    this.insert(comProjectResearch);
+                }
+            }
+        }
+    }
+
+    public void deleteByObjectId(String objectId) {
+        ComProjectResearch E = new ComProjectResearch();
+        E.setObjectId(objectId);
+        this.delete(E);
+    }
+
+
+
+}
\ No newline at end of file

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

@@ -64,6 +64,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     private ComProjectBudgetService comProjectBudgetService;
     @Autowired
     private ComProjectEquipmentService comProjectEquipmentService;
+
+    @Autowired
+    private ComProjectResearchService comProjectResearchService;
     @Autowired
     private ComProjectSubService comProjectSubService;
     @Autowired
@@ -356,6 +359,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 //        if (dto.getProjState() >= 50)
         LoadProjectKPIInfo(dto);
 
+        // 在研或完成基础研究项目情况
+        List<ComProjectResearchDTO> researchList = comProjectResearchService.getListByObjectId(dto.getId());
+        dto.setResearchList(researchList);
+
 
         // 项目课颖设置表
         List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
@@ -699,6 +706,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
         // 仪器、设备
         comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
+        // 在研或完成基础研究项目情况
+        comProjectResearchService.insertList(dto.getResearchList(), id);
         // 项目课颖设置表
         comProjectSubService.insertList(dto.getProjectSubList(), id);
         // 单位科研项目及资金管理制度表
@@ -751,9 +760,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 单位支出明细预算表
         comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
 
-
         // 项目经费构成表
         comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId());
+        // 在研或完成基础研究项目情况
+        comProjectResearchService.insertList(dto.getResearchList(), comProject.getId());
         // 项目课颖设置表
         comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId());
         // 单位科研项目及资金管理制度表

science-admin/src/main/resources/mapper/ComProjcetResearchDAO.xml → science-admin/src/main/resources/mapper/ComProjectResearchDAO.xml

@@ -2,9 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <!-- 项目申请书在研项目情况表 -->
-<mapper namespace="com.yiboshi.science.dao.ComProjcetResearchDAO">
+<mapper namespace="com.yiboshi.science.dao.ComProjectResearchDAO">
     <sql id="allColumns">
         t.id as id, t.proj_id as projId, t.proj_no as projNo, t.proj_name as projName, t.approve_unit as approveUnit, t.head_name as headName, t.age_limit as ageLimit, t.funding as funding, 
         t.relation as relation
     </sql>
+    <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectResearchDTO">
+        SELECT a.*
+        FROM com_project_research a
+        where object_id=#{objectId} order by a.show_index asc
+    </select>
 </mapper>
\ No newline at end of file