1

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

@@ -154,8 +154,6 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
     public void export(@PathVariable String id) throws DocumentException, IOException {
         try {
             ComProjectTaskDTO dto = ComProjectTaskService.getTaskByProjId(id);
-            List<ComFileDTO> fileList=dto.getFileList().stream().filter(s->s.getFileExplain().equals("课题组成员签名表")||s.getFileExplain().equals("经费预算书")).collect(Collectors.toList());
-            dto.setFileList(fileList);
             List<SystemParameter> list = systemParameterService.getListByType(67);
 //          WordUtils.getHtmlContent(dto, "C:\\Users\\kylin\\Desktop\\导出Pdf\\output.docx");
             // 生成PDF文件字节数组

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

@@ -157,7 +157,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
 
     public ComProjectTaskDTO getTaskByProjId(String projId) {
         ComProjectTaskDTO dto = ComProjectTaskDAO.getByProjId(projId);
-        if (Objects.nonNull(dto.getReportYear())) {
+        if (Objects.isNull(dto.getReportYear())) {
             dto.setReportYear(DateUtils.getYear());
         }
         BigDecimal total = new BigDecimal(0);

science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml

@@ -8,7 +8,7 @@
     </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,
-               c.id as proj_id,c.proj_name,c.proj_no,c.version_no,c.proj_class,c.report_year,c.start_date proj_start,c.end_date proj_end,
+               c.id as proj_id,c.proj_name,c.proj_no,c.version_no,c.proj_class,b.report_year,c.start_date proj_start,c.end_date proj_end,
                c.proj_state,d.unit_name app_unit_name,e.person_name app_person_name
         from com_project c
         left join com_project_task b on b.proj_id=c.id