From 3abdd05ce990aa07673514f023227d5f9c5f4eaf Mon Sep 17 00:00:00 2001 From: zhengziru Date: Sat, 28 Feb 2026 14:25:34 +0800 Subject: [PATCH] server_commit --- .../java/io/v/nutz/base/utils/PwdUtil.java | 6 +- .../platform/sys/SysUserController.java | 12 ++-- .../school/ActivityApplyController.java | 12 +++- .../school/ActivityCommonController.java | 8 ++- .../school/ActivityInfoManageController.java | 2 +- .../activity/models/ActivitySchoolApply.java | 12 ++++ .../service/impl/SourceUserServiceImpl.java | 2 +- .../lxy/controller/LxyHdTjController.java | 3 +- .../zhgh/welfare/model/WelfareProject.java | 6 ++ .../static/MP_verify_r7PbzGPoxZ8CYYar.txt | 1 - .../static/WW_verify_ljqZzRgj9HfONwk5.txt | 1 - .../components/activityBx/ActivityBxInfo.vue | 6 +- .../activity/school/ActivityApply.html | 62 +++++++++++++++---- .../activity/school/ActivityManage.html | 6 +- .../platform/jf/bxFundsLayout/accounting.html | 2 +- .../platform/welfare/list/ListMange.html | 6 +- .../welfare/project/ProjectMange.html | 13 ++++ .../views/platform/zgfw/lxy/HdGhbm.html | 2 +- 18 files changed, 126 insertions(+), 36 deletions(-) delete mode 100644 src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt delete mode 100644 src/main/resources/static/WW_verify_ljqZzRgj9HfONwk5.txt diff --git a/src/main/java/io/v/nutz/base/utils/PwdUtil.java b/src/main/java/io/v/nutz/base/utils/PwdUtil.java index d5acef0..9e8074f 100644 --- a/src/main/java/io/v/nutz/base/utils/PwdUtil.java +++ b/src/main/java/io/v/nutz/base/utils/PwdUtil.java @@ -126,14 +126,14 @@ public class PwdUtil { // System.out.println(dbPwd); // System.out.println(s); - String pwd = "004512"; + String pwd = "002432"; String dbPwd = PwdUtil.doSm4CbcEncrypt(pwd); System.out.println(dbPwd); // 7fdc9e096de7e2c18e4ed4efa16f50f8 - // e43646c461a8ee364c569552225e28be -// String ddPwd = PwdUtil.doSm4CbcDecrypt("d3b42e17dba55dbe9bfa471c8ff191d9"); + // e43646c461a8ee364c569552225e28be 3d6edd620d5b9d73190390a917c9d724 +// String ddPwd = PwdUtil.doSm4CbcDecrypt("fca022ce2d08510730f56dfa44ca90b73bf9f5d7c18a53e24bd72fe746ee3da8"); // System.out.println(ddPwd); } } 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 ed1fd22..9c62b84 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 @@ -3,6 +3,7 @@ package io.v.nutz.sys.controllers.platform.sys; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.PageUtil; +import io.v.nutz.base.utils.PwdUtil; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.StringUtil; import io.v.nutz.sys.models.Sys_menu; @@ -149,12 +150,15 @@ public class SysUserController { Sys_user user = sysUserService.fetch(id); String salt = R.UU32(); // String pwd = R.captchaNumber(6); - String pwd = "dd3s@#2022"; - String hashedPasswordBase64 = new Sha256Hash(pwd, ByteSource.Util.bytes(salt), 1024).toHex(); - sysUserService.update(Chain.make("salt", salt).add("password", hashedPasswordBase64), Cnd.where("id", "=", id)); + + String dbPwd = PwdUtil.doSm4CbcEncrypt(user.getLoginname()); + +// String pwd = "dd3s@#2022"; +// String hashedPasswordBase64 = new Sha256Hash(pwd, ByteSource.Util.bytes(salt), 1024).toHex(); + sysUserService.update(Chain.make("salt", salt).add("password", dbPwd), Cnd.where("id", "=", id)); sysUserService.clearCache(); req.setAttribute("loginname", user.getLoginname()); - return Result.success().addData(pwd); + return Result.success().addData(dbPwd); } catch (Exception e) { return Result.error(); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java index 76155d6..2b0a852 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.activity.controller.school; +import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; @@ -425,8 +426,15 @@ public class ActivityApplyController { apply.setActivityUnionName(basicUnion.getUnionname()); apply.setApplyUnitId(basicUnit.getId()); - dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()), - Cnd.where("id", "=", apply.getUserId())); + Chain chain = Chain.make("diseaseType", null); + if (StrUtil.isNotBlank(apply.getMobile())) { + chain.add("mobile", apply.getMobile()); + } + if (StrUtil.isNotBlank(apply.getPosition())) { +// chain.add("position", apply.getPosition()); + } + + dao.update(Sys_user.class, chain, Cnd.where("id", "=", apply.getUserId())); } activitySchoolApplyService.doApplies(activityId, basicUnit.getUnionid(), eventId, Arrays.asList(applies)); return null; diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java index 8b584fe..228f4dc 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java @@ -277,6 +277,7 @@ public class ActivityCommonController { @At + @Ok("void") public void exportXlsx(String id, String unionId,Boolean isUnion, HttpServletResponse response) throws IOException { Sql sql = Sqls.create(""" SELECT @@ -293,7 +294,9 @@ public class ActivityCommonController { u2.username applyUserName, ev.allName, sc.`name` activityName, - app.`team` team + app.`team` team, + app.num, + app.positioning FROM `activity_school_apply` app LEFT JOIN `user` u ON u.id = app.userId @@ -306,6 +309,7 @@ public class ActivityCommonController { $cnd ORDER BY u.unioncode ASC, + app.num ASC, app.applyUser DESC, ev.allName DESC, app.`team` asc @@ -335,6 +339,8 @@ public class ActivityCommonController { exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20)); exportEntities.add(new ExcelExportEntity("职称职务", "position", 20)); + exportEntities.add(new ExcelExportEntity("队员号码", "num", 20)); + exportEntities.add(new ExcelExportEntity("位置", "positioning", 20)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20)); // exportEntities.add(new ExcelExportEntity("身份", "sf", 20)); exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java index 2995814..e6e8a67 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java @@ -99,7 +99,7 @@ public class ActivityInfoManageController { school.foundDate, school.applyType, school.isDisabled, - (SELECT COUNT(1) FROM activity_school_apply asa WHERE asa.activityId = school.id) applyNum + (SELECT COUNT(1) FROM activity_school_apply asa WHERE asa.activityId = school.id and asa.status=2) applyNum FROM activity_school school LEFT JOIN activity_basic_settings ba ON ba.`code` = school.activityLevel diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java index a6b24fa..4f92dcf 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java @@ -201,6 +201,18 @@ public class ActivitySchoolApply implements Serializable { @ColDefine(type = ColType.VARCHAR, width = 50) private String position; + @Column + @Comment("号码") + @Excel(name = "号码", width = 20) + @ColDefine(type = ColType.INT, width = 10) + private Integer num; + + @Column + @Comment("位置") + @Excel(name = "位置", width = 20) + @ColDefine(type = ColType.VARCHAR, width = 50) + private String positioning; + @Excel(name = "在职状态", width = 20) private String userState; diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index 4d2b0a3..6ccd76f 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -288,7 +288,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements BeanUtils.copyProperties(user, history); history.setChangeTime(new Date()); history.setChangeTypes(changeTypes.stream().map(UserChangeType::getCode).collect(Collectors.toList())); - history.setChangeOperator(StrUtil.blankToDefault((String) ShiroUtil.getPrincipalProperty("username"), "系统")); + history.setChangeOperator("系统更新"); history.setChangeOrigin(MemberChangeOrigin.SYSTEM.getCode()); history.setChangeReason("数据自动更新"); diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java index f50ffc1..5bc2a7d 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java @@ -127,7 +127,8 @@ public class LxyHdTjController { bm.zyhj, bm.idcard, bm.mobile, - bm.talent + bm.talent, + bm.point FROM `lxy_grxx` gr LEFT JOIN lxy_bm bm ON bm.userid = gr.userid diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java index d012ecc..ca1c776 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java @@ -85,6 +85,12 @@ public class WelfareProject extends BaseModel implements Serializable, SysHomeCo @ColDefine(type = ColType.DATETIME) private Date overdueChoiceTimeEnd; + + @Column + @Comment("核对截至时间") + @ColDefine(type = ColType.DATETIME) + private Date checkEndTime; + @Column @Comment("发放地址") @ColDefine(type = ColType.VARCHAR, width = 200) diff --git a/src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt b/src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt deleted file mode 100644 index bc5d5f1..0000000 --- a/src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt +++ /dev/null @@ -1 +0,0 @@ -r7PbzGPoxZ8CYYar \ No newline at end of file diff --git a/src/main/resources/static/WW_verify_ljqZzRgj9HfONwk5.txt b/src/main/resources/static/WW_verify_ljqZzRgj9HfONwk5.txt deleted file mode 100644 index c56ba5f..0000000 --- a/src/main/resources/static/WW_verify_ljqZzRgj9HfONwk5.txt +++ /dev/null @@ -1 +0,0 @@ -ljqZzRgj9HfONwk5 \ No newline at end of file diff --git a/src/main/resources/static/components/activityBx/ActivityBxInfo.vue b/src/main/resources/static/components/activityBx/ActivityBxInfo.vue index ce4cbbd..fe0fceb 100644 --- a/src/main/resources/static/components/activityBx/ActivityBxInfo.vue +++ b/src/main/resources/static/components/activityBx/ActivityBxInfo.vue @@ -25,8 +25,10 @@ - 活动经费类型 - {{ viewData.projectJfName }} + 活动主体类型 + {{ viewData.activity_type === 40002 ? "基层工会活动" : viewData.activity_type === + 40003 ? "协会活动" + : "校工会活动"}} 申报(承办)单位/协会 {{ viewData.fundsUnitName }} 活动人数 diff --git a/src/main/resources/views/platform/activity/school/ActivityApply.html b/src/main/resources/views/platform/activity/school/ActivityApply.html index ab8a3dd..7a0edd3 100644 --- a/src/main/resources/views/platform/activity/school/ActivityApply.html +++ b/src/main/resources/views/platform/activity/school/ActivityApply.html @@ -707,15 +707,31 @@ layout("/layouts/platform.html"){ - + + + + + + + --> + @@ -1038,10 +1054,10 @@ layout("/layouts/platform.html"){ - + 编辑 diff --git a/src/main/resources/views/platform/welfare/project/ProjectMange.html b/src/main/resources/views/platform/welfare/project/ProjectMange.html index 088b4c3..a0e5c7a 100644 --- a/src/main/resources/views/platform/welfare/project/ProjectMange.html +++ b/src/main/resources/views/platform/welfare/project/ProjectMange.html @@ -263,6 +263,19 @@ layout("/layouts/platform.html"){ > + + + + + + + diff --git a/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html b/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html index ba376e8..2cf1be0 100644 --- a/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html +++ b/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html @@ -88,7 +88,7 @@ layout("/layouts/platform.html"){ - +