From d650fd9231410600edad74cb110e448867ed6515 Mon Sep 17 00:00:00 2001 From: zhengziru Date: Thu, 18 Sep 2025 20:56:54 +0800 Subject: [PATCH] server_commit --- .../platform/sys/SysUserController.java | 25 ++++ .../basic/ActivityBasicScopeController.java | 2 +- .../controller/MemberCommonController.java | 2 +- .../member/model/MemberChangeRecord.java | 6 + .../resources/views/layouts/platform.html | 114 +++++++++--------- .../apply/common/memberApplyAuditInfo.js | 6 +- .../platform/member/apply/submit/index.html | 101 ++++++++-------- .../change/common/memberAllChangeInfo.js | 6 +- .../member/change/common/memberChange.js | 96 +++++++-------- .../change/common/memberChangeAuditInfo.js | 6 +- .../platform/member/common/memberInfo.js | 6 +- .../sourcechange/manage/userChangeInfo.js | 2 +- .../views/platform/sys/home/index.html | 71 ++++++++++- 13 files changed, 268 insertions(+), 175 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUserController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUserController.java index 14801dc..8e3a97b 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUserController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUserController.java @@ -511,4 +511,29 @@ public class SysUserController { resultMap.put("isShow", count > 0); return Result.success(resultMap); } + + + @At + @Ok("json") + @RequiresAuthentication + public Object doEditUser(Sys_user user){ + try { + if(Strings.isBlank(user.getCardNum())) return Result.error("请填写会员服务卡卡号！"); + int update = sysUserService.update(Chain.make("cardNum", user.getCardNum()), Cnd.where("id", "=", ShiroUtil.getUserId())); + return update>0 ? Result.success() : Result.error(); + } catch (Exception e) { + return Result.error(); + } + } + + + @At + @Ok("json") + @ViReturn + @RequiresAuthentication + public Object judgeIdCard(){ + return sysUserService.count(Cnd.where("id","=", ShiroUtil.getUserId()) + .and("member","=",1).and("userState","=","在职") + .and(Cnd.exps("cardNum","is",null).or("cardNum","=",""))); + } } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java index ff4bc95..4becc5b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java @@ -308,7 +308,7 @@ public class ActivityBasicScopeController { COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' - AND TABLE_SCHEMA = 'zhgh_hmc' + AND TABLE_SCHEMA = 'zhgh_ecgtu' """); List sqlDataList = activityBasicScopeService.listMap(sql); // sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE")))); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/MemberCommonController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/MemberCommonController.java index d3dbb23..08f8163 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/MemberCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/MemberCommonController.java @@ -302,7 +302,7 @@ public class MemberCommonController { COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' - AND TABLE_SCHEMA = 'zhgh_hmc' + AND TABLE_SCHEMA = 'zhgh_ecgtu' """); List userTableColumnInfos = sysUserService.listMap(userColumnSql); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java index 13a132d..f5e24a9 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/model/MemberChangeRecord.java @@ -87,6 +87,12 @@ public class MemberChangeRecord { @Size(max = 30) private String idCard; + @Column + @Comment("会员服务卡卡号") + @ColDefine(type = ColType.VARCHAR, width = 30) + @Size(max = 30) + private String cardNum; + @Column @Comment("民族") @ColDefine(type = ColType.VARCHAR, width = 20) diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index 322d3ce..74d519f 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -7,104 +7,104 @@ ${AppName!} - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - + - + - + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - + + - + - + - - - + + + - + - + - + - + - + - - - + + + diff --git a/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js index 9256c1a..7cab786 100644 --- a/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js +++ b/src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js @@ -29,10 +29,10 @@ const MEMBER_APPLY_AUDIT_INFO = { - + - +
暂无 diff --git a/src/main/resources/views/platform/member/apply/submit/index.html b/src/main/resources/views/platform/member/apply/submit/index.html index c017433..1b102bc 100644 --- a/src/main/resources/views/platform/member/apply/submit/index.html +++ b/src/main/resources/views/platform/member/apply/submit/index.html @@ -3,7 +3,7 @@ layout("/layouts/platform.html"){ #--> @@ -229,13 +229,6 @@ layout("/layouts/platform.html"){ sex: [{required: false, message: "必填", trigger: ["change", "blur"]}], isVoluntary: [{required: true, message: "必填", trigger: ["change", "blur"]}], sign: [{required: true, message: "必填", trigger: ["change", "blur"]}], - phone: [ - { - validator: (rule, value, callback) => { - }, - trigger: ["change", "blur"] - } - ], email: [ { validator: (rule, value, callback) => { @@ -250,52 +243,52 @@ layout("/layouts/platform.html"){ trigger: ["change", "blur"] } ], - idCard: [ - { - validator: (rule, value, callback) => { - if (!value) { - // 如果值为空，直接通过校验 - callback(); - } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) { - // 18位身份证号码格式正确 - callback(); - } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { - // 15位身份证号码格式正确 - callback(); - } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { - // 外国人身份证号码格式正确（18位） - callback(); - } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { - // 外国人身份证号码格式正确（15位） - callback(); - } else { - // 格式错误，返回错误信息 - callback(new Error("身份证号码格式错误")); - } - }, - trigger: ["change", "blur"] - } - ], - mobile: [ - { - validator: (rule, value, callback) => { - if (!value) { - // 如果值为空，直接通过校验 - callback(); - } else if (/^[1][345789][0-9]{9}$/.test(value)) { - // 手机号格式正确 - callback(); - } else if (/^\d+-\d+$/.test(value) && value.length <= 16) { - // 座机号格式正确 - callback(); - } else { - // 格式错误，返回错误信息 - callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误')); - } - }, - trigger: ["change", "blur"] - } - ] + // idCard: [ + // { + // validator: (rule, value, callback) => { + // if (!value) { + // // 如果值为空，直接通过校验 + // callback(); + // } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) { + // // 18位身份证号码格式正确 + // callback(); + // } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { + // // 15位身份证号码格式正确 + // callback(); + // } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { + // // 外国人身份证号码格式正确（18位） + // callback(); + // } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { + // // 外国人身份证号码格式正确（15位） + // callback(); + // } else { + // // 格式错误，返回错误信息 + // callback(new Error("身份证号码格式错误")); + // } + // }, + // trigger: ["change", "blur"] + // } + // ], + // mobile: [ + // { + // validator: (rule, value, callback) => { + // if (!value) { + // // 如果值为空，直接通过校验 + // callback(); + // } else if (/^[1][345789][0-9]{9}$/.test(value)) { + // // 手机号格式正确 + // callback(); + // } else if (/^\d+-\d+$/.test(value) && value.length <= 16) { + // // 座机号格式正确 + // callback(); + // } else { + // // 格式错误，返回错误信息 + // callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误')); + // } + // }, + // trigger: ["change", "blur"] + // } + // ] }, } }, diff --git a/src/main/resources/views/platform/member/change/common/memberAllChangeInfo.js b/src/main/resources/views/platform/member/change/common/memberAllChangeInfo.js index 8c93676..985b2c2 100644 --- a/src/main/resources/views/platform/member/change/common/memberAllChangeInfo.js +++ b/src/main/resources/views/platform/member/change/common/memberAllChangeInfo.js @@ -32,10 +32,10 @@ const MEMBER_ALL_CHANGE_INFO = { {{ viewData.leaveSchoolDate ? moment(viewData.leaveSchoolDate).format("YYYY-MM-DD") : '暂无' }} {{ viewData.member ? '会员' : '非会员' }} - {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + {{ viewData.cardNum }} - +
diff --git a/src/main/resources/views/platform/member/change/common/memberChange.js b/src/main/resources/views/platform/member/change/common/memberChange.js index c17b852..1e6b843 100644 --- a/src/main/resources/views/platform/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/member/change/common/memberChange.js @@ -234,52 +234,52 @@ const MEMBER_CHANGE = { trigger: ["change", "blur"] } ], - idCard: [ - { - validator: (rule, value, callback) => { - if (!value) { - // 如果值为空，直接通过校验 - callback(); - } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) { - // 18位身份证号码格式正确 - callback(); - } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { - // 15位身份证号码格式正确 - callback(); - } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { - // 外国人身份证号码格式正确（18位） - callback(); - } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { - // 外国人身份证号码格式正确（15位） - callback(); - } else { - // 格式错误，返回错误信息 - callback(new Error("身份证号码格式错误")); - } - }, - trigger: ["change", "blur"] - } - ], - mobile: [ - { - validator: (rule, value, callback) => { - if (!value) { - // 如果值为空，直接通过校验 - callback(); - } else if (/^[1][345789][0-9]{9}$/.test(value)) { - // 手机号格式正确 - callback(); - } else if (/^\d+-\d+$/.test(value) && value.length <= 16) { - // 座机号格式正确 - callback(); - } else { - // 格式错误，返回错误信息 - callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误')); - } - }, - trigger: ["change", "blur"] - } - ], + // idCard: [ + // { + // validator: (rule, value, callback) => { + // if (!value) { + // // 如果值为空，直接通过校验 + // callback(); + // } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}(\d|[Xx])$/.test(value)) { + // // 18位身份证号码格式正确 + // callback(); + // } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { + // // 15位身份证号码格式正确 + // callback(); + // } else if (/^[1-9]\d{5}(18|19|20)?\d{2}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { + // // 外国人身份证号码格式正确（18位） + // callback(); + // } else if (/^[1-9]\d{7}((0[1-9])|(10|11|12))(([0|1|2][0-9])|10|20|30|31)\d{3}$/.test(value)) { + // // 外国人身份证号码格式正确（15位） + // callback(); + // } else { + // // 格式错误，返回错误信息 + // callback(new Error("身份证号码格式错误")); + // } + // }, + // trigger: ["change", "blur"] + // } + // ], + // mobile: [ + // { + // validator: (rule, value, callback) => { + // if (!value) { + // // 如果值为空，直接通过校验 + // callback(); + // } else if (/^[1][345789][0-9]{9}$/.test(value)) { + // // 手机号格式正确 + // callback(); + // } else if (/^\d+-\d+$/.test(value) && value.length <= 16) { + // // 座机号格式正确 + // callback(); + // } else { + // // 格式错误，返回错误信息 + // callback(new Error(value.includes('-') ? '座机号码格式错误' : '手机号码格式错误')); + // } + // }, + // trigger: ["change", "blur"] + // } + // ], cardNum: [{ required: false, message: "请填写会员服务卡卡号", trigger: ["change", "blur"] }, { pattern: /^\d{19}$/, message: "会员服务卡卡号必须为19位数字", trigger: ["change", "blur"] }] }, @@ -381,6 +381,7 @@ const MEMBER_CHANGE = { mobile, email, families, + cardNum, vita } = this.user @@ -391,6 +392,7 @@ const MEMBER_CHANGE = { this.$set(this.formData, "sex", sex) this.$set(this.formData, "member", member === 1) this.$set(this.formData, "welfareMember", welfareMember === 1) + this.$set(this.formData, "cardNum", cardNum) this.$set(this.formData, "idCard", idCard) this.$set(this.formData, "nation", nation) this.$set(this.formData, "political", political) @@ -418,7 +420,7 @@ const MEMBER_CHANGE = { }, style: /* language=CSS */ ` .el-descriptions-item__label { - width: 15% !important; + /*width: 15% !important;*/ text-align: center !important; } ` diff --git a/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js b/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js index d0acc76..13c3671 100644 --- a/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js +++ b/src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js @@ -33,10 +33,10 @@ const MEMBER_CHANGE_AUDIT_INFO = { {{ viewData.leaveSchoolDate ? moment(viewData.leaveSchoolDate).format("YYYY-MM-DD") : '暂无' }} {{ viewData.member ? '会员' : '非会员' }} - {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + {{ viewData.cardNum }} - +
diff --git a/src/main/resources/views/platform/member/common/memberInfo.js b/src/main/resources/views/platform/member/common/memberInfo.js index 2858872..6f781d2 100644 --- a/src/main/resources/views/platform/member/common/memberInfo.js +++ b/src/main/resources/views/platform/member/common/memberInfo.js @@ -33,10 +33,10 @@ const MEMBER_INFO = { {{ viewData.leaveSchoolDate ? moment(viewData.leaveSchoolDate).format("YYYY-MM-DD") : '暂无' }} {{ viewData.member ? '会员' : '非会员' }} - {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + {{ viewData.cardNum }} - +
diff --git a/src/main/resources/views/platform/sourcechange/manage/userChangeInfo.js b/src/main/resources/views/platform/sourcechange/manage/userChangeInfo.js index becd44e..0672930 100644 --- a/src/main/resources/views/platform/sourcechange/manage/userChangeInfo.js +++ b/src/main/resources/views/platform/sourcechange/manage/userChangeInfo.js @@ -29,7 +29,7 @@ const USER_CHANGE_INFO = { {{ viewData.member ? '会员' : '非会员' }} - {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + {{ viewData.cardNum }} diff --git a/src/main/resources/views/platform/sys/home/index.html b/src/main/resources/views/platform/sys/home/index.html index a7ab4e6..910a09c 100644 --- a/src/main/resources/views/platform/sys/home/index.html +++ b/src/main/resources/views/platform/sys/home/index.html @@ -303,6 +303,39 @@ layout("/layouts/platform.html"){ + + + + +
+ 请您完善会员服务卡信息，提交后将不会弹出此页面 +
+ + + + + + + + + + + + + 确 定 + + +