xujun

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

@@ -203,6 +203,12 @@ public class ComProjectAuditDTO extends BaseDTO {
     /** 审核结果 */
     @ApiModelProperty(value = "单位名称", position = 41)
     private String auditResultName;
+    /** 项目总经费(万元） */
+    @ApiModelProperty(value = "项目总经费(万元）", position = 39)
+    private BigDecimal totalFunding;
+    /** 申请科技经费(万元) */
+    @ApiModelProperty(value = "申请科技经费(万元)", position = 40)
+    private BigDecimal govFunding;
     /** 项目分配信息 */
     List<ComProjectAssignDTO> assignList;
     /** 批量审核Id */

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

@@ -21,10 +21,11 @@
         SELECT
         a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.knowledge_id,
         c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,
-        d.unit_name app_unit_name,e.person_name app_person_name,p.name as knowledgeName,p1.name as knowledgeParentName,
+        d.unit_name app_unit_name,e.person_name app_person_name,p.name as knowledgeName,p1.name as knowledgeParentName, f.total_funding, f.gov_funding,
         (case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
         FROM com_project_audit a
         left join com_project c on a.audit_object_id=c.id
+        left join com_project_basic f on c.id = f.proj_id
         left join com_unit d on c.app_unit_id=d.id
         left join com_unit g on substring(d.tree_code, 1, 10) = g.tree_code
         left join com_person e on c.app_person_id=e.id