diff --git a/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectTaskDAO.java b/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectTaskDAO.java
index 7c2e4f5c181238c03ad863ebd66ae5c6d292c85c..71f2067331441b952aa1f23a649e0c381f5fd83e 100644
--- a/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectTaskDAO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectTaskDAO.java
@@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ComProjectTaskDAO extends BaseMapper<ComProjectTask>, BaseDAO<ComProjectTaskQueryVO, ComProjectTaskDTO, ComProjectTask> {
     DataStatisticsDTO getCount(@Param("ew") Wrapper<ComProjectTask> queryWrapper);
+
+    ComProjectTaskDTO getByProjId(String id);
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java
index 00fc434bfc3f9bbd883ca8128bceebeeda0261a3..c92bae6f96787d4bb7f7114a16b346bc3ce825dd 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java
@@ -39,7 +39,6 @@ public class ComProjectTask extends BaseEntity {
     @ApiModelProperty(value = "结束日期", position = 8 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
-
     /** 注册单位类型 */
     @ApiModelProperty(value = "注册单位类型", position = 1 )
     @Length(max=50, message = "注册单位类型不能大于50")
@@ -89,12 +88,22 @@ public class ComProjectTask extends BaseEntity {
     @ApiModelProperty(value = "银行联行号", position = 1 )
     @Length(max=50, message = "银行联行号不能大于50")
     private String interbankNumber;
-
-
     /** 所属我省重点领域 */
     @ApiModelProperty(value = "所属我省重点领域", position = 13 )
     @Length(max=50, message = "所属我省重点领域不能大于50")
     private String keyAreas;
+    /** 电话 */
+    @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 = 8 )
+    @Length(max=300, message = "项目分工不能大于300")
+    private String projWork;
     /** 项目联系人姓名 */
     @ApiModelProperty(value = "项目联系人姓名", position = 16)
     @Length(max=100, message = "项目联系人姓名不能大于100")
@@ -114,4 +123,16 @@ public class ComProjectTask extends BaseEntity {
     /** 是否科技报告 0 否 1 是 */
     @ApiModelProperty(value = "是否科技报告", position = 1 )
     private Integer isTechnologyReport;
+    /** 立项报告 */
+    @ApiModelProperty(value = "立项报告", position = 2 )
+    private Integer projectReport;
+    /** 进展报告 */
+    @ApiModelProperty(value = "进展报告", position = 2 )
+    private Integer progressReport;
+    /** 专题报告 */
+    @ApiModelProperty(value = "专题报告", position = 2 )
+    private Integer specialReport;
+    /** 最终报告 */
+    @ApiModelProperty(value = "最终报告", position = 2 )
+    private Integer finalReport;
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
index 7bb416180cc2a43250fda2a2d6970e84018e8f39..546d69b76ab47226cdead30f1716219cd8fd0bce 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
@@ -227,6 +227,15 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "项目组成员_参加单位数", position = 25)
     private Integer workCount;
 
+    /** 项目状态 */
+    @ApiModelProperty(value = "项目状态", position = 41)
+    private String projStateName;
+    /** 项目类别 */
+    @ApiModelProperty(value = "项目类别", position = 3)
+    private String projClassName;
+    /** 学科 */
+    @ApiModelProperty(value = "学科", position = 16)
+    private String knowledgeName;
     /** 附件Id */
     @ApiModelProperty(value = "附件Id", position = 4 )
     private String fileId;
@@ -247,22 +256,6 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "注册单位类型", position = 12)
     private String unitTypeName;
 
-    /** 项目状态 */
-    @ApiModelProperty(value = "项目状态", position = 41)
-    private String projStateName;
-    /** 项目类别 */
-    @ApiModelProperty(value = "项目类别", position = 3)
-    private String projClassName;
-    /** 学科 */
-    @ApiModelProperty(value = "学科", position = 16)
-    private String knowledgeName;
-    /** 开始 */
-    @ApiModelProperty(value = "开始", position = 3)
-    private String startDateStr;
-    /** 结束 */
-    @ApiModelProperty(value = "结束", position = 3)
-    private String endDateStr;
-
     /** 姓名 */
     @ApiModelProperty(value = "姓名", position = 41)
     private String appPersonName;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
index bf9b5664b9f1efd13bae728b7fa2cccbb260d8b2..62767d79c51e641f30ca17c6cd3c3b35d4ec824f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
@@ -90,12 +90,22 @@ public class ComProjectTaskDTO extends BaseDTO {
     @ApiModelProperty(value = "银行联行号", position = 1 )
     @Length(max=50, message = "银行联行号不能大于50")
     private String interbankNumber;
-
-
     /** 所属我省重点领域 */
     @ApiModelProperty(value = "所属我省重点领域", position = 13 )
     @Length(max=50, message = "所属我省重点领域不能大于50")
     private String keyAreas;
+    /** 电话 */
+    @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 = 8 )
+    @Length(max=300, message = "项目分工不能大于300")
+    private String projWork;
     /** 项目联系人姓名 */
     @ApiModelProperty(value = "项目联系人姓名", position = 16)
     @Length(max=100, message = "项目联系人姓名不能大于100")
@@ -115,6 +125,18 @@ public class ComProjectTaskDTO extends BaseDTO {
     /** 是否科技报告 0 否 1 是 */
     @ApiModelProperty(value = "是否科技报告", position = 1 )
     private Integer isTechnologyReport;
+    /** 立项报告 */
+    @ApiModelProperty(value = "立项报告", position = 2 )
+    private Integer projectReport;
+    /** 进展报告 */
+    @ApiModelProperty(value = "进展报告", position = 2 )
+    private Integer progressReport;
+    /** 专题报告 */
+    @ApiModelProperty(value = "专题报告", position = 2 )
+    private Integer specialReport;
+    /** 最终报告 */
+    @ApiModelProperty(value = "最终报告", position = 2 )
+    private Integer finalReport;
 
     /** 合同书状态  0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改,40 审核不通过, 50 审核通过*/
     private String taskStateName;
@@ -136,9 +158,19 @@ public class ComProjectTaskDTO extends BaseDTO {
     @ApiModelProperty(value = "项目结束时间", position = 11 )
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date projEnd;
-    /** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过,请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
-    @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过,请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7 )
-    private Integer projState;
+
+    /** 项目总经费(万元) */
+    @ApiModelProperty(value = "项目总经费(万元)", position = 39)
+    private BigDecimal totalFunding;
+    /** 申请科技经费(万元) */
+    @ApiModelProperty(value = "申请科技经费(万元)", position = 40)
+    private BigDecimal govFunding;
+    /** 自筹 */
+    @ApiModelProperty(value = "自筹", position = 42)
+    private BigDecimal selfFunding;
+    /** 其他 */
+    @ApiModelProperty(value = "其他", position = 43)
+    private BigDecimal otherFunding;
 
     /** 单位id */
     @ApiModelProperty(value = "单位id", position = 41)
@@ -146,6 +178,9 @@ public class ComProjectTaskDTO extends BaseDTO {
     /** 单位名称 */
     @ApiModelProperty(value = "单位名称", position = 41)
     private String appUnitName;
+    /** 注册单位类型 */
+    @ApiModelProperty(value = "注册单位类型", position = 12)
+    private String unitTypeName;
 
     /** 人员Id */
     @ApiModelProperty(value = "人员Id", position = 41)
@@ -154,18 +189,48 @@ public class ComProjectTaskDTO extends BaseDTO {
     @ApiModelProperty(value = "姓名", position = 41)
     private String appPersonName;
     /** 性别 */
-    @ApiModelProperty(value = "性别", position = 8)
+    @ApiModelProperty(value = "性别", position = 3)
     private String sex;
+    /** 出生年月 */
+    @ApiModelProperty(value = "出生年月", position = 3)
+    private Date birthday;
+    /** 证件号 */
+    @ApiModelProperty(value = "证件号", position = 3)
+    private String certId;
+    /** 邮箱 */
+    @ApiModelProperty(value = "邮箱", position = 15)
+    private String email;
+    /** 电话号码 */
+    @ApiModelProperty(value = "电话号码", position = 16)
+    private String mobile;
+    /** 地址 */
+    @ApiModelProperty(value = "地址", position = 3)
+    private String address;
+    /** 民族 */
+    @ApiModelProperty(value = "民族", position = 3)
+    private String nationName;
+    /** 职称 */
+    @ApiModelProperty(value = "职称", position = 3)
+    private String titleName;
+    /** 职务 */
+    @ApiModelProperty(value = "职务", position = 12)
+    private String dutyName;
+    /** 学位 */
+    @ApiModelProperty(value = "学位", position = 8)
+    private String degreeName;
+    /** 学历 */
+    @ApiModelProperty(value = "学历", position = 8)
+    private String educationName;
+    /** 工作单位 */
+    @ApiModelProperty(value = "工作单位", position = 8)
+    private String jobUnit;
+    /** 专业 */
+    @ApiModelProperty(value = "专业", position = 8)
+    private String specName;
     /** 出生年 */
     @ApiModelProperty(value = "出生年", position = 8)
     private String birthYear;
     /** 联系电话 */
     @ApiModelProperty(value = "联系电话", position = 8)
     private String phone;
-    /** 学位 */
-    @ApiModelProperty(value = "学位", position = 8)
-    private String degreeName;
-    /** 职称 */
-    @ApiModelProperty(value = "职称", position = 3)
-    private String titleName;
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTaskQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTaskQueryVO.java
index 98e426e6355a73c0da96e3d02040648ac6a927dd..d31f2d6616e6c7eceedeab259afa09f5f3277a6b 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTaskQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTaskQueryVO.java
@@ -89,12 +89,22 @@ public class ComProjectTaskQueryVO extends PaginationVO{
     @ApiModelProperty(value = "银行联行号", position = 1 )
     @Length(max=50, message = "银行联行号不能大于50")
     private String interbankNumber;
-
-
     /** 所属我省重点领域 */
     @ApiModelProperty(value = "所属我省重点领域", position = 13 )
     @Length(max=50, message = "所属我省重点领域不能大于50")
     private String keyAreas;
+    /** 电话 */
+    @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 = 8 )
+    @Length(max=300, message = "项目分工不能大于300")
+    private String projWork;
     /** 项目联系人姓名 */
     @ApiModelProperty(value = "项目联系人姓名", position = 16)
     @Length(max=100, message = "项目联系人姓名不能大于100")
@@ -114,6 +124,18 @@ public class ComProjectTaskQueryVO extends PaginationVO{
     /** 是否科技报告 0 否 1 是 */
     @ApiModelProperty(value = "是否科技报告", position = 1 )
     private Integer isTechnologyReport;
+    /** 立项报告 */
+    @ApiModelProperty(value = "立项报告", position = 2 )
+    private Integer projectReport;
+    /** 进展报告 */
+    @ApiModelProperty(value = "进展报告", position = 2 )
+    private Integer progressReport;
+    /** 专题报告 */
+    @ApiModelProperty(value = "专题报告", position = 2 )
+    private Integer specialReport;
+    /** 最终报告 */
+    @ApiModelProperty(value = "最终报告", position = 2 )
+    private Integer finalReport;
 
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 1 )
diff --git a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java
index ca5f2d31e936ca929d5c403cb8eb5f3c852489d6..7b4b87cb8c61a73773470e7f77dd398ae601085a 100644
--- a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java
+++ b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java
@@ -110,25 +110,6 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
         return ResponseDataModel.ok(comProjectService.getNewProject(projType));
     }
 
-    @ApiOperation(value = "根据id获取项目基本信息", httpMethod = "GET", notes = "根据id获取项目基本信息")
-    @GetMapping
-    @RequestMapping("/getProjectBasicInfoById")
-    public ResponseDataModel<ComProjectDTO> getProjectBasicInfoById(@Validated String id) {
-        ComProjectDTO dto = comProjectService.getProjectBasicInfoById(id);
-
-        ComProjectTask task = new ComProjectTask();
-        task.setProjId(dto.getId());
-        task = comProjectTaskService.getEntity(task);
-
-        if (null != task) {
-            //任务书附件列表
-            List<ComFileDTO> fileList = comFileService.getListByObjectId(task.getId(), CommonEnum.fileType.projectTask.getCode());
-            if (null != fileList)
-                dto.setFileList(fileList);
-        }
-        return ResponseDataModel.ok(dto);
-    }
-
     /**
      * 保存项目信息
      *
diff --git a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java
index 1b8201a823eb06891793ce706db9adbc0d039fe3..0ea772454ea3e094ca677d101495346f11dada31 100644
--- a/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java
+++ b/science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java
@@ -78,6 +78,18 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
         return ResponseDataModel.ok(ComProjectTaskService.getCount(vo));
     }
 
+    /**
+     * 根据id获取任务书信息
+     *
+     * @param id
+     */
+    @ApiOperation(value = "根据id获取项目信息", httpMethod = "GET", notes = "根据id获取项目信息")
+    @GetMapping
+    @RequestMapping("/getTaskByProjId")
+    public ResponseDataModel<ComProjectTaskDTO> getTaskByProjId(String id) {
+        return ResponseDataModel.ok(ComProjectTaskService.getTaskByProjId(id));
+    }
+
     /**
      * 保存任务书信息
      *
@@ -92,18 +104,6 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
         return ResponseDataModel.ok(ComProjectTaskService.save(dto));
     }
 
-    /**
-     * 根据id获取任务书信息
-     *
-     * @param projId 查询条件
-     */
-    @ApiOperation(value = "根据id获取项目信息", httpMethod = "GET", notes = "根据id获取项目信息")
-    @GetMapping
-    @RequestMapping("/getTestInfoByProjId")
-    public ResponseDataModel<ComProjectTaskDTO> getTestInfoByProjId(String projId) {
-        return ResponseDataModel.ok(ComProjectTaskService.getTestInfoById(projId));
-    }
-
     /**
      * 项目/任务书/中期考核表上报
      */
@@ -142,23 +142,4 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
         return ResponseDataModel.ok(list);
     }
 
-    @ApiOperation(value = "根据项目id获取任务书附件列表", httpMethod = "GET", notes = "根据项目id获取任务书附件列表")
-    @GetMapping
-    @RequestMapping("/getTaskFileList")
-    public ResponseDataModel<List<ComFileDTO>> getTaskFileList(String projId) {
-        return ResponseDataModel.ok(ComProjectTaskService.getTaskFileList(projId));
-    }
-
-    @ApiOperation(value = "任务书文件上传", httpMethod = "POST", notes = "文件上传")
-    @PostMapping("/asyncUploadTaskFile")
-    public ResponseDataModel<ComDownloadDTO> asyncUploadTaskFile(@RequestParam("file") MultipartFile file, @RequestParam @NotBlank String projId) {
-        return ResponseDataModel.ok(ComProjectTaskService.asyncUploadTaskFile(file, projId));
-    }
-
-    @ApiOperation(value = "删除任务书文件", httpMethod = "DELETE", notes = "删除任务书文件")
-    @DeleteMapping(value = "deleteTaskFile/{id}")
-    @Logs(value = CommonEnum.logType.fileDelete)
-    public ResponseDataModel<String> deleteTaskFile(@PathVariable String id) {
-        return ResponseDataModel.ok(ComProjectTaskService.deleteTaskFile(id));
-    }
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
index a763626b74f87a5c2f6fb8cf02f9e33fe51f096a..4faea69d10a6c62b5007720390661983c45b1315 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
@@ -125,5 +125,4 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
      */
     List<ProjectImportDTO> projectImport(List<ProjectImportDTO> list) throws IOException;
 
-    ComProjectDTO getProjectBasicInfoById(String id);
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectTaskService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectTaskService.java
index bff938f0e6473e0127158b670ad2b2ce2c734cfa..fe37a4850acb2d25f76cf72c1ad1ac0a4113656c 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectTaskService.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectTaskService.java
@@ -18,12 +18,24 @@ import java.util.List;
  * @version 2021-08-26
  */
 public interface ComProjectTaskService extends BaseService<ComProjectTaskQueryVO, ComProjectTaskDTO,ComProjectTask> {
+    /**
+     * 获取统计数据
+     *
+     * @return
+     */
+    DataStatisticsDTO getCount(ComProjectTaskQueryVO e);
     /** 根据id更新状态
      *
      * @param id
      * @param state
      */
     void updateState(String id,Integer state);
+    /** 根据id获取任务书信息
+     *
+     * @param id
+     * @return
+     */
+    ComProjectTaskDTO getTaskByProjId(String id);
     /**
      * 保存任务书信息
      *
@@ -31,13 +43,6 @@ public interface ComProjectTaskService extends BaseService<ComProjectTaskQueryVO
      * @return
      */
     String save(ComProjectTaskDTO ComProjectTaskDTO);
-
-    /** 根据id获取任务书信息
-     *
-     * @param id
-     * @return
-     */
-    ComProjectTaskDTO getTestInfoById(String id);
     /** 项目/任务书/中期考核上报
      *
      * @param comProjectAudit
@@ -54,16 +59,5 @@ public interface ComProjectTaskService extends BaseService<ComProjectTaskQueryVO
      * @return
      */
     void audit(ComProjectAudit comProjectAudit, String unitId, String treeCode);
-    /**
-     * 获取统计数据
-     *
-     * @return
-     */
-    DataStatisticsDTO getCount(ComProjectTaskQueryVO e);
-
-    List<ComFileDTO> getTaskFileList(String projId);
-
-    ComDownloadDTO asyncUploadTaskFile(MultipartFile file, String projId);
 
-    String deleteTaskFile(String id);
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
index 40d730f51fceb9907ea1150242d6e9578ee6c8bd..04f510929548b7c3d86cfb25805fb0d3cc7d4202 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
@@ -964,10 +964,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         if (null != p) {
             String strDateFormat = p.getProjType().equals(1) ? "yyyy-MM-dd HH:mm:ss" : "yyyy-MM-dd";
             SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
-            if (null != p.getStartDate())
-                p.setStartDateStr(sdf.format(p.getStartDate()));
-            if (null != p.getEndDate())
-                p.setEndDateStr(sdf.format(p.getEndDate()));
             p.getMembers().forEach((e) -> {
 //              e.setAge(IDCardUtil.getAge(e.getCertId()));
                 e.setSex(IDCardUtil.getSex(e.getCertId()));
@@ -1169,17 +1165,4 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 //        excelUtils.writeExcel2(list);
         return list;
     }
-
-    public ComProjectDTO getProjectBasicInfoById(String id) {
-        ComProjectDTO dto = comProjectDAO.getById(id);
-        if (null == dto)
-            throw new BusinessException("项目不存在或已删除!");
-        // 申报人
-        ComPersonDTO comPersonDTO = comPersonService.getPersonById(dto.getAppPersonId());
-        if (null != comPersonDTO) {
-            loadPersonInfo(dto, comPersonDTO);
-        }
-
-        return dto;
-    }
 }
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
index b097fda74feb07c2f62cfdf40c375ae78e64dc49..ab5f7b794dff7c8b493a2c8e19508a55a3d3e58b 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
@@ -130,6 +130,13 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 
+    @Override
+    public DataStatisticsDTO getCount(ComProjectTaskQueryVO e) {
+        QueryWrapper criteria = new QueryWrapper();
+        setCriteriaForQuery(e, criteria);
+        return ComProjectTaskDAO.getCount(criteria);
+    }
+
     @Override
     public void updateState(String id, Integer state) {
         ComProjectTask ComProjectTask = new ComProjectTask();
@@ -138,36 +145,41 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
         this.update(ComProjectTask);
     }
 
-    public ComProjectTaskDTO getTestInfoById(String projectId) {
-        ComProjectTaskDTO test = getByProjectId(projectId);
-        if (null == test)
-            test = new ComProjectTaskDTO();
-        ComProjectDTO comProject = ComProjectService.dtoById(projectId);
-        if (null == comProject)
-            throw new BusinessException("项目不存在");
-        return test;
+    public ComProjectTaskDTO getTaskByProjId(String projId) {
+        ComProjectTaskDTO dto =ComProjectTaskDAO.getByProjId(projId);
+        //申报单位
+        ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
+        if (null != comUnitDTO) {
+            dto.setAppUnitName(comUnitDTO.getUnitName());
+        }
+        // 申报人
+        ComPersonDTO comPersonDTO = comPersonService.getPersonById(dto.getAppPersonId());
+        if (null != comPersonDTO) {
+            loadPersonInfo(dto, comPersonDTO);
+        }
+        return dto;
+    }
+
+    private void loadPersonInfo(ComProjectTaskDTO dto, ComPersonDTO comPersonDTO) {
+        dto.setAppPersonName(comPersonDTO.getPersonName());
+        dto.setCertId(comPersonDTO.getCertId());
+        dto.setSex(comPersonDTO.getSex());
+        dto.setBirthday(comPersonDTO.getBirthday());
+        dto.setNationName(comPersonDTO.getNationName());
+        dto.setDegreeName(comPersonDTO.getDegreeName());
+        dto.setTitleName(comPersonDTO.getTitleName());
+        dto.setDutyName(comPersonDTO.getDuty());
+        dto.setSpecName(comPersonDTO.getSpecName());
+        dto.setMobile(comPersonDTO.getMobile());
+        dto.setEmail(comPersonDTO.getEmail());
     }
 
     @Override
     public String save(ComProjectTaskDTO dto) {
-        ComProjectTaskDTO test = getByProjectId(dto.getProjId());
-
+        ComProjectTaskDTO task = ComProjectTaskDAO.getByProjId(dto.getProjId());
         return dto.getId();
     }
 
-    private List<ComProjectStageGoalDTO> resetTaskContent
-            (List<ComProjectStageGoalDTO> list1, List<ComProjectStageGoalDTO> list2) {
-        for (ComProjectStageGoalDTO p : list2)
-            list1.add(p);
-        return list1;
-    }
-
-    public ComProjectTaskDTO getByProjectId(String projId) {
-        ComProjectTask ComProjectTask = new ComProjectTask();
-        ComProjectTask.setProjId(projId);
-        return this.getDto(ComProjectTask);
-    }
-
     @Transactional
     @Override
     public void report(ComProjectAudit model, String unitId, String treeCode) {
@@ -203,77 +215,4 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
             this.update(test);
     }
 
-    @Override
-    public DataStatisticsDTO getCount(ComProjectTaskQueryVO e) {
-        QueryWrapper criteria = new QueryWrapper();
-        setCriteriaForQuery(e, criteria);
-        return ComProjectTaskDAO.getCount(criteria);
-    }
-
-    public List<ComFileDTO> getTaskFileList(String projId) {
-        ComProject project = ComProjectService.getById(projId);
-        if (null == project)
-            return null;
-
-        ComProjectTask task = new ComProjectTask();
-        task.setProjId(projId);
-        task = this.getEntity(task);
-        if (null == task)
-            return null;
-
-        List<ComFileDTO> fileList = comFileService.getListByObjectId(task.getId(), CommonEnum.fileType.projectTask.getCode());
-
-        return fileList;
-    }
-
-    @Transactional
-    public ComDownloadDTO asyncUploadTaskFile(MultipartFile file, String projId) {
-        ComDownload download = comDownloadService.asyncUpload(file);
-
-        if (null == download)
-            return null;
-
-        ComDownloadDTO dto = comDownloadService.convertEntity2DTO(download);
-
-        ComProject project = ComProjectService.getById(projId);
-
-        ComProjectTask task = new ComProjectTask();
-        task.setProjId(projId);
-        task = this.getEntity(task);
-        if (null == task) {
-            task = new ComProjectTask();
-            task.setTaskState(1);
-            task.setReportYear(project.getReportYear());
-            task.setProjId(projId);
-            task.setStartDate(project.getStartDate());
-            task.setEndDate(project.getEndDate());
-            String taskId = this.insert(task);
-            task.setId(taskId);
-        }
-
-        ComFile taskFile = new ComFile();
-        taskFile.setFileType(40);
-        taskFile.setFileExplain("项目任务书");
-        taskFile.setShowIndex(1);
-        taskFile.setObjectId(task.getId());
-        taskFile.setDownloadId(download.getId());
-        comFileService.insert(taskFile);
-
-        dto.setFileExplain(taskFile.getFileExplain());
-
-        return dto;
-    }
-
-    @Transactional
-    public String deleteTaskFile(String id) {
-        comDownloadService.delete(id);
-
-        ComFile taskFile = new ComFile();
-        taskFile.setDownloadId(id);
-        taskFile = comFileService.getEntity(taskFile);
-        if (null != taskFile) {
-            comFileService.delete(taskFile);
-        }
-        return id;
-    }
 }
\ No newline at end of file
diff --git a/science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml b/science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml
index f069ee76ea340959fb17ed01d2f2222cba3c44e4..f129ebe44da7866fc9f2146ac0f04584b56fdddf 100644
--- a/science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml
+++ b/science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml
@@ -4,10 +4,7 @@
 <!-- 任务书表 -->
 <mapper namespace="com.yiboshi.science.dao.ComProjectTaskDAO">
     <sql id="allColumns">
-        t
-        .
-        id
-        as id, t.proj_id as projId, t.report_year as reportYear, t.task_state as taskState, t.end_date as endDate, t.created as created, t.updated as updated
+        t.id as id, t.proj_id as projId, t.report_year as reportYear, t.task_state as taskState, t.end_date as endDate, t.created as created, t.updated as updated
     </sql>
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectTaskDTO">
         select b.id,ifnull(b.task_state,0) task_state,b.start_date,b.end_date,
@@ -32,4 +29,27 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getByProjId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectTaskDTO">
+        SELECT ifnull(pt.task_state,0) task_state,
+               pt.report_year,pt.start_date,pt.end_date,pt.unit_type,pt.organization_code,pt.unit_address,pt.registered_address,pt.post_code,
+               pt.legal_person,pt.workforce,pt.specialized_personnel,pt.research_personnel,
+               pt.deposit_bank,pt.bank_account,pt.deposit_bank_address,pt.interbank_number,
+               pt.key_areas,pt.proj_work,pt.telephone,pt.fax,
+               pt.link_name,pt.link_mobile,pt.link_fax,pt.link_email,
+               pt.is_technology_report,pt.project_report,pt.progress_report,pt.special_report,pt.final_report,
+               a.proj_name,a.proj_no,a.start_date projStart,a.end_date projEnd,a.app_person_id,a.app_unit_id,
+               b.name knowledge_name,
+               ic.proj_id,ic.job_time,ic.main_research_areas,ic.address,
+               ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords,
+               ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,
+               ic.research_content,ic.technology_target, ic.economy_target, ic.achievement_target, ic.technology_reports_target, ic.other_target,
+               ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal,
+               c.id download_id,c.download_url,c.file_name
+        from com_project a
+        left join com_project_task pt on pt.proj_id=a.id
+        left join com_project_basic ic on a.id=ic.proj_id
+        left join system_parameter b on a.knowledge_id=b.id and b.type_id=68
+        left join com_download c on ic.file_id=c.id
+        where a.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file