c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server_commit

Browse Source
This commit is contained in:
zhengziru
2026-02-28 14:25:34 +08:00
parent 576b70634c
commit 3abdd05ce9
18 changed files with 126 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/base/utils/PwdUtil.java
+3 -3
View File
@@ -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);
}
}
src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUserController.java
+8 -4
View File
@@ -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();
}
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java
+10 -2
View File
@@ -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;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java
+7 -1
View File
@@ -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));
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java
+1 -1
View File
@@ -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
src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java
+12
View File
@@ -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;
src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java
+1 -1
View File
@@ -288,7 +288,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> 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("数据自动更新");
src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java
+2 -1
View File
@@ -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
src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java
+6
View File
@@ -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)
src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt
-1
View File
@@ -1 +0,0 @@
r7PbzGPoxZ8CYYar
src/main/resources/static/WW_verify_ljqZzRgj9HfONwk5.txt
-1
View File
@@ -1 +0,0 @@
ljqZzRgj9HfONwk5
src/main/resources/static/components/activityBx/ActivityBxInfo.vue
+4 -2
View File
@@ -25,8 +25,10 @@
</tr>
<tr>
<th>活动经费类型</th>
<td>{{ viewData.projectJfName }}</td>
<th>活动主体类型</th>
<td>{{ viewData.activity_type === 40002 ? "基层工会活动" : viewData.activity_type ===
40003 ? "协会活动"
: "校工会活动"}}</td>
<th>申报(承办)单位/协会</th>
<td>{{ viewData.fundsUnitName }}</td>
<th>活动人数</th>
src/main/resources/views/platform/activity/school/ActivityApply.html
+51 -11
View File
@@ -707,15 +707,31 @@ layout("/layouts/platform.html"){
</el-table-column>
<el-table-column
<!--<el-table-column
align="center" header-align="center" label="职务"
prop="position">
<template slot-scope="{row}">
<el-input v-model="row.position"
placeholder="请填写填写职称职务"></el-input>
placeholder="请填写职称职务"></el-input>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="队员号码" prop="num">
<template slot-scope="{row}">
<el-input type="number" @blur="checkNum(row, row.num)" v-model="row.num" :min="1" :max="10" :precision="0"
placeholder="请填写参赛队员号码"></el-input>
</template>
</el-table-column>
<el-table-column
align="center" header-align="center" label="位置"
prop="positioning">
<template slot-scope="{row}">
<el-input v-model="row.positioning"
placeholder="请填写位置"></el-input>
</template>
</el-table-column>-->
<!-- <el-table-column
align="center" header-align="center" label="年龄"
prop="age">
@@ -995,10 +1011,10 @@ layout("/layouts/platform.html"){
<el-input maxlength="50" placeholder="请填写电话" type="text"
v-model="LeaderData.mobile"></el-input>
</el-form-item>
<el-form-item label="职称职务" prop="position">
<!--<el-form-item label="职称职务" prop="position">
<el-input maxlength="50" placeholder="请填写职称职务" type="text"
v-model="LeaderData.position"></el-input>
</el-form-item>
</el-form-item>-->
</el-col>
<el-col :span="12">
<vi-title title="填写教练信息"></vi-title>
@@ -1038,10 +1054,10 @@ layout("/layouts/platform.html"){
<el-input maxlength="50" placeholder="请填写电话" type="text"
v-model="CoachData.mobile"></el-input>
</el-form-item>
<el-form-item label="职称职务" prop="position">
<!--<el-form-item label="职称职务" prop="position">
<el-input maxlength="50" placeholder="请填写职称职务" type="text"
v-model="CoachData.position"></el-input>
</el-form-item>
</el-form-item>-->
</el-col>
<!-- <el-col :span="12">
<vi-title title="填写工作人员信息"></vi-title>
@@ -1373,6 +1389,14 @@ layout("/layouts/platform.html"){
"delete_info": httpVueLoader("/components/activity/school/DeleteInfo.vue")
},
methods: {
checkNum(row, num){
if (num < 1) {
row.num = 1
}
if (num > 10) {
row.num = 10
}
},
tableRowClassName({row}) {
debugger
return row.color;
@@ -1622,6 +1646,10 @@ layout("/layouts/platform.html"){
this.selection = val
},
async changeLeader() {
if(!this.LeaderData.userId){
this.LeaderData={}
return
}
const userData = await this.getUserData(this.LeaderData.userId)
this.$set(this.LeaderData, "userId", this.LeaderData.userId)
this.$set(this.LeaderData, "loginname", userData.loginname)
@@ -1639,6 +1667,10 @@ layout("/layouts/platform.html"){
this.$set(this.LeaderData, "unionCoach", false)
},
async changeCoach() {
if(!this.CoachData.userId){
this.CoachData={}
return
}
const userData = await this.getUserData(this.CoachData.userId)
this.$set(this.CoachData, "userId", this.CoachData.userId)
this.$set(this.CoachData, "loginname", userData.loginname)
@@ -1657,6 +1689,10 @@ layout("/layouts/platform.html"){
},
async changeStaff() {
if(!this.staffData.userId){
this.staffData={}
return
}
const userData = await this.getUserData(this.staffData.userId)
this.$set(this.staffData, "userId", this.staffData.userId)
this.$set(this.staffData, "loginname", userData.loginname)
@@ -1673,6 +1709,10 @@ layout("/layouts/platform.html"){
},
async changeHead() {
if(!this.headData.userId){
this.headData={}
return
}
const userData = await this.getUserData(this.headData.userId)
this.$set(this.headData, "userId", this.headData.userId)
this.$set(this.headData, "loginname", userData.loginname)
@@ -1692,15 +1732,15 @@ layout("/layouts/platform.html"){
},
async doLeaderCoach() {
if (!this.LeaderData.position) {
/*if (!this.LeaderData.position&&this.LeaderData.userId) {
this.$message.warning("请填写领队职称职务")
return
}
if (!this.CoachData.position) {
if (!this.CoachData.position&&this.CoachData.userId) {
this.$message.warning("请填写教练职称职务")
return
}
}*/
this.$refs["form"].validate(async (valid) => {
if (valid) {
@@ -2102,10 +2142,10 @@ layout("/layouts/platform.html"){
})
//判断每一个选手填写的是否正确
for (let i = 0; i < appliedData.length; i++) {
if (!appliedData[i].position) {
/*if (!appliedData[i].position) {
this.$message.warning("请填写完整职称职务!")
return
}
}*/
if (!appliedData[i].mobile) {
this.$message.warning("请填写手机号!")
return
src/main/resources/views/platform/activity/school/ActivityManage.html
+3 -3
View File
@@ -143,9 +143,9 @@ layout("/layouts/platform.html"){
<el-dropdown-item :command="{type:'sendMsg',row}">通知</el-dropdown-item>
<el-dropdown-item :command="{type:'openCode',row}">二维码</el-dropdown-item>
<el-dropdown-item :command="{type:'view',row}">查看</el-dropdown-item>
<el-dropdown-item :command="{type:'export',row}">导出名单docx</el-dropdown-item>
<el-dropdown-item :command="{type:'exportXlsx', row}">按工会导出名单excel</el-dropdown-item>
<el-dropdown-item :command="{type:'exportXlsxAll', row}">导出名单（总表）excel</el-dropdown-item>
<el-dropdown-item v-if="row.applyNum > 0" :command="{type:'export',row}">导出名单docx</el-dropdown-item>
<el-dropdown-item v-if="row.applyNum > 0" :command="{type:'exportXlsx', row}">按工会导出名单excel</el-dropdown-item>
<el-dropdown-item v-if="row.applyNum > 0" :command="{type:'exportXlsxAll', row}">导出名单（总表）excel</el-dropdown-item>
<el-dropdown-item :command="{type:'edit',row}">编辑</el-dropdown-item>
<el-dropdown-item :command="{type:'delete',row}">删除</el-dropdown-item>
</el-dropdown-menu>
src/main/resources/views/platform/jf/bxFundsLayout/accounting.html
+1 -1
View File
@@ -199,7 +199,7 @@
},
formRules: {
idea: [{ required: true, message: "请填写意见", trigger: ["blur", "change"] }],
sign: [{ required: true, message: "必填", trigger: ["blur", "change"] }]
//sign: [{ required: true, message: "必填", trigger: ["blur", "change"] }]
}
}
},
src/main/resources/views/platform/welfare/list/ListMange.html
+3 -3
View File
@@ -282,7 +282,7 @@ layout("/layouts/platform.html"){
</el-button>
<el-button
:disabled="moment(projectInfo.choiceTimeEnd).valueOf()<moment().valueOf()"
:disabled="moment(projectInfo.checkEndTime).valueOf()<moment().valueOf()"
type="primary"
size="small"
@click="doAudit(true)"
@@ -291,7 +291,7 @@ layout("/layouts/platform.html"){
</el-button>
<!-- 取消确认 -->
<el-button
:disabled="moment(projectInfo.choiceTimeEnd).valueOf()<moment().valueOf()"
:disabled="moment(projectInfo.checkEndTime).valueOf()<moment().valueOf()"
type="danger"
size="small"
@click="doAudit(false)"
@@ -393,7 +393,7 @@ layout("/layouts/platform.html"){
@click="openEditWelfare(row)"
size="mini"
type="primary"
:disabled="moment(projectInfo.choiceTimeEnd).valueOf()<moment().valueOf()"
:disabled="moment(projectInfo.checkEndTime).valueOf()<moment().valueOf()"
>
编辑
</el-button>
src/main/resources/views/platform/welfare/project/ProjectMange.html
+13
View File
@@ -263,6 +263,19 @@ layout("/layouts/platform.html"){
></el-date-picker>
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="核对截至时间" prop="checkEndTime">
<el-date-picker
placeholder="核对截至时间"
style="width: 100%"
type="datetime"
v-model="formData.checkEndTime"
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
src/main/resources/views/platform/zgfw/lxy/HdGhbm.html
+1 -1
View File
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
<template scope="scope">{{scope.row.hdkssj}} 至 {{scope.row.hdjssj}}</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="报名时间" prop="bmsj" show-overflow-tooltip sortable width="200px">
<el-table-column align="center" header-align="center" label="报名时间" prop="bmkssj" show-overflow-tooltip sortable width="200px">
<template scope="scope">{{scope.row.bmkssj}} 至 {{scope.row.bmjzsj}}</template>
</el-table-column>