diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/statistics/FamilyActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/statistics/FamilyActivityStatisticsController.java index 4f9fecd..cfe6f64 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/statistics/FamilyActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/statistics/FamilyActivityStatisticsController.java @@ -263,6 +263,7 @@ public class FamilyActivityStatisticsController { Map 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) 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(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/fellowship/controller/statistics/FellowshipActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/fellowship/controller/statistics/FellowshipActivityStatisticsController.java index e99e3de..5d855ec 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/fellowship/controller/statistics/FellowshipActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/fellowship/controller/statistics/FellowshipActivityStatisticsController.java @@ -213,9 +213,9 @@ public class FellowshipActivityStatisticsController { userSignData.put(cv.getString("columnCode"), cv.getString("columnValue")); } else { if (StrUtil.isNotBlank(cv.getString("columnValue"))) { - List columnValue = Json.fromJsonAsList(JSONObject.class, cv.getString("columnValue")); + List 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 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) 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(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index 0a9a820..b5b8902 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -393,6 +393,7 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl columnValue = Json.fromJsonAsList(JSONObject.class, cv.getString("columnValue")); - if (columnValue.size() == 1) { - JSONObject sysFile = columnValue.get(0); + List 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 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) 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(); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/statistics/LiteracyActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/statistics/LiteracyActivityStatisticsController.java index 7245dde..892aa4f 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/statistics/LiteracyActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/statistics/LiteracyActivityStatisticsController.java @@ -207,9 +207,9 @@ public class LiteracyActivityStatisticsController { userSignData.put(cv.getString("columnCode"), cv.getString("columnValue")); } else { if (StrUtil.isNotBlank(cv.getString("columnValue"))) { - List columnValue = Json.fromJsonAsList(JSONObject.class, cv.getString("columnValue")); + List 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 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) 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(); } diff --git a/src/main/resources/static/assets/platform/img/home/family.png b/src/main/resources/static/assets/platform/img/home/family.png index 993cc8a..5c3126e 100644 Binary files a/src/main/resources/static/assets/platform/img/home/family.png and b/src/main/resources/static/assets/platform/img/home/family.png differ diff --git a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html index 61a8fd0..a503e11 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/xghsh.html @@ -4,7 +4,7 @@ layout("/layouts/platform.html"){ diff --git a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html index 87cfb02..7d374fc 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/zp.html @@ -2,7 +2,9 @@ layout("/layouts/platform.html"){ #-->
@@ -166,6 +168,16 @@ layout("/layouts/platform.html"){ + + + + @@ -190,7 +202,8 @@ layout("/layouts/platform.html"){ - + @@ -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}