diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user_history.java b/src/main/java/com/budwk/app/sys/models/Sys_user_history.java index d232738..f82977d 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user_history.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user_history.java @@ -176,6 +176,11 @@ public class Sys_user_history extends BaseModel implements Serializable { @ColDefine(type = ColType.MYSQL_JSON) private List families; + @Column + @Comment("博士后进站时间") + @ColDefine(type = ColType.DATE) + private Date postDoctoralJoinDate; + @Column @Comment("异动时间") @ColDefine(type = ColType.DATETIME) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java index 2243abf..0a66338 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.dayofficework.evaluation.models; +import cn.afterturn.easypoi.excel.annotation.Excel; import cn.hutool.json.JSONObject; import com.budwk.app.base.model.BaseModel; import lombok.Data; @@ -139,4 +140,28 @@ public class EvaluateApply extends BaseModel { @Comment("附件") @ColDefine(type = ColType.MYSQL_JSON) private List files; + + @Column + @ColDefine(type = ColType.INT) + @Comment("会员人数") + @Excel(name = "会员人数") + private Long memberNumber; + + @Column + @ColDefine(type = ColType.INT) + @Comment("工会小组数") + @Excel(name = "工会小组数") + private Long unionGroupNumber; + + @Column + @Comment("工会主席") + @Excel(name = "工会主席") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionLeader; + + @Column + @Excel(name = "申报院级工会") + @ColDefine(type = ColType.VARCHAR, width = 20) + @Comment("申报院级工会") + private String applyUnionName; } 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 157a4b2..07d737e 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 @@ -414,8 +414,6 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement chain.add("member", record.getMember()); chain.add("welfareMember", record.getWelfareMember()); - - Sys_role memberRole = dao().fetch(Sys_role.class, Cnd.where("`code`", "=", "MEMBER")); dao().clear(Sys_user_role.class, Cnd.where("userId", "=", user.getId()).and("roleId","=", memberRole.getId())); if (record.getMember()) { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js index 9f96b13..cdcf634 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js @@ -1,82 +1,109 @@ const apply_component = { - template: ` + template: /*language=HTML*/ ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + @@ -123,7 +150,9 @@ const apply_component = { technicalTitle: [{ required: true, message: "必填", trigger: ["change", "blur"] }], governmentPosition: [{ required: true, message: "必填", trigger: ["change", "blur"] }], briefDeeds: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - historyHonor: [{ required: true, message: "必填", trigger: ["change", "blur"] }] + historyHonor: [{ required: true, message: "必填", trigger: ["change", "blur"] }], + unionLeader: [{ required: true, message: "必填", trigger: ["change", "blur"] }], + memberNumber: [{ required: true, message: "必填", trigger: ["change", "blur"] }], } } }, @@ -143,10 +172,23 @@ const apply_component = { this.dialogVisible = true this.$nextTick(() => { this.initForm() - debugger this.$set(this.formData, "evaluateId", activity.id) this.$set(this.formData, "honorTypeId", activity.honorTypeId) + this.$set(this.formData, "honorType", activity.honorType) this.$set(this.formData, "honorId", activity.honorId) + + if (activity.honorType.includes('集体')) { + this.getCollectiveInfo() + } + }) + }, + getCollectiveInfo() { + this.$axios.post("/platform/honor/basic/settings/getUnionInfo", { id: this.$store.state.user.union.id }).then((res) => { + if (res.code === 0) { + this.formData.memberNumber = res.data.memberNumber + this.formData.unionLeader = res.data.username + this.formData.unionName = this.$store.state.user.union.name + } }) }, save() { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/common/info.js b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/common/info.js index b58f0e1..2e18c62 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/common/info.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/common/info.js @@ -1,22 +1,31 @@ const info = { - template: ` + template: /*language=HTML*/ `
申请信息
- {{viewData.userName}} - {{viewData.loginName}} - {{viewData.sex}} - {{viewData.birthday}} - {{viewData.nation}} - {{viewData.political}} - {{viewData.education}} - {{viewData.technicalTitle}} - {{viewData.governmentPosition}} - {{viewData.unitName}} - {{viewData.unionName}} + + + {{viewData.unionName}} + {{viewData.unitName}} + + + {{viewData.historyHonor}} {{viewData.briefDeeds}} 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 d38ed12..4835e51 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 @@ -112,6 +112,7 @@ const MEMBER_CHANGE = { +