xujun

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

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

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

@@ -6,8 +6,8 @@
         t.id as id, t.expert_id as expertId, t.proj_id as projId, t.assign_year as assignYear, t.total_score as gradeScore, t.remark as remark, t.created as created, t.updated as updated
     </sql>
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
-        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name
-               ,d.name education_name,e.name title_name,f.proj_name,f.app_no,f.proj_no,f.proj_class,h.total_funding
+        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name,d.name education_name,
+                e.name title_name,f.proj_name,f.app_no,f.proj_no,f.proj_class,h.total_funding, i.unit_name as app_unit_name, k.group_name
         FROM com_project_assign a
         LEFT JOIN com_expert b ON a.expert_id = b.id
         LEFT JOIN com_person c ON b.person_id = c.id
@@ -16,6 +16,9 @@
         left join system_parameter e on c.title=e.id and e.type_id=7
         left join com_project f on a.proj_id=f.id
         left join com_project_basic h on f.id = h.proj_id
+        left join com_unit i on f.app_unit_id = i.id
+        left join com_project_group_detail j on f.id = j.proj_id
+        left join com_project_group k on j.group_id = k.id
         <where>
             ${ew.sqlSegment}
         </where>