1

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

@@ -54,11 +54,31 @@ public class ComTalentAssignDTO extends BaseDTO {
     @ExcelProperty("人才类别名称")
     @ApiModelProperty(value = "人才类别名称", position = 3)
     private String talentCategoryName;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 11 )
+    @Length(max=36, message = "现从事专业不能大于36")
+    private String profession;
+    /** 现从事专业 */
+    @ApiModelProperty(value = "现从事专业", position = 40)
+    private String professionName;
+    /** 职称 */
+    @ApiModelProperty(value = "职称", position = 13)
+    private String title;
+    /** 职称名称 */
+    @ApiModelProperty(value = "职称名称", position = 13)
+    private String titleName;
+    /** 专业Id */
+    @ApiModelProperty(value = "专业Id", position = 5)
+    private String spec;
+    /** 专业名称 */
+    @ApiModelProperty(value = "专业名称", position = 5)
+    private String specName;
     /** 申报单位 */
     @ExcelProperty("申报单位")
     @ApiModelProperty(value = "人才类别名称", position = 3)
     private String appUnitName;
 
+
     /** 专家证件号 */
     @ExcelProperty("专家证件号")
     @ApiModelProperty(value = "专家证件号", position = 1)
@@ -69,41 +89,32 @@ public class ComTalentAssignDTO extends BaseDTO {
     private String expertName;
     /** 专家电话号码 */
     @ApiModelProperty(value = "专家电话号码", position = 10)
-    private String mobile;
+    private String expertMobile;
     /** 专家性别 */
     @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")
-    private String profession;
-    /** 现从事专业 */
-    @ApiModelProperty(value = "现从事专业", position = 40)
-    private String professionName;
+    private String expertSex;
     /** 职称 */
     @ApiModelProperty(value = "职称", position = 13)
-    private String title;
+    private String expertTitle;
     /** 职称名称 */
     @ApiModelProperty(value = "职称名称", position = 13)
-    private String titleName;
+    private String expertTitleName;
     /** 专家所属单位 */
     @ApiModelProperty(value = "专家所属单位", position = 13)
     private String expertUnitName;
+    /** 评审专业 */
+    @ApiModelProperty(value = "评审专业", position = 13)
+    private List<ComExpertSpecDTO> specList;
+
+
     /** 评审状态 */
     @ApiModelProperty(value = "评审状态", position =10)
     private String stateName;
+
     /** 人才分组名称 */
     @ApiModelProperty(value = "人才分组名称", position =10)
     private String groupName;
-    /** 评审专业 */
-    @ApiModelProperty(value = "评审专业", position = 13)
-    private List<ComExpertSpecDTO> specList;
+
     /** 评分列表 */
     @ApiModelProperty(value = "评分列表", position = 13)
     private List<ComEvaluationValueDTO> scoreList;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComTalentAssignController.java

@@ -64,6 +64,7 @@ public class ComTalentAssignController extends BaseController<ComTalentAssignSer
                 e.setTalentCategoryName(systemParameterService.getParaName(e.getTalentCategory()));
                 e.setTitleName(systemParameterService.getParaName(e.getTitle()));
                 e.setProfessionName(systemParameterService.getParaName(e.getProfession()));
+                e.setExpertTitleName(systemParameterService.getParaName(e.getExpertTitle()));
             });
         }
         return ResponseDataModel.ok(page);

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

@@ -6,7 +6,7 @@
         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 as expert_name,c.cert_id as expert_cert_id,c.sex expert_sex,
+        SELECT  a.*,c.person_name as expert_name,c.cert_id as expert_cert_id,c.sex expert_sex,c.title expert_title,c.mobile expert_mobile,
                 e.talent_category,
                 g.unit_name expert_unit_name,
                 f.cert_id, f.person_name, f.sex, f.mobile, f.duty, f.title, f.profession,