diff --git a/src/main/java/com/budwk/app/sys/views/View_user.java b/src/main/java/com/budwk/app/sys/views/View_user.java index 78fa009..f1570a5 100644 --- a/src/main/java/com/budwk/app/sys/views/View_user.java +++ b/src/main/java/com/budwk/app/sys/views/View_user.java @@ -1,6 +1,7 @@ package com.budwk.app.sys.views; import cn.hutool.json.JSONObject; +import com.budwk.app.sys.annotation.DataCenterColumn; import lombok.Data; import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; @@ -166,4 +167,7 @@ public class View_user { @Column private String personalData; + + @Column + private Date postDoctoralJoinDate; } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java index 1192203..dd355a5 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.staffmanage.member.models; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; +import com.budwk.app.sys.annotation.DataCenterColumn; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -192,6 +193,11 @@ public class MemberApplyRecord extends BaseModel { @ColDefine(type = ColType.MYSQL_JSON) private List families; + @Column + @Comment("博士后进站时间") + @ColDefine(type = ColType.DATE) + private Date postDoctoralJoinDate; + @Column @Comment("个人简况") @ColDefine(type = ColType.VARCHAR, customType = "text") diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java index f9eb670..157a4b2 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java @@ -403,12 +403,12 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement history.setRemark(record.getRemark()); // 到此,表明审核通过,需要存储历史数据,并修改用户数据 Chain chain = Chain.make("unitPath", null); - NutMap nutMap = Lang.obj2nutmap(record); + changeList.forEach(v -> { if ("unitId".equals(v.getString("fieldName"))) { chain.add(v.getString("fieldName"), record.getUnitId()); } else { - chain.add(v.getString("fieldName"), nutMap.get(v.getString("newValue"))); + chain.add(v.getString("fieldName"), v.getString("newValue")); } }); chain.add("member", record.getMember()); diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js index fa5d803..d38ed12 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js @@ -78,7 +78,17 @@ const MEMBER_CHANGE = { :disabled="allowFields('personType')"> - + + + + + + + @@ -90,19 +100,18 @@ const MEMBER_CHANGE = { - - - - - - - + + + + + +