xujun

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

@@ -38,6 +38,14 @@ public class ComTalentGroupDetailDTO extends BaseDTO {
     @ApiModelProperty(value = "申报人Id", position = 5)
     private String appPersonId;
 
+    /** 人才类别Id */
+    @ApiModelProperty(value = "人才类别Id", position = 5)
+    private String talentCategory;
+
+    /** 人才类别名称 */
+    @ApiModelProperty(value = "人才类别名称", position = 5)
+    private String talentCategoryName;
+
     /** 姓名 */
     @ApiModelProperty(value = "姓名", position = 4)
     private String personName;
@@ -62,6 +70,18 @@ public class ComTalentGroupDetailDTO extends BaseDTO {
     @ApiModelProperty(value = "申报单位名称", position = 7)
     private String appUnitName;
 
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号", position = 13)
+    private String mobile;
+
+    /** 专业Id */
+    @ApiModelProperty(value = "专业Id", position = 5)
+    private String spec;
+
+    /** 专业名称 */
+    @ApiModelProperty(value = "专业名称", position = 5)
+    private String specName;
+
     private String key;
     private String title;
     private String description;

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

@@ -12,6 +12,7 @@ import com.yiboshi.science.param.query.ComProjectGroupDetailQueryVO;
 import com.yiboshi.science.param.query.ComTalentApplyQueryVO;
 import com.yiboshi.science.param.query.ComTalentGroupDetailQueryVO;
 import com.yiboshi.science.service.ComTalentGroupDetailService;
+import com.yiboshi.science.service.SystemParameterService;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,9 @@ public class ComTalentGroupDetailServiceImpl extends BaseServiceImpl<ComTalentGr
     @Autowired
     private ComTalentGroupDetailDAO comTalentGroupDetailDAO;
 
+    @Autowired
+    private SystemParameterService systemParameterService;
+
     @Override
     protected void setCriteriaForQuery(ComTalentGroupDetailQueryVO vo, QueryWrapper<ComTalentGroupDetailQueryVO> criteria) {
         if (Objects.nonNull(vo.getGroupId())) {
@@ -70,6 +74,12 @@ public class ComTalentGroupDetailServiceImpl extends BaseServiceImpl<ComTalentGr
         setCriteriaForQuery(vo, criteria);
         Page<ComTalentGroupDetailQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());
         List<ComTalentGroupDetailDTO> dtoList = comTalentGroupDetailDAO.getTalentDetailListbyPage(page, criteria).getRecords();
+        dtoList.forEach(e -> {
+            if (Objects.nonNull(e.getSpec()))
+                e.setSpecName(systemParameterService.getParameterById(e.getSpec()).getName());
+            if (Objects.nonNull(e.getTalentCategory()))
+                e.setTalentCategoryName(systemParameterService.getParameterById(e.getTalentCategory()).getName());
+        });
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }
 

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

@@ -17,14 +17,16 @@
     </select>
 
     <select id="getAssignExpertList" resultType="com.yiboshi.science.param.dto.ComTalentGroupAssignDTO">
-        select a.*, c.person_name as expertName, c.cert_id, c.sex, c.work_unit, c.mobile, c.email from com_talent_group_assign a
+        select a.*, c.person_name as expertName, c.cert_id as expertCertId, c.sex, c.work_unit, c.mobile, c.email, d.unit_name
+            from com_talent_group_assign a
             LEFT JOIN com_expert b ON a.expert_id = b.id
             LEFT JOIN com_person c ON b.person_id = c.id
+            left join com_unit d on c.unit_id = d.id
         where a.group_id = #{groupId} order by created
     </select>
 
     <select id="getAssignGroupExpertById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComTalentGroupAssignDTO">
-        SELECT a.*, c.person_name as expertName,c.cert_id as expertCertId,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,
+        SELECT a.*, c.person_name as expertName,c.cert_id as expertCertId,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,c.spec,
                g.unit_name,d.name education_name,e.name title_name,f.group_name
         FROM com_talent_group_assign a
                  LEFT JOIN com_expert b ON a.expert_id = b.id

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

@@ -22,7 +22,7 @@
     </select>
 
     <select id="getTalentDetailListbyPage" resultType="com.yiboshi.science.param.dto.ComTalentGroupDetailDTO">
-        select a.*, b.app_unit_id, f.unit_name as app_unit_name, d.name as specName, c.cert_id, c.person_name, c.birthday, c.sex, c.mobile
+        select a.*, b.app_unit_id, f.unit_name as app_unit_name, d.name as specName, b.talent_category, c.cert_id, c.person_name, c.birthday, c.sex, c.mobile
         from com_talent_group_detail a
         left join com_talent_apply b on a.talent_id = b.id
         left join com_person c on b.person_id = c.id