1

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

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

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

@@ -31,7 +31,7 @@
     </select>
     <select id="getByProjId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectTaskDTO">
         SELECT ifnull(pt.task_state,0) task_state,
-               pt.id,a.report_year,pt.start_date,pt.end_date,pt.unit_type,pt.organization_code,pt.unit_address,pt.registered_address,pt.post_code,
+               pt.id,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,