Browse Source

人事详情修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
67a6a105dc

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml

@@ -972,9 +972,9 @@
 	</if>
   </select>
   <select id="selectBypdId" resultType="com.goafanti.personnel.bo.OutPersonnelBo">
-  	select a.id,a.door_id doorId,a.name,a.status,a.`system`,a.company,dep.name depName,a.nation,a.marriage,a.job_nature jobNature,
+	select a.id,a.door_id doorId,a.name,a.status,a.`system`,a.company,dep.name depName,a.nation,a.marriage,a.job_nature jobNature,
 	a.job_nature_remarks jobNatureRemarks, b.jobs_name jobsName,a.lvl,b.lvl_name starName,date_format(a.entry_time,'%Y-%m-%d')entryTimes,
-	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,
+	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,a.star,
 	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
 	d.school,d.major,d.title,e.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
 	date_format(e.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.allowance,

+ 7 - 1
src/main/java/com/goafanti/personnel/bo/OutPersonnelBo.java

@@ -7,7 +7,7 @@ import com.goafanti.common.model.PersonnelContact;
 import com.goafanti.common.model.PersonnelEntry;
 
 public class OutPersonnelBo extends OutPersonnelListBo {
-	
+	private String star; 
 	private String nation;
 	private BigDecimal allowance;
 	
@@ -80,6 +80,12 @@ public class OutPersonnelBo extends OutPersonnelListBo {
 	public void setWelfareList(List<PersonnelWelfareBo> welfareList) {
 		this.welfareList = welfareList;
 	}
+	public String getStar() {
+		return star;
+	}
+	public void setStar(String star) {
+		this.star = star;
+	}