Просмотр исходного кода

人事档案详情修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
2782fd94ce

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

@@ -974,7 +974,7 @@
   <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,
 	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,a.star,
+	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,a.star,a.jobs,
 	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,

+ 10 - 3
src/main/java/com/goafanti/personnel/bo/OutPersonnelBo.java

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

+ 0 - 4
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -83,10 +83,6 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public Result updatePersonnel(InputPersonnelBo i){
 		Result res = new Result();
-		if (StringUtils.isBlank(i.getName())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
-			return res;
-		}
 		try {
 				if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
 				if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));