首次提交

ruoyi-admin/src/main/java/com/ruoyi/system/controller/ScientificProjectAcceptController.java

+package com.ruoyi.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.ScientificProjectAccept;
+import com.ruoyi.system.service.IScientificProjectAcceptService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目验收Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-20
+ */
+@RestController
+@RequestMapping("/api/scientific/accept")
+public class ScientificProjectAcceptController extends BaseController
+{
+    @Autowired
+    private IScientificProjectAcceptService scientificProjectAcceptService;
+
+    /**
+     * 查询项目验收列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:scientificProjectAccept:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScientificProjectAccept scientificProjectAccept)
+    {
+        startPage();
+        List<ScientificProjectAccept> list = scientificProjectAcceptService.selectScientificProjectAcceptList(scientificProjectAccept);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目验收列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:scientificProjectAccept:export')")
+    @Log(title = "项目验收", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScientificProjectAccept scientificProjectAccept)
+    {
+        List<ScientificProjectAccept> list = scientificProjectAcceptService.selectScientificProjectAcceptList(scientificProjectAccept);
+        ExcelUtil<ScientificProjectAccept> util = new ExcelUtil<ScientificProjectAccept>(ScientificProjectAccept.class);
+        util.exportExcel(response, list, "项目验收数据");
+    }
+
+    /**
+     * 获取项目验收详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:scientificProjectAccept:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(scientificProjectAcceptService.selectScientificProjectAcceptById(id));
+    }
+
+    /**
+     * 新增项目验收
+     */
+    //@PreAuthorize("@ss.hasPermi('system:scientificProjectAccept:add')")
+    @Log(title = "项目验收", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ScientificProjectAccept scientificProjectAccept)
+    {
+        return toAjax(scientificProjectAcceptService.insertScientificProjectAccept(scientificProjectAccept));
+    }
+
+    /**
+     * 修改项目验收
+     */
+    //@PreAuthorize("@ss.hasPermi('system:scientificProjectAccept:edit')")
+    @Log(title = "项目验收", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ScientificProjectAccept scientificProjectAccept)
+    {
+        return toAjax(scientificProjectAcceptService.updateScientificProjectAccept(scientificProjectAccept));
+    }
+
+    /**
+     * 删除项目验收
+     */
+    //@PreAuthorize("@ss.hasPermi('system:scientificProjectAccept:remove')")
+    @Log(title = "项目验收", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(scientificProjectAcceptService.deleteScientificProjectAcceptByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/AchievementSearch.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-01-13
  */
+@Data
 public class AchievementSearch extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -114,6 +116,10 @@ public class AchievementSearch extends BaseEntity
     @Excel(name = "驳回意见原因")
     private String refuse_content;
 
+    private String qtwcdwid;
+
+    private String qtwcdwname;
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-admin/src/main/java/com/ruoyi/system/domain/ProgroupProject.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-01-13
  */
+@Data
 public class ProgroupProject extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -158,6 +160,8 @@ public class ProgroupProject extends BaseEntity
     @Excel(name = "wbs名称")
     private String wbs_name;
 
+    private String lxglid;
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-admin/src/main/java/com/ruoyi/system/domain/ScientificProjectAccept.java

+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目验收对象 scientific_project_accept
+ * 
+ * @author ruoyi
+ * @date 2025-05-20
+ */
+@Data
+public class ScientificProjectAccept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String project_id;
+
+    /** 流程实例id */
+    @Excel(name = "流程实例id")
+    private String instance_id;
+
+    /** 课题编号 */
+    @Excel(name = "课题编号")
+    private String subject_name;
+
+    /** 流程状态 */
+    @Excel(name = "流程状态")
+    private Long process_status;
+
+    /** 驳回意见原因 */
+    @Excel(name = "驳回意见原因")
+    private String refuse_content;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String file;
+
+    /** 最晚提交时间 */
+    @Excel(name = "最晚提交时间")
+    private String final_time;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String created_by;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date created_time;
+
+    /** 更新人 */
+    private String update_by;
+
+    /** 更新时间 */
+    private Date update_time;
+
+    /** 备用1 */
+    @Excel(name = "备用1")
+    private String ext1;
+
+    /** 备用2 */
+    @Excel(name = "备用2")
+    private String ext2;
+
+    /** 备用3 */
+    @Excel(name = "备用3")
+    private String ext3;
+
+    /** 类型 流程 */
+    @Excel(name = "类型 流程")
+    private String type;
+
+    /** 申请人 流程 */
+    @Excel(name = "申请人 流程")
+    private String apply_user;
+
+    /** 申请时间 流程 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间 流程", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date apply_time;
+
+    /** 是否技术研发类 */
+    @Excel(name = "是否技术研发类")
+    private String sfjsyfl;
+
+    /** 是否发布 */
+    @Excel(name = "是否发布")
+    private String sffb;
+
+    /** 是否通过验收 */
+    @Excel(name = "是否通过验收")
+    private String sftgys;
+    //资料归档状态
+    private String zlgd_zt;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProject_id(String project_id) 
+    {
+        this.project_id = project_id;
+    }
+
+    public String getProject_id() 
+    {
+        return project_id;
+    }
+    public void setInstance_id(String instance_id) 
+    {
+        this.instance_id = instance_id;
+    }
+
+    public String getInstance_id() 
+    {
+        return instance_id;
+    }
+    public void setSubject_name(String subject_name) 
+    {
+        this.subject_name = subject_name;
+    }
+
+    public String getSubject_name() 
+    {
+        return subject_name;
+    }
+    public void setProcess_status(Long process_status) 
+    {
+        this.process_status = process_status;
+    }
+
+    public Long getProcess_status() 
+    {
+        return process_status;
+    }
+    public void setRefuse_content(String refuse_content) 
+    {
+        this.refuse_content = refuse_content;
+    }
+
+    public String getRefuse_content() 
+    {
+        return refuse_content;
+    }
+    public void setFile(String file) 
+    {
+        this.file = file;
+    }
+
+    public String getFile() 
+    {
+        return file;
+    }
+    public void setFinal_time(String final_time) 
+    {
+        this.final_time = final_time;
+    }
+
+    public String getFinal_time() 
+    {
+        return final_time;
+    }
+    public void setCreated_by(String created_by) 
+    {
+        this.created_by = created_by;
+    }
+
+    public String getCreated_by() 
+    {
+        return created_by;
+    }
+    public void setCreated_time(Date created_time) 
+    {
+        this.created_time = created_time;
+    }
+
+    public Date getCreated_time() 
+    {
+        return created_time;
+    }
+    public void setUpdate_by(String update_by) 
+    {
+        this.update_by = update_by;
+    }
+
+    public String getUpdate_by() 
+    {
+        return update_by;
+    }
+    public void setUpdate_time(Date update_time) 
+    {
+        this.update_time = update_time;
+    }
+
+    public Date getUpdate_time() 
+    {
+        return update_time;
+    }
+    public void setExt1(String ext1) 
+    {
+        this.ext1 = ext1;
+    }
+
+    public String getExt1() 
+    {
+        return ext1;
+    }
+    public void setExt2(String ext2) 
+    {
+        this.ext2 = ext2;
+    }
+
+    public String getExt2() 
+    {
+        return ext2;
+    }
+    public void setExt3(String ext3) 
+    {
+        this.ext3 = ext3;
+    }
+
+    public String getExt3() 
+    {
+        return ext3;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setApply_user(String apply_user) 
+    {
+        this.apply_user = apply_user;
+    }
+
+    public String getApply_user() 
+    {
+        return apply_user;
+    }
+    public void setApply_time(Date apply_time) 
+    {
+        this.apply_time = apply_time;
+    }
+
+    public Date getApply_time() 
+    {
+        return apply_time;
+    }
+    public void setSfjsyfl(String sfjsyfl) 
+    {
+        this.sfjsyfl = sfjsyfl;
+    }
+
+    public String getSfjsyfl() 
+    {
+        return sfjsyfl;
+    }
+    public void setSffb(String sffb) 
+    {
+        this.sffb = sffb;
+    }
+
+    public String getSffb() 
+    {
+        return sffb;
+    }
+    public void setSftgys(String sftgys) 
+    {
+        this.sftgys = sftgys;
+    }
+
+    public String getSftgys() 
+    {
+        return sftgys;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("project_id", getProject_id())
+            .append("instance_id", getInstance_id())
+            .append("subject_name", getSubject_name())
+            .append("process_status", getProcess_status())
+            .append("refuse_content", getRefuse_content())
+            .append("file", getFile())
+            .append("final_time", getFinal_time())
+            .append("created_by", getCreated_by())
+            .append("created_time", getCreated_time())
+            .append("update_by", getUpdate_by())
+            .append("update_time", getUpdate_time())
+            .append("ext1", getExt1())
+            .append("ext2", getExt2())
+            .append("ext3", getExt3())
+            .append("type", getType())
+            .append("apply_user", getApply_user())
+            .append("apply_time", getApply_time())
+            .append("sfjsyfl", getSfjsyfl())
+            .append("sffb", getSffb())
+            .append("sftgys", getSftgys())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/ScientificProjectOpening.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-01-13
  */
+@Data
 public class ScientificProjectOpening extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -254,6 +256,60 @@ public class ScientificProjectOpening extends BaseEntity
     @Excel(name = "首席职称")
     private String chief_p;
 
+
+
+    private String org_id;
+
+    /** 承担单位名称 */
+    @Excel(name = "承担单位名称")
+    private String org_name;
+
+    /** 合作单位id */
+    @Excel(name = "合作单位id")
+    private String teamwork_id;
+
+    /** 合作单位名称 */
+    @Excel(name = "合作单位名称")
+    private String teamwork_name;
+
+    /** 方向 */
+    @Excel(name = "方向")
+    private String direction;
+
+    /** 专业id */
+    @Excel(name = "专业id")
+    private String professional_id;
+
+    /** 专业 */
+    @Excel(name = "专业")
+    private String professional;
+
+    /** 项目类别id */
+    @Excel(name = "项目类别id")
+    private String category_id;
+
+    /** 项目类别 */
+    @Excel(name = "项目类别")
+    private String category;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String head;
+
+    /** 首席 */
+    @Excel(name = "首席")
+    private String chief;
+
+    /** 研究开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "研究开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date study_start;
+
+    /** 研究结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "研究结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date study_end;
+
     public void setId(Long id)
     {
         this.id = id;

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/ScientificProjectAcceptMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.ScientificProjectAccept;
+
+/**
+ * 项目验收Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-20
+ */
+public interface ScientificProjectAcceptMapper 
+{
+    /**
+     * 查询项目验收
+     * 
+     * @param id 项目验收主键
+     * @return 项目验收
+     */
+    public ScientificProjectAccept selectScientificProjectAcceptById(Long id);
+
+    /**
+     * 查询项目验收列表
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 项目验收集合
+     */
+    public List<ScientificProjectAccept> selectScientificProjectAcceptList(ScientificProjectAccept scientificProjectAccept);
+
+    /**
+     * 新增项目验收
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 结果
+     */
+    public int insertScientificProjectAccept(ScientificProjectAccept scientificProjectAccept);
+
+    /**
+     * 修改项目验收
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 结果
+     */
+    public int updateScientificProjectAccept(ScientificProjectAccept scientificProjectAccept);
+
+    /**
+     * 删除项目验收
+     * 
+     * @param id 项目验收主键
+     * @return 结果
+     */
+    public int deleteScientificProjectAcceptById(Long id);
+
+    /**
+     * 批量删除项目验收
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteScientificProjectAcceptByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/IScientificProjectAcceptService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.ScientificProjectAccept;
+
+/**
+ * 项目验收Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-20
+ */
+public interface IScientificProjectAcceptService 
+{
+    /**
+     * 查询项目验收
+     * 
+     * @param id 项目验收主键
+     * @return 项目验收
+     */
+    public ScientificProjectAccept selectScientificProjectAcceptById(Long id);
+
+    /**
+     * 查询项目验收列表
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 项目验收集合
+     */
+    public List<ScientificProjectAccept> selectScientificProjectAcceptList(ScientificProjectAccept scientificProjectAccept);
+
+    /**
+     * 新增项目验收
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 结果
+     */
+    public int insertScientificProjectAccept(ScientificProjectAccept scientificProjectAccept);
+
+    /**
+     * 修改项目验收
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 结果
+     */
+    public int updateScientificProjectAccept(ScientificProjectAccept scientificProjectAccept);
+
+    /**
+     * 批量删除项目验收
+     * 
+     * @param ids 需要删除的项目验收主键集合
+     * @return 结果
+     */
+    public int deleteScientificProjectAcceptByIds(Long[] ids);
+
+    /**
+     * 删除项目验收信息
+     * 
+     * @param id 项目验收主键
+     * @return 结果
+     */
+    public int deleteScientificProjectAcceptById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/Impl/ScientificProjectAcceptServiceImpl.java

+package com.ruoyi.system.service.Impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ScientificProjectAcceptMapper;
+import com.ruoyi.system.domain.ScientificProjectAccept;
+import com.ruoyi.system.service.IScientificProjectAcceptService;
+
+/**
+ * 项目验收Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-05-20
+ */
+@Service
+public class ScientificProjectAcceptServiceImpl implements IScientificProjectAcceptService 
+{
+    @Autowired
+    private ScientificProjectAcceptMapper scientificProjectAcceptMapper;
+
+    /**
+     * 查询项目验收
+     * 
+     * @param id 项目验收主键
+     * @return 项目验收
+     */
+    @Override
+    public ScientificProjectAccept selectScientificProjectAcceptById(Long id)
+    {
+        return scientificProjectAcceptMapper.selectScientificProjectAcceptById(id);
+    }
+
+    /**
+     * 查询项目验收列表
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 项目验收
+     */
+    @Override
+    public List<ScientificProjectAccept> selectScientificProjectAcceptList(ScientificProjectAccept scientificProjectAccept)
+    {
+        return scientificProjectAcceptMapper.selectScientificProjectAcceptList(scientificProjectAccept);
+    }
+
+    /**
+     * 新增项目验收
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 结果
+     */
+    @Override
+    public int insertScientificProjectAccept(ScientificProjectAccept scientificProjectAccept)
+    {
+        return scientificProjectAcceptMapper.insertScientificProjectAccept(scientificProjectAccept);
+    }
+
+    /**
+     * 修改项目验收
+     * 
+     * @param scientificProjectAccept 项目验收
+     * @return 结果
+     */
+    @Override
+    public int updateScientificProjectAccept(ScientificProjectAccept scientificProjectAccept)
+    {
+        return scientificProjectAcceptMapper.updateScientificProjectAccept(scientificProjectAccept);
+    }
+
+    /**
+     * 批量删除项目验收
+     * 
+     * @param ids 需要删除的项目验收主键
+     * @return 结果
+     */
+    @Override
+    public int deleteScientificProjectAcceptByIds(Long[] ids)
+    {
+        return scientificProjectAcceptMapper.deleteScientificProjectAcceptByIds(ids);
+    }
+
+    /**
+     * 删除项目验收信息
+     * 
+     * @param id 项目验收主键
+     * @return 结果
+     */
+    @Override
+    public int deleteScientificProjectAcceptById(Long id)
+    {
+        return scientificProjectAcceptMapper.deleteScientificProjectAcceptById(id);
+    }
+}

ruoyi-admin/src/main/resources/mapper/AchievementSearchMapper.xml

@@ -29,10 +29,12 @@
         <result property="instance_id"    column="instance_id"    />
         <result property="process_status"    column="process_status"    />
         <result property="refuse_content"    column="refuse_content"    />
+        <result property="qtwcdwid"    column="qtwcdwid"    />
+        <result property="qtwcdwname"    column="qtwcdwname"    />
     </resultMap>
 
     <sql id="selectAchievementSearchVo">
-        select id, achievement_name, acquire_date, achievement_type, patentee, introduction, created_by, created_time, update_by, update_time, ext1, ext2, ext3, is_modify, plan, type, apply_user, apply_time, file, dept_id, dept_name, instance_id, process_status, refuse_content from achievement_search
+        select id, achievement_name, acquire_date, achievement_type, patentee, introduction, created_by, created_time, update_by, update_time, ext1, ext2, ext3, is_modify, plan, type, apply_user, apply_time, file, dept_id, dept_name, instance_id, process_status, refuse_content,qtwcdwname,qtwcdwid from achievement_search
     </sql>
 
     <select id="selectAchievementSearchList" parameterType="AchievementSearch" resultMap="AchievementSearchResult">

ruoyi-admin/src/main/resources/mapper/ProgroupProjectMapper.xml

@@ -41,10 +41,11 @@
         <result property="project_status"    column="project_status"    />
         <result property="wbs_bh"    column="wbs_bh"    />
         <result property="wbs_name"    column="wbs_name"    />
+        <result property="lxglid"    column="lxglid"    />
     </resultMap>
 
     <sql id="selectProgroupProjectVo">
-        select id, title_name, group_id, group_name, target, content, head_id, head_name, chief_id, chief_name, team_user_id, team_user_name, responsibility_id, responsibility_name, schedule, anticipate, remark, created_by, created_time, update_by, update_time, ext1, ext2, ext3, contact, contact_details, fuzzy_query, project_code, project_level, project_level_name, start_time, end_time, funds, project_status, wbs_bh, wbs_name from progroup_project
+        select id, title_name, group_id, group_name, target, content, head_id, head_name, chief_id, chief_name, team_user_id, team_user_name, responsibility_id, responsibility_name, schedule, anticipate, remark, created_by, created_time, update_by, update_time, ext1, ext2, ext3, contact, contact_details, fuzzy_query, project_code, project_level, project_level_name, start_time, end_time, funds, project_status, wbs_bh, wbs_name,lxglid from progroup_project
     </sql>
 
     <select id="selectProgroupProjectList" parameterType="ProgroupProject" resultMap="ProgroupProjectResult">

ruoyi-admin/src/main/resources/mapper/ScientificProjectAcceptMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ScientificProjectAcceptMapper">
+    
+    <resultMap type="ScientificProjectAccept" id="ScientificProjectAcceptResult">
+        <result property="id"    column="id"    />
+        <result property="project_id"    column="project_id"    />
+        <result property="instance_id"    column="instance_id"    />
+        <result property="subject_name"    column="subject_name"    />
+        <result property="process_status"    column="process_status"    />
+        <result property="refuse_content"    column="refuse_content"    />
+        <result property="file"    column="file"    />
+        <result property="final_time"    column="final_time"    />
+        <result property="created_by"    column="created_by"    />
+        <result property="created_time"    column="created_time"    />
+        <result property="update_by"    column="update_by"    />
+        <result property="update_time"    column="update_time"    />
+        <result property="ext1"    column="ext1"    />
+        <result property="ext2"    column="ext2"    />
+        <result property="ext3"    column="ext3"    />
+        <result property="type"    column="type"    />
+        <result property="apply_user"    column="apply_user"    />
+        <result property="apply_time"    column="apply_time"    />
+        <result property="sfjsyfl"    column="sfjsyfl"    />
+        <result property="sffb"    column="sffb"    />
+        <result property="sftgys"    column="sftgys"    />
+        <result property="zlgd_zt"    column="zlgd_zt"    />
+    </resultMap>
+
+    <sql id="selectScientificProjectAcceptVo">
+        select a.id,
+               a.project_id,
+               a.instance_id,
+               a.subject_name,
+               a.process_status,
+               a.refuse_content,
+               a.file,
+               a.final_time,
+               a.created_by,
+               a.created_time,
+               a.update_by,
+               a.update_time,
+               a.ext1,
+               a.ext2,
+               a.ext3,
+               a.type,
+               a.apply_user,
+               a.apply_time,
+               a.sfjsyfl,
+               a.sffb,
+               a.sftgys,
+               (case when b.process_status='2' then '是' else '否' end )zlgd_zt
+        from scientific_project_accept a left join scientific_project_accept_dysxx b on a.project_id=b.project_id
+    </sql>
+
+    <select id="selectScientificProjectAcceptList" parameterType="ScientificProjectAccept" resultMap="ScientificProjectAcceptResult">
+        <include refid="selectScientificProjectAcceptVo"/>
+        <where>  
+            <if test="project_id != null  and project_id != ''"> and a.project_id = #{project_id}</if>
+            <if test="instance_id != null  and instance_id != ''"> and a.instance_id = #{instance_id}</if>
+            <if test="subject_name != null  and subject_name != ''"> and a.subject_name like concat('%', #{subject_name}, '%')</if>
+            <if test="process_status != null "> and a.process_status = #{process_status}</if>
+            <if test="refuse_content != null  and refuse_content != ''"> and a.refuse_content = #{refuse_content}</if>
+            <if test="file != null  and file != ''"> and a.file = #{file}</if>
+            <if test="final_time != null  and final_time != ''"> and a.final_time = #{final_time}</if>
+            <if test="created_by != null  and created_by != ''"> and a.created_by = #{created_by}</if>
+            <if test="created_time != null "> and a.created_time = #{created_time}</if>
+            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+            <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
+            <if test="ext3 != null  and ext3 != ''"> and ext3 = #{ext3}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="apply_user != null  and apply_user != ''"> and apply_user = #{apply_user}</if>
+            <if test="apply_time != null "> and apply_time = #{apply_time}</if>
+            <if test="sfjsyfl != null  and sfjsyfl != ''"> and a.sfjsyfl = #{sfjsyfl}</if>
+            <if test="sffb != null  and sffb != ''"> and a.sffb = #{sffb}</if>
+            <if test="sftgys != null  and sftgys != ''"> and a.sftgys = #{sftgys}</if>
+        </where>
+    </select>
+    
+    <select id="selectScientificProjectAcceptById" parameterType="Long" resultMap="ScientificProjectAcceptResult">
+        <include refid="selectScientificProjectAcceptVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertScientificProjectAccept" parameterType="ScientificProjectAccept" useGeneratedKeys="true" keyProperty="id">
+        insert into scientific_project_accept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="project_id != null">project_id,</if>
+            <if test="instance_id != null">instance_id,</if>
+            <if test="subject_name != null">subject_name,</if>
+            <if test="process_status != null">process_status,</if>
+            <if test="refuse_content != null">refuse_content,</if>
+            <if test="file != null">file,</if>
+            <if test="final_time != null">final_time,</if>
+            <if test="created_by != null">created_by,</if>
+            <if test="created_time != null">created_time,</if>
+            <if test="update_by != null">update_by,</if>
+            <if test="update_time != null">update_time,</if>
+            <if test="ext1 != null">ext1,</if>
+            <if test="ext2 != null">ext2,</if>
+            <if test="ext3 != null">ext3,</if>
+            <if test="type != null">type,</if>
+            <if test="apply_user != null">apply_user,</if>
+            <if test="apply_time != null">apply_time,</if>
+            <if test="sfjsyfl != null">sfjsyfl,</if>
+            <if test="sffb != null">sffb,</if>
+            <if test="sftgys != null">sftgys,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="project_id != null">#{project_id},</if>
+            <if test="instance_id != null">#{instance_id},</if>
+            <if test="subject_name != null">#{subject_name},</if>
+            <if test="process_status != null">#{process_status},</if>
+            <if test="refuse_content != null">#{refuse_content},</if>
+            <if test="file != null">#{file},</if>
+            <if test="final_time != null">#{final_time},</if>
+            <if test="created_by != null">#{created_by},</if>
+            <if test="created_time != null">#{created_time},</if>
+            <if test="update_by != null">#{update_by},</if>
+            <if test="update_time != null">#{update_time},</if>
+            <if test="ext1 != null">#{ext1},</if>
+            <if test="ext2 != null">#{ext2},</if>
+            <if test="ext3 != null">#{ext3},</if>
+            <if test="type != null">#{type},</if>
+            <if test="apply_user != null">#{apply_user},</if>
+            <if test="apply_time != null">#{apply_time},</if>
+            <if test="sfjsyfl != null">#{sfjsyfl},</if>
+            <if test="sffb != null">#{sffb},</if>
+            <if test="sftgys != null">#{sftgys},</if>
+         </trim>
+    </insert>
+
+    <update id="updateScientificProjectAccept" parameterType="ScientificProjectAccept">
+        update scientific_project_accept
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="project_id != null">project_id = #{project_id},</if>
+            <if test="instance_id != null">instance_id = #{instance_id},</if>
+            <if test="subject_name != null">subject_name = #{subject_name},</if>
+            <if test="process_status != null">process_status = #{process_status},</if>
+            <if test="refuse_content != null">refuse_content = #{refuse_content},</if>
+            <if test="file != null">file = #{file},</if>
+            <if test="final_time != null">final_time = #{final_time},</if>
+            <if test="created_by != null">created_by = #{created_by},</if>
+            <if test="created_time != null">created_time = #{created_time},</if>
+            <if test="update_by != null">update_by = #{update_by},</if>
+            <if test="update_time != null">update_time = #{update_time},</if>
+            <if test="ext1 != null">ext1 = #{ext1},</if>
+            <if test="ext2 != null">ext2 = #{ext2},</if>
+            <if test="ext3 != null">ext3 = #{ext3},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="apply_user != null">apply_user = #{apply_user},</if>
+            <if test="apply_time != null">apply_time = #{apply_time},</if>
+            <if test="sfjsyfl != null">sfjsyfl = #{sfjsyfl},</if>
+            <if test="sffb != null">sffb = #{sffb},</if>
+            <if test="sftgys != null">sftgys = #{sftgys},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteScientificProjectAcceptById" parameterType="Long">
+        delete from scientific_project_accept where id = #{id}
+    </delete>
+
+    <delete id="deleteScientificProjectAcceptByIds" parameterType="String">
+        delete from scientific_project_accept where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

ruoyi-admin/src/main/resources/mapper/ScientificProjectOpeningMapper.xml

@@ -64,10 +64,95 @@
         <result property="apply_time"    column="apply_time"    />
         <result property="head_p"    column="head_p"    />
         <result property="chief_p"    column="chief_p"    />
+        <result property="org_id"    column="org_id"    />
+        <result property="org_name"    column="org_name"    />
+        <result property="teamwork_id"    column="teamwork_id"    />
+        <result property="teamwork_name"    column="teamwork_name"    />
+        <result property="direction"    column="direction"    />
+        <result property="professional_id"    column="professional_id"    />
+        <result property="professional"    column="professional"    />
+        <result property="category_id"    column="category_id"    />
+        <result property="category"    column="category"    />
+        <result property="head"    column="head"    />
+        <result property="chief"    column="chief"    />
+        <result property="study_start"    column="study_start"    />
+        <result property="study_end"    column="study_end"    />
     </resultMap>
 
     <sql id="selectScientificProjectOpeningVo">
-        select id, instance_id, project_id, project_title, project_code, foreign_develop, foreign_develop_pic, domestic_develop, domestic_develop_pic, associated, associated_pic, innovation, innovation_pic, tec_goal, tec_goal_pic, tec_content, tec_content_pic, tec_way, tec_way_pic, tec_indicator, tec_indicator_pic, intellectual, intellectual_pic, patent, patent_pic, document, document_pic, in_analyse, in_analyse_pic, out_analyse, out_analyse_pic, demand, demand_pic, benefit, benefit_pic, tec_plan, tec_plan_pic, team_info, team_info_pic, laboratory, laboratory_pic, staff_list, file_id, process_status, refuse_content, final_time, created_by, created_time, update_by, update_time, ext1, ext2, ext3, is_modify, type, apply_user, apply_time, head_p, chief_p from scientific_project_opening
+        select a.id,
+               a.instance_id,
+               project_id,
+               b.subject_name project_title,
+               project_code,
+               foreign_develop,
+               foreign_develop_pic,
+               domestic_develop,
+               domestic_develop_pic,
+               associated,
+               associated_pic,
+               innovation,
+               innovation_pic,
+               tec_goal,
+               tec_goal_pic,
+               tec_content,
+               tec_content_pic,
+               tec_way,
+               tec_way_pic,
+               tec_indicator,
+               tec_indicator_pic,
+               intellectual,
+               intellectual_pic,
+               patent,
+               patent_pic,
+               document,
+               document_pic,
+               in_analyse,
+               in_analyse_pic,
+               out_analyse,
+               out_analyse_pic,
+               demand,
+               demand_pic,
+               benefit,
+               benefit_pic,
+               tec_plan,
+               tec_plan_pic,
+               team_info,
+               team_info_pic,
+               laboratory,
+               laboratory_pic,
+               staff_list,
+               file_id,
+               a.process_status,
+               a.refuse_content,
+               a.final_time,
+               a.created_by,
+               a.created_time,
+               a.update_by,
+               a.update_time,
+               a.ext1,
+               a.ext2,
+               a.ext3,
+               a.is_modify,
+               a.type,
+               a.apply_user,
+               a.apply_time,
+               a.head_p,
+               a.chief_p,
+               b.org_id,
+               b.org_name,
+               b.teamwork_id,
+               b.teamwork_name,
+               b.direction,
+               b.professional_id,
+               b.professional,
+               b.category,
+               b.category_id,
+               b.head,
+               b.chief,
+               b.study_start,
+               b.study_end
+        from scientific_project_opening a left join scientific_project b on a.project_id=b.id
     </sql>
 
     <select id="selectScientificProjectOpeningList" parameterType="ScientificProjectOpening" resultMap="ScientificProjectOpeningResult">