Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu

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;
 }

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<JSONObject> families;
 
+    @Column
+    @Comment("博士后进站时间")
+    @ColDefine(type = ColType.DATE)
+    private Date postDoctoralJoinDate;
+
     @Column
     @Comment("个人简况")
     @ColDefine(type = ColType.VARCHAR, customType = "text")

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java

@@ -403,12 +403,12 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
             history.setRemark(record.getRemark());
             // 到此，表明审核通过，需要存储历史数据，并修改用户数据
             Chain chain = Chain.make("unitPath", null);
-            NutMap nutMap = Lang.obj2nutmap(record);
+
             changeList.forEach(v -> {
-                if ("unit".equals(v.getString("fieldName"))) {
+                if ("unitId".equals(v.getString("fieldName"))) {
-                    chain.add(v.getString("fieldName"), record.getChangeUnitId());
+                    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());
@@ -431,7 +431,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
                     isRetire.set(true);
                     chain.add("retireDate", DateUtil.date());
                 }
-                return "(变更字段：" + v.getString("name") + "，变更前：" + HtmlUtil.cleanHtmlTag(v.getString("value")) + "，变更后：" + HtmlUtil.cleanHtmlTag(v.getString("newValue")) + ")";
+                return "(变更字段：" + v.getString("name") + "，变更前：" + HtmlUtil.cleanHtmlTag(v.getString("value","")) + "，变更后：" + HtmlUtil.cleanHtmlTag(v.getString("newValue","")) + ")";
             }).collect(Collectors.joining("；"));
             record.setChangeInfos(changeInfos);
 

src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js

@@ -78,7 +78,17 @@ const MEMBER_CHANGE = {
                                          :disabled="allowFields('personType')"></dict-select>
                         </el-form-item>
                     </el-descriptions-item>
-                    
+
+                    <el-descriptions-item label="进站时间" v-show="formData.preparedBy === '博士后'">
+                        <el-form-item prop="postDoctoralJoinDate">
+                            <el-date-picker
+                                    v-model="formData.postDoctoralJoinDate"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-descriptions-item>
                     
                     <el-descriptions-item label="联系电话">
                         <el-form-item prop="mobile">
@@ -90,19 +100,18 @@ const MEMBER_CHANGE = {
                             <el-input v-model="formData.email" :disabled="allowFields('email')" placeholder="请输入电子邮箱" maxlength="50"></el-input>
                         </el-form-item>
                     </el-descriptions-item>
-                    <el-descriptions-item></el-descriptions-item>
                     <el-descriptions-item label="是否会员">
                         <el-form-item prop="member">
                             <span style="color: #0e9558" v-if="formData.member">是</span>
                             <span style="color: #ac2925" v-else>否</span>
                         </el-form-item>
                     </el-descriptions-item>
-                    <el-descriptions-item label="是否福利会员">
+<!--                    <el-descriptions-item label="是否福利会员">-->
-                        <el-form-item prop="welfareMember">
+<!--                        <el-form-item prop="welfareMember">-->
-                            <span style="color: #0e9558" v-if="formData.welfareMember">是</span>
+<!--                            <span style="color: #0e9558" v-if="formData.welfareMember">是</span>-->
-                            <span style="color: #ac2925" v-else>否</span>
+<!--                            <span style="color: #ac2925" v-else>否</span>-->
-                        </el-form-item>
+<!--                        </el-form-item>-->
-                    </el-descriptions-item>
+<!--                    </el-descriptions-item>-->
                     <el-descriptions-item></el-descriptions-item>
                     <!--<el-descriptions-item label="是否重大疾病爱心互助会会员">
                         <el-form-item prop="wantJoinLoveMutualAidAssociation">