xujun

science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java

@@ -63,7 +63,7 @@ public class ComPerson extends BaseEntity {
     /** 最高学位授予单位 */
     @ApiModelProperty(value = "最高学位授予单位", position = 9)
     @Length(max=200, message = "最高学位授予单位")
-    private Date degreeUnit;
+    private String degreeUnit;
     /** 是否为研究生导师 */
     @ApiModelProperty(value = "是否为研究生导师", position = 8)
     @Length(max=120, message = "是否为研究生导师不能大于120")

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

@@ -46,6 +46,19 @@ public class ComPersonDTO extends BaseDTO {
     /** 学位 */
     @ApiModelProperty(value = "学位", position = 9)
     private String degree;
+    /** 最高学位授予时间 */
+    @ApiModelProperty(value = "最高学位授予时间", position = 6)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date degreeTime;
+    /** 最高学位授予单位 */
+    @ApiModelProperty(value = "最高学位授予单位", position = 9)
+    private String degreeUnit;
+    /** 是否为研究生导师 */
+    @ApiModelProperty(value = "是否为研究生导师", position = 8)
+    private String graduateTeacher;
+    /** 党派 */
+    @ApiModelProperty(value = "党派", position = 9)
+    private String politicalParty;
     /** 学历 */
     @ApiModelProperty(value = "学历", position = 10)
     private String education;

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

@@ -18,7 +18,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        order by a.group_name asc,a.display_order asc
+        order by a.display_order asc
     </select>
 
     <select id="getAssignExpertList" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">