Merge remote-tracking branch 'origin/master'

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

@@ -36,11 +36,19 @@ public class ComProjectGroupDetailDTO extends BaseDTO {
     @Length(max=100, message = "项目编号不能大于100")
     private String projNo;
 
+    /** 申请编号 */
+    @ApiModelProperty(value = "申请编号", position = 2 )
+    private String appNo;
+
     /** 项目名称 */
     @ApiModelProperty(value = "项目名称", position = 5)
     @Length(max=150, message = "项目名称不能大于150")
     private String projName;
 
+    /** 项目类别  1 一般项目  2重点项目 */
+    @ApiModelProperty(value = "项目类别", position = 1 )
+    private Integer projClass;
+
     /** 学科 */
     @ApiModelProperty(value = "学科", position = 6)
     private String knowledgeName;
@@ -62,3 +70,4 @@ public class ComProjectGroupDetailDTO extends BaseDTO {
 
     private String description;
 }
+

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

@@ -21,7 +21,8 @@
     </select>
 
     <select id="getProjectDetailListbyPage" resultType="com.yiboshi.science.param.dto.ComProjectGroupDetailDTO">
-        select a.*, b.proj_no, b.proj_name, d.name as knowledge_name, c.cert_id, c.person_name from com_project_group_detail a
+        select a.*, b.proj_no, b.app_no, b.proj_class, b.proj_name, d.name as knowledge_name, c.cert_id, c.person_name
+        from com_project_group_detail a
         left join com_project b on a.proj_id = b.id
         left join com_person c on b.app_person_id = c.id
         left join system_parameter d on b.knowledge_id = d.id
@@ -41,4 +42,5 @@
             #{item}
         </foreach>
     </select>
+    
 </mapper>
\ No newline at end of file