xujun

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

@@ -199,6 +199,10 @@ public class ComProjectAuditDTO extends BaseDTO {
     /** 计算得分 */
     @ApiModelProperty(value = "计算得分", position = 4)
     private BigDecimal calculateScore;
+    /** 答辩分数 */
+    @ApiModelProperty(value = "答辩分数", position = 4)
+    private BigDecimal defenseScore;
+
     /** 评分 */
     @ApiModelProperty(value = "评分", position = 4)
     private String gradeScore;

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

@@ -20,7 +20,7 @@
     <select id="getProjectAuditListByPage"  resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
         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,
+        c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,c.defense_score,
         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