From 8226794ade84d2ba9fec12f49b53c8e829b87ae3 Mon Sep 17 00:00:00 2001 From: zhangminghua Date: Wed, 4 Jan 2023 13:45:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?(*)=E7=BB=A9=E7=82=B9=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{PEP V3.5.0 => PEP V3.4.0}/01 update_member-grade_point.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/scripts/{PEP V3.5.0 => PEP V3.4.0}/01 update_member-grade_point.sql (100%) diff --git a/doc/scripts/PEP V3.5.0/01 update_member-grade_point.sql b/doc/scripts/PEP V3.4.0/01 update_member-grade_point.sql similarity index 100% rename from doc/scripts/PEP V3.5.0/01 update_member-grade_point.sql rename to doc/scripts/PEP V3.4.0/01 update_member-grade_point.sql From 3498b32a9d940081218ae2f70b3b542a223f7a34 Mon Sep 17 00:00:00 2001 From: zhangminghua Date: Wed, 4 Jan 2023 15:09:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?(*)=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0gradePoint=E7=BB=A9=E7=82=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/member/index.js | 2 +- api/app/lib/models/member.js | 445 ++++++++++++------------ 2 files changed, 228 insertions(+), 219 deletions(-) diff --git a/api/app/lib/controllers/member/index.js b/api/app/lib/controllers/member/index.js index 92c310f..119c7ca 100644 --- a/api/app/lib/controllers/member/index.js +++ b/api/app/lib/controllers/member/index.js @@ -531,7 +531,7 @@ async function exportData(ctx) { key: 'userActiveStatus', }, { title: '绩点', - key: 'point', + key: 'gradePoint', }, { title: '归属机构', key: 'userOrganization', diff --git a/api/app/lib/models/member.js b/api/app/lib/models/member.js index d4b7d79..e1385b2 100644 --- a/api/app/lib/models/member.js +++ b/api/app/lib/models/member.js @@ -2,222 +2,231 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const Member = sequelize.define("member", { - pepUserId: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: "项企用户id", - primaryKey: true, - field: "pep_user_id", - autoIncrement: false, - unique: "member_pep_user_id_uindex" - }, - idNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "证件号", - primaryKey: false, - field: "id_number", - autoIncrement: false - }, - idPhoto: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "证件照", - primaryKey: false, - field: "id_photo", - autoIncrement: false - }, - gender: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "性别", - primaryKey: false, - field: "gender", - autoIncrement: false - }, - birthday: { - type: DataTypes.DATEONLY, - allowNull: true, - defaultValue: null, - comment: "出生年月", - primaryKey: false, - field: "birthday", - autoIncrement: false - }, - nativePlace: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "籍贯", - primaryKey: false, - field: "native_place", - autoIncrement: false - }, - marital: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "婚育状态", - primaryKey: false, - field: "marital", - autoIncrement: false - }, - politicsStatus: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "整治面貌", - primaryKey: false, - field: "politics_status", - autoIncrement: false - }, - phoneNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: '联系方式', - primaryKey: false, - field: "phone_number", - autoIncrement: false - }, - workPlace: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "工作地点", - primaryKey: false, - field: "work_place", - autoIncrement: false - }, - graduatedFrom: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "毕业院校", - primaryKey: false, - field: "graduated_from", - autoIncrement: false - }, - educationBackground: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "学历", - primaryKey: false, - field: "education_background", - autoIncrement: false - }, - specialty: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "专业", - primaryKey: false, - field: "specialty", - autoIncrement: false - }, - graduationDate: { - type: DataTypes.DATEONLY, - allowNull: true, - defaultValue: null, - comment: "毕业时间", - primaryKey: false, - field: "graduation_date", - autoIncrement: false - }, - hiredate: { - type: DataTypes.DATEONLY, - allowNull: true, - defaultValue: null, - comment: "入职时间", - primaryKey: false, - field: "hiredate", - autoIncrement: false - }, - turnProbationPeriod: { - type: DataTypes.DATEONLY, - allowNull: true, - defaultValue: null, - comment: "转试用期时间", - primaryKey: false, - field: "turn_probation_period", - autoIncrement: false - }, - regularDate: { - type: DataTypes.DATEONLY, - allowNull: true, - defaultValue: null, - comment: "转正时间", - primaryKey: false, - field: "regular_date", - autoIncrement: false - }, - dimissionDate: { - type: DataTypes.DATEONLY, - allowNull: true, - defaultValue: null, - comment: "离职时间", - primaryKey: false, - field: "dimission_date", - autoIncrement: false - }, - experienceYear: { - type: DataTypes.DOUBLE, - allowNull: true, - defaultValue: null, - comment: "工作经验/年", - primaryKey: false, - field: "experience_year", - autoIncrement: false - }, - occupationalHistory: { - type: DataTypes.TEXT, - allowNull: true, - defaultValue: null, - comment: "工作经历", - primaryKey: false, - field: "occupational_history", - autoIncrement: false - }, - vitae: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "简历", - primaryKey: false, - field: "vitae", - autoIncrement: false - }, - del: { - type: DataTypes.BOOLEAN, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "del", - autoIncrement: false - }, - technicalGrade: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "技术职级等级", - primaryKey: false, - field: "technical_grade", - autoIncrement: false - } - }, { - tableName: "member", - comment: "", - indexes: [] - }); - dc.models.Member = Member; - return Member; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const Member = sequelize.define("member", { + pepUserId: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: "项企用户id", + primaryKey: true, + field: "pep_user_id", + autoIncrement: false, + unique: "member_pep_user_id_uindex" + }, + idNumber: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "证件号", + primaryKey: false, + field: "id_number", + autoIncrement: false + }, + idPhoto: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "证件照", + primaryKey: false, + field: "id_photo", + autoIncrement: false + }, + gender: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "性别", + primaryKey: false, + field: "gender", + autoIncrement: false + }, + birthday: { + type: DataTypes.DATEONLY, + allowNull: true, + defaultValue: null, + comment: "出生年月", + primaryKey: false, + field: "birthday", + autoIncrement: false + }, + nativePlace: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "籍贯", + primaryKey: false, + field: "native_place", + autoIncrement: false + }, + marital: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "婚育状态", + primaryKey: false, + field: "marital", + autoIncrement: false + }, + politicsStatus: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "整治面貌", + primaryKey: false, + field: "politics_status", + autoIncrement: false + }, + phoneNumber: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: '联系方式', + primaryKey: false, + field: "phone_number", + autoIncrement: false + }, + workPlace: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "工作地点", + primaryKey: false, + field: "work_place", + autoIncrement: false + }, + graduatedFrom: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "毕业院校", + primaryKey: false, + field: "graduated_from", + autoIncrement: false + }, + educationBackground: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "学历", + primaryKey: false, + field: "education_background", + autoIncrement: false + }, + specialty: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "专业", + primaryKey: false, + field: "specialty", + autoIncrement: false + }, + graduationDate: { + type: DataTypes.DATEONLY, + allowNull: true, + defaultValue: null, + comment: "毕业时间", + primaryKey: false, + field: "graduation_date", + autoIncrement: false + }, + hiredate: { + type: DataTypes.DATEONLY, + allowNull: true, + defaultValue: null, + comment: "入职时间", + primaryKey: false, + field: "hiredate", + autoIncrement: false + }, + turnProbationPeriod: { + type: DataTypes.DATEONLY, + allowNull: true, + defaultValue: null, + comment: "转试用期时间", + primaryKey: false, + field: "turn_probation_period", + autoIncrement: false + }, + regularDate: { + type: DataTypes.DATEONLY, + allowNull: true, + defaultValue: null, + comment: "转正时间", + primaryKey: false, + field: "regular_date", + autoIncrement: false + }, + dimissionDate: { + type: DataTypes.DATEONLY, + allowNull: true, + defaultValue: null, + comment: "离职时间", + primaryKey: false, + field: "dimission_date", + autoIncrement: false + }, + experienceYear: { + type: DataTypes.DOUBLE, + allowNull: true, + defaultValue: null, + comment: "工作经验/年", + primaryKey: false, + field: "experience_year", + autoIncrement: false + }, + occupationalHistory: { + type: DataTypes.TEXT, + allowNull: true, + defaultValue: null, + comment: "工作经历", + primaryKey: false, + field: "occupational_history", + autoIncrement: false + }, + vitae: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "简历", + primaryKey: false, + field: "vitae", + autoIncrement: false + }, + del: { + type: DataTypes.BOOLEAN, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "del", + autoIncrement: false + }, + technicalGrade: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "技术职级等级", + primaryKey: false, + field: "technical_grade", + autoIncrement: false + }, + gradePoint: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "绩点", + primaryKey: false, + field: "grade_point", + autoIncrement: false + } + }, { + tableName: "member", + comment: "", + indexes: [] + }); + dc.models.Member = Member; + return Member; }; \ No newline at end of file