xujun

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

@@ -166,6 +166,9 @@ public class ComProjectAssignDTO extends BaseDTO {
     /** 项目类型  1 科研项目  2重点学科项目 */
     @ApiModelProperty(value = "项目名称", position = 1 )
     private Integer projType;
+    /** 项目类别  1 一般项目  2重点项目 */
+    @ApiModelProperty(value = "项目类别", position = 1 )
+    private Integer projClass;
     /** 评审专业 */
     @ApiModelProperty(value = "评审专业", position = 13)
     private List<ComExpertSpecDTO> specList;

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

@@ -41,7 +41,7 @@
     </select>
 
     <select id="getProjectAssignByGroupIdExpertId" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
-        select a.id as group_id, d.*, e.proj_no, e.proj_name from com_project_group a
+        select a.id as group_id, d.*, e.proj_no, e.app_no, e.proj_class, e.proj_name from com_project_group a
             left join com_project_group_detail b on a.id = b.group_id
             left join com_project_group_assign c on a.id = c.group_id
             left join com_project_assign d on b.proj_id = d.proj_id and c.expert_id = d.expert_id

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

@@ -28,7 +28,7 @@
         where a.proj_id = #{projectId}
     </select>
     <select id="getProjectAssignByGroupIdExpertId" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
-        select a.id as group_id, d.*, e.proj_no, e.proj_name from com_project_group a
+        select a.id as group_id, d.*, e.proj_no, e.app_no, e.proj_class, e.proj_name from com_project_group a
             left join com_project_group_detail b on a.id = b.group_id
             left join com_project_group_assign c on a.id = c.group_id
             left join com_project_assign d on b.proj_id = d.proj_id and c.expert_id = d.expert_id