xujun

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

@@ -40,8 +40,8 @@ public class ComTalentAssignDTO extends BaseDTO {
     @ExcelProperty("证件号")
     @ApiModelProperty(value = "证件号", position = 1)
     private String certId;
-    /** 姓名 */
-    @ExcelProperty("姓名")
+    /** 人才姓名 */
+    @ExcelProperty("人才姓名")
     @ApiModelProperty(value = "姓名", position = 3)
     private String personName;
     /** 人才类别Id */
@@ -52,12 +52,31 @@ public class ComTalentAssignDTO extends BaseDTO {
     @ExcelProperty("人才类别名称")
     @ApiModelProperty(value = "人才类别名称", position = 3)
     private String talentCategoryName;
-    /** 电话号码 */
-    @ApiModelProperty(value = "电话号码", position = 10)
+    /** 申报单位 */
+    @ExcelProperty("申报单位")
+    @ApiModelProperty(value = "人才类别名称", position = 3)
+    private String appUnitName;
+
+    /** 专家证件号 */
+    @ExcelProperty("专家证件号")
+    @ApiModelProperty(value = "专家证件号", position = 1)
+    private String expertCertId;
+    /** 专家姓名 */
+    @ExcelProperty("专家姓名")
+    @ApiModelProperty(value = "专家姓名", position = 3)
+    private String expertName;
+    /** 专家电话号码 */
+    @ApiModelProperty(value = "专家电话号码", position = 10)
     private String mobile;
-    /** 性别 */
-    @ApiModelProperty(value = "性别", position = 5)
+    /** 专家性别 */
+    @ApiModelProperty(value = "专家性别", position = 5)
     private String sex;
+    /** 专业Id */
+    @ApiModelProperty(value = "专业Id", position = 5)
+    private String spec;
+    /** 专业名称 */
+    @ApiModelProperty(value = "专业名称", position = 5)
+    private String specName;
     /** 现从事专业 */
     @ApiModelProperty(value = "现从事专业", position = 11 )
     @Length(max=36, message = "现从事专业不能大于36")
@@ -71,9 +90,15 @@ public class ComTalentAssignDTO extends BaseDTO {
     /** 职称名称 */
     @ApiModelProperty(value = "职称名称", position = 13)
     private String titleName;
+    /** 专家所属单位 */
+    @ApiModelProperty(value = "专家所属单位", position = 13)
+    private String expertUnitName;
     /** 评审状态 */
     @ApiModelProperty(value = "评审状态", position =10)
     private String stateName;
+    /** 人才分组名称 */
+    @ApiModelProperty(value = "人才分组名称", position =10)
+    private String groupName;
     /** 评审专业 */
     @ApiModelProperty(value = "评审专业", position = 13)
     private List<ComExpertSpecDTO> specList;

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

@@ -49,6 +49,9 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
     @Autowired
     private ComEvaluationValueService comEvaluationValueService;
 
+    @Autowired
+    private SystemParameterService systemParameterService;
+
     @Override
     protected void setCriteriaForQuery(ComTalentAssignQueryVO vo, QueryWrapper<ComTalentAssignQueryVO> criteria) {
         if (Objects.nonNull(vo.getExpertId())) {
@@ -88,6 +91,7 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
         List<ComTalentAssignDTO> dtoList = comTalentAssignDAO.getListByPage(page, criteria).getRecords();
         dtoList.forEach(e -> {
             e.setSpecList(comExpertSpecService.getListByExpertId(e.getExpertId()));
+            e.setTalentCategoryName(systemParameterService.getParameterById(e.getTalentCategory()).getName());
         });
         return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
     }

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

@@ -6,8 +6,8 @@
         t.id as id, t.expert_id as expertId, t.talent_id as talentId, 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.ComTalentAssignDTO">
-        SELECT  a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,c.work_unit,g.unit_name,d.name education_name,
-        e.name title_name,i.unit_name as app_unit_name,k.group_name, l.cert_id as appCertId,l.person_name as app_person_name, m.name as knowledge_name
+        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 as expertUnitName,d.name education_name,e.name title_name,k.group_name, l.cert_id,l.person_name,i.unit_name as app_unit_name,f.talent_category
         FROM com_talent_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,7 +19,6 @@
         left join com_talent_group_detail j on f.id = j.talent_id
         left join com_talent_group k on j.group_id = k.id
         left join com_person l ON f.person_id = l.id
-        left join system_parameter m on l.spec = m.id and m.type_id = 68
         <where>
             ${ew.sqlSegment}
         </where>