Merge remote-tracking branch 'origin/master'

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

@@ -175,6 +175,9 @@ public class ComProjectAssignDTO extends BaseDTO {
     /** 项目组名称 */
     @ApiModelProperty(value = "项目组名称", position = 1)
     private String groupName;
+    /** 学科 */
+    @ApiModelProperty(value = "学科", position = 16)
+    private String knowledgeName;
     /** 评审专业 */
     @ApiModelProperty(value = "评审专业", position = 13)
     private List<ComExpertSpecDTO> specList;

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAssignServiceImpl.java

@@ -94,6 +94,9 @@ public class ComProjectAssignServiceImpl extends BaseServiceImpl<ComProjectAssig
         setCriteriaForQuery(vo, criteria);
         Page<ComProjectAssignQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());
         List<ComProjectAssignDTO> dtoList = comProjectAssignDAO.getListByPage(page, criteria).getRecords();
+        dtoList.forEach(e -> {
+            e.setSpecList(comExpertSpecService.getListByExpertId(e.getExpertId()));
+        });
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 

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

@@ -7,7 +7,8 @@
     </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, i.unit_name as app_unit_name, k.group_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, l.person_name as app_person_name, m.name as knowledge_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
@@ -19,6 +20,8 @@
         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
+        left join com_person l ON f.app_person_id = l.id
+        left join system_parameter m on f.knowledge_id=m.id and m.type_id=68
         <where>
             ${ew.sqlSegment}
         </where>