From f101ab2098e48e08a8a54cda9194d8d8d8927756 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 6 May 2026 19:34:07 +0800 Subject: [PATCH] commit --- .../change/MemberChangeMineController.java | 9 +++++ .../service/impl/MemberManageServiceImpl.java | 37 +++++++++++++++++++ .../zhgh/club/evaluate/clubAudit/index.html | 5 +++ .../zhgh/club/evaluate/schoolAudit/index.html | 5 +++ .../evaluate/schoolLeaderAudit/index.html | 5 +++ .../zhgh/club/examine/clubAudit/index.html | 5 +++ .../zhgh/club/examine/schoolAudit/index.html | 5 +++ .../club/examine/schoolLeaderAudit/index.html | 5 +++ .../club/infoManage/auditManager/index.html | 5 +++ .../infoManage/schoolAuditReport/index.html | 5 +++ .../infoManage/schoolAuditRule/index.html | 5 +++ .../zhgh/club/join/clubApproval/index.html | 5 +++ .../club/join/schoolUnionApproval/index.html | 5 +++ .../zhgh/club/register/clubConfirm/index.html | 5 +++ .../zhgh/club/register/officeAudit/index.html | 5 +++ .../register/schoolLeaderAudit/index.html | 5 +++ .../zhgh/club/register/schoolReply/index.html | 5 +++ .../member/info/datamanage/index.html | 6 +++ 18 files changed, 127 insertions(+) diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java index 8dbe211e..c365445d 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java @@ -12,6 +12,8 @@ import com.budwk.app.bpm.service.BpmService; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; +import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberChangePageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; @@ -22,6 +24,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.Static; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -111,6 +114,12 @@ public class MemberChangeMineController { cnd.and("info.userId", "=", SecurityUtil.getUserId()); } } + // Filter manual input records created by member info input + cnd.and(new Static( + "(info.changeOrigin <> '" + MemberChangeOrigin.HAND_MOVEMENT.name() + + "' OR info.changeOrigin IS NULL OR info.changeType <> '" + MemberChangeType.NEW.name() + + "' OR info.changeType IS NULL)" + )); if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.applyDateTime"); } else { 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 b83a7b43..03828356 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 @@ -46,6 +46,8 @@ import org.nutz.lang.Lang; import org.nutz.lang.random.R; import org.nutz.lang.util.NutMap; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -298,6 +300,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement @Override public void compareChangeInfoAndUpdateMember(MemberChangeRecord record) { + normalizeArrivalAtSchoolDate(record); List changeList = getChangeInfos(record); // 如果有工会关系人员，这个user用来存储数据 @@ -503,6 +506,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement @Override public void validateChangeAndSetBasicData(MemberChangeRecord record, MemberChangeOrigin origin) { + normalizeArrivalAtSchoolDate(record); // 校验有没有发生变更 List changeInfos = getChangeInfos(record); if (Lang.isEmpty(changeInfos)) { @@ -521,6 +525,39 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement } + /** + * 统一规范变更记录中的到校日期，避免 Date 对象复制后以英文字符串形式参与比较或直接落库。 + */ + private void normalizeArrivalAtSchoolDate(MemberChangeRecord record) { + if (record == null || StrUtil.isBlank(record.getArrivalAtSchoolDate())) { + return; + } + String arrivalAtSchoolDate = StrUtil.trim(record.getArrivalAtSchoolDate()); + try { + Date parsedDate = parseArrivalAtSchoolDate(arrivalAtSchoolDate); + record.setArrivalAtSchoolDate(DateUtil.format(parsedDate, "yyyy-MM-dd")); + } catch (Exception e) { + throw new BaseException("到校日期格式不正确，请使用yyyy-MM-dd格式"); + } + } + + /** + * 兼容页面手工变更时从视图对象复制出的英文日期字符串。 + */ + private Date parseArrivalAtSchoolDate(String arrivalAtSchoolDate) throws ParseException { + if (arrivalAtSchoolDate.matches("\\d{4}-\\d{2}-\\d{2}")) { + return DateUtil.parseDate(arrivalAtSchoolDate); + } + try { + return DateUtil.parse(arrivalAtSchoolDate); + } catch (Exception ignore) { + SimpleDateFormat format = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", Locale.ENGLISH); + format.setLenient(false); + return format.parse(arrivalAtSchoolDate); + } + } + + /** * 验证申请或变更是否正在进行 * @param userId 用户id diff --git a/src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html b/src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html index b1674a2e..318fa13d 100644 --- a/src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html +++ b/src/main/resources/views/platform/zhgh/club/evaluate/clubAudit/index.html @@ -48,6 +48,11 @@ layout("/layouts/platform.html"){ + + +