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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-12-18 08:42:26 +08:00
parent 238d4ca446
commit 63cd3d74cf
8 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/family/controller/statistics/FamilyActivityStatisticsController.java
+2 -1
View File
@@ -263,6 +263,7 @@ public class FamilyActivityStatisticsController {
Map<String, Object> userExportMap = new HashMap<>();
userExportMap.put("name", k);
userExportParams.setType(ExcelType.HSSF);
userExportMap.put("title", userExportParams);
userExportMap.put("entity", currentEntities);
userExportMap.put("data", courseSignUsers);
@@ -275,7 +276,7 @@ public class FamilyActivityStatisticsController {
ExcelExportService service = new ExcelExportService();
service.createSheetForMap(workbook, (ExportParams) map.get("title"), (List<ExcelExportEntity>) map.get("entity"), (Collection<?>) map.get("data"));
}
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xlsx", workbook, response);
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xls", workbook, response);
} catch (Exception e) {
e.printStackTrace();
}
src/main/java/com/budwk/app/zhgh/activity/fellowship/controller/statistics/FellowshipActivityStatisticsController.java
+4 -6
View File
@@ -213,9 +213,9 @@ public class FellowshipActivityStatisticsController {
userSignData.put(cv.getString("columnCode"), cv.getString("columnValue"));
} else {
if (StrUtil.isNotBlank(cv.getString("columnValue"))) {
List<JSONObject> columnValue = Json.fromJsonAsList(JSONObject.class, cv.getString("columnValue"));
List<NutMap> columnValue = cv.getAsList("columnValue", NutMap.class);
if (columnValue.size() == 1) {
JSONObject sysFile = columnValue.get(0);
NutMap sysFile = columnValue.get(0);
Sys_file file = dao.fetch(Sys_file.class, Cnd.where(Sys_file::getDownloadPath, "=", sysFile.get("url")));
byte[] imageBytes = SysFileMinIoUtil.getFileBytes(file.getBucket(), file.getStoragePath());
if (imageBytes.length > 0) {
@@ -231,6 +231,7 @@ public class FellowshipActivityStatisticsController {
Map<String, Object> userExportMap = new HashMap<>();
userExportMap.put("name", k);
userExportParams.setType(ExcelType.HSSF);
userExportMap.put("title", userExportParams);
userExportMap.put("entity", currentEntities);
userExportMap.put("data", v);
@@ -243,10 +244,7 @@ public class FellowshipActivityStatisticsController {
ExcelExportService service = new ExcelExportService();
service.createSheetForMap(workbook, (ExportParams) map.get("title"), (List<ExcelExportEntity>) map.get("entity"), (Collection<?>) map.get("data"));
}
workbook.write(response.getOutputStream());
workbook.close();
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xlsx", workbook, response);
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xls", workbook, response);
} catch (Exception e) {
e.printStackTrace();
}
src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java
+1
View File
@@ -393,6 +393,7 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
dao().update(ActivitySchoolApply.class,
Chain.make("status", 2),
Cnd.where("activityId", "=", activityId)
.and("eventId", "=", eventId)
.and("activityUnionId", "=", basicUnion.getId()));
}
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java
+5 -7
View File
@@ -267,9 +267,9 @@ public class TrainSignUpActivityStatisticsController {
userSignData.put(cv.getString("columnCode"), cv.getString("columnValue"));
} else {
if (StrUtil.isNotBlank(cv.getString("columnValue"))) {
List<JSONObject> columnValue = Json.fromJsonAsList(JSONObject.class, cv.getString("columnValue"));
if (columnValue.size() == 1) {
JSONObject sysFile = columnValue.get(0);
List<NutMap> columnValue = cv.getAsList("columnValue", NutMap.class);
if (columnValue.size() == 1) {
NutMap sysFile = columnValue.get(0);
Sys_file file = dao.fetch(Sys_file.class, Cnd.where(Sys_file::getDownloadPath, "=", sysFile.get("url")));
byte[] imageBytes = SysFileMinIoUtil.getFileBytes(file.getBucket(), file.getStoragePath());
if (imageBytes.length > 0) {
@@ -285,6 +285,7 @@ public class TrainSignUpActivityStatisticsController {
Map<String, Object> userExportMap = new HashMap<>();
userExportMap.put("name", k);
userExportParams.setType(ExcelType.HSSF);
userExportMap.put("title", userExportParams);
userExportMap.put("entity", currentEntities);
userExportMap.put("data", v);
@@ -297,10 +298,7 @@ public class TrainSignUpActivityStatisticsController {
ExcelExportService service = new ExcelExportService();
service.createSheetForMap(workbook, (ExportParams) map.get("title"), (List<ExcelExportEntity>) map.get("entity"), (Collection<?>) map.get("data"));
}
workbook.write(response.getOutputStream());
workbook.close();
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xlsx", workbook, response);
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xls", workbook, response);
} catch (Exception e) {
e.printStackTrace();
}
src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/statistics/LiteracyActivityStatisticsController.java
+4 -6
View File
@@ -207,9 +207,9 @@ public class LiteracyActivityStatisticsController {
userSignData.put(cv.getString("columnCode"), cv.getString("columnValue"));
} else {
if (StrUtil.isNotBlank(cv.getString("columnValue"))) {
List<JSONObject> columnValue = Json.fromJsonAsList(JSONObject.class, cv.getString("columnValue"));
List<NutMap> columnValue = cv.getAsList("columnValue", NutMap.class);
if (columnValue.size() == 1) {
JSONObject sysFile = columnValue.get(0);
NutMap sysFile = columnValue.get(0);
Sys_file file = dao.fetch(Sys_file.class, Cnd.where(Sys_file::getDownloadPath, "=", sysFile.get("url")));
byte[] imageBytes = SysFileMinIoUtil.getFileBytes(file.getBucket(), file.getStoragePath());
if (imageBytes.length > 0) {
@@ -225,6 +225,7 @@ public class LiteracyActivityStatisticsController {
Map<String, Object> userExportMap = new HashMap<>();
userExportMap.put("name", k);
userExportParams.setType(ExcelType.HSSF);
userExportMap.put("title", userExportParams);
userExportMap.put("entity", currentEntities);
userExportMap.put("data", v);
@@ -237,10 +238,7 @@ public class LiteracyActivityStatisticsController {
ExcelExportService service = new ExcelExportService();
service.createSheetForMap(workbook, (ExportParams) map.get("title"), (List<ExcelExportEntity>) map.get("entity"), (Collection<?>) map.get("data"));
}
workbook.write(response.getOutputStream());
workbook.close();
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xlsx", workbook, response);
CommonDownloadUtil.download(activity.getActivityName() + "报名人员名单" + ".xls", workbook, response);
} catch (Exception e) {
e.printStackTrace();
}
src/main/resources/static/assets/platform/img/home/family.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 356 KiB

After

Width:  |  Height:  |  Size: 697 KiB

src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html
+1 -1
View File
@@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
<style>
.el-table .warning-row {
background: oldlace;
background: #CCE5FF;
}
</style>
src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html
+36 -7
View File
@@ -2,7 +2,9 @@
layout("/layouts/platform.html"){
#-->
<style>
.el-table .warning-row {
background: #CCE5FF;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
@@ -166,6 +168,16 @@ layout("/layouts/platform.html"){
</el-button>
</template>
</el-table-column>
<el-table-column label="是否申诉" header-align="center" align="center" prop="updateStatus" width="150"
v-if="$moment().isAfter($moment(formData.startApplyTime)) && $moment().isBefore($moment(formData.endApplyTime))">
<template scope="{row}">
<el-radio-group v-model="row.zp.updateStatus" size="small">
<el-radio-button :label="true">申诉</el-radio-button>
<el-radio-button :label="false">不申诉</el-radio-button>
</el-radio-group>
</template>
</el-table-column>
</el-table>
</el-row>
</el-form-item>
@@ -190,7 +202,8 @@ layout("/layouts/platform.html"){
</el-row>
<el-row style="margin-top: 20px">
<el-table :data="nr.bzs" style="width: 100%" border show-summary size="small" :summary-method="getSummaries">
<el-table :data="nr.bzs" style="width: 100%" border show-summary size="small" :summary-method="getSummaries"
:row-class-name="tableRowClassName">
<el-table-column align="center" header-align="center" label="序号" type="index" width="80">
</el-table-column>
@@ -365,6 +378,12 @@ layout("/layouts/platform.html"){
},
methods: {
tableRowClassName({row, rowIndex}) {
if(row.zp?.updateStatus === true) {
return 'warning-row';
}
return '';
},
goBack() {
this.pageData()
this.$refs.guava.index()
@@ -453,9 +472,14 @@ layout("/layouts/platform.html"){
for (let j = 0; j < n.bzs.length; j++) {
const b = n.bzs[j]
params.push({
"zb_id": this.formData.id, "nr_id": n.id,
"bz_id": b.id, "clnr": b.zp?.clnr, "zpf": b.zp?.zpf, "files": b.zp?.files,
"id": b.zp?.id ? b.zp?.id : null
"zb_id": this.formData.id,
"nr_id": n.id,
"bz_id": b.id,
"clnr": b.zp?.clnr,
"zpf": b.zp?.zpf,
"files": b.zp?.files,
"id": b.zp?.id ? b.zp?.id : null,
"updateStatus": b.zp?.updateStatus
})
if(v === 'submit' && valid === true) {
if(b.isEvidence === true && !b.zp?.files) {
@@ -675,8 +699,13 @@ layout("/layouts/platform.html"){
n.bzs.forEach(b => {
if (b.zp) {
zp = {
"zb_id": this.formData.id, "nr_id": n.id,
"bz_id": b.id, "clnr": b.zp.clnr, "zpf": b.zpf, "files": b.zp.files
"zb_id": this.formData.id,
"nr_id": n.id,
"bz_id": b.id,
"clnr": b.zp.clnr,
"zpf": b.zpf,
"files": b.zp.files,
"updateStatus": b.zp?.updateStatus
}
} else {
zp = {"zb_id": this.formData.id, "nr_id": n.id, "bz_id": b.id, "zpf": b.zpf}