From f4f92a9ced6b586cc5be32a67ede15c1acea2961 Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Tue, 12 Aug 2025 15:18:41 +0800 Subject: [PATCH] commit --- .../controller/SickHelpImportController.java | 2 +- .../controller/SickHelpListController.java | 44 ++++++++++++++++--- .../SickHelpMedicalInsController.java | 18 ++++---- .../member/SickHelpMemberController.java | 3 +- .../platform/AgendaController.java | 1 + .../views/platform/sickHelp/import/excel.html | 4 +- .../platform/sickHelp/medicalIns/index.html | 4 +- .../platform/sickHelp/member/execlImport.html | 2 +- .../views/platform/sickHelp/member/list.html | 11 +++-- 9 files changed, 65 insertions(+), 24 deletions(-) diff --git a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpImportController.java b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpImportController.java index 1444e77..17a91c0 100644 --- a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpImportController.java +++ b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpImportController.java @@ -211,7 +211,7 @@ public class SickHelpImportController { sickHelp.setSchoolSecondSubsidyMoney(v.getEcbx()); sickHelp.setSelfPayMoney(v.getCalc()); return sickHelp; - }).filter(v -> v.getSelfPayMoney() != null && v.getSelfPayMoney().compareTo(BigDecimal.valueOf(10000)) >= 0).collect(Collectors.toList()); + }).filter(v -> v.getSelfPayMoney() == null || (v.getSelfPayMoney() != null && v.getSelfPayMoney().compareTo(BigDecimal.valueOf(10000)) >= 0)).collect(Collectors.toList()); List sickHelps = sickHelpImportService.checkData(collect); return Result.success(sickHelps); diff --git a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpListController.java b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpListController.java index 81457ac..5018139 100644 --- a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpListController.java +++ b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpListController.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.vo.BaseEntityTypeConstants; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import io.v.nutz.annontation.ViReturn; @@ -192,6 +193,7 @@ public class SickHelpListController { sick.subsidyMoney, sick.remarks, sfm.userState, + sfm.isMember, u.userState userState2 FROM sick_help sick @@ -216,6 +218,14 @@ public class SickHelpListController { if (!userState.equals(userState2)) { list.get(i).put("userState", userState2); } + if (list.get(i).getInt("isMember", 0) != 1) { + list.get(i).put("isMember", "否"); + } + + if (ObjectUtil.isEmpty(list.get(i).getAs("subsidyMoney", BigDecimal.class))) { + list.get(i).put("subsidyMoney", new BigDecimal(0)); + } + } // 求和 @@ -235,11 +245,35 @@ public class SickHelpListController { excelExportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); excelExportEntities.add(new ExcelExportEntity("单位", "unitName", 20)); excelExportEntities.add(new ExcelExportEntity("状态", "userState", 20)); - excelExportEntities.add(new ExcelExportEntity("医保系统中个人自付、个人自理总金额（元）", "medicalFourTotalMoney", 30)); - excelExportEntities.add(new ExcelExportEntity("医保系统中个人自付金额（元）", "selfPayTotalMoney", 30)); - excelExportEntities.add(new ExcelExportEntity("学校补充医疗保险报销金额（元）", "schoolSecondSubsidyMoney", 30)); - excelExportEntities.add(new ExcelExportEntity("个人支付金额（元）", "selfPayMoney", 20)); - excelExportEntities.add(new ExcelExportEntity("补助金额（元）", "subsidyMoney", 20)); + excelExportEntities.add(new ExcelExportEntity("是否会员", "isMember", 20)); + + + ExcelExportEntity excelEntity1 = new ExcelExportEntity("医保系统中个人自付、个人自理总金额（元）", "medicalFourTotalMoney", 30); + excelEntity1.setType(BaseEntityTypeConstants.DOUBLE_TYPE); + excelExportEntities.add(excelEntity1); + + ExcelExportEntity excelEntity2 = new ExcelExportEntity("医保系统中个人自付金额（元）", "selfPayTotalMoney", 30); + excelEntity2.setType(BaseEntityTypeConstants.DOUBLE_TYPE); + excelExportEntities.add(excelEntity2); + + ExcelExportEntity excelEntity3 = new ExcelExportEntity("学校补充医疗保险报销金额（元）", "schoolSecondSubsidyMoney", 30); + excelEntity3.setType(BaseEntityTypeConstants.DOUBLE_TYPE); + excelExportEntities.add(excelEntity3); + + ExcelExportEntity excelEntity4 = new ExcelExportEntity("个人支付金额（元）", "selfPayMoney", 30); + excelEntity4.setType(BaseEntityTypeConstants.DOUBLE_TYPE); + excelExportEntities.add(excelEntity4); + + ExcelExportEntity excelEntity5 = new ExcelExportEntity("补助金额（元）", "subsidyMoney", 30); + excelEntity5.setType(BaseEntityTypeConstants.DOUBLE_TYPE); + excelExportEntities.add(excelEntity5); + + +// excelExportEntities.add(new ExcelExportEntity("医保系统中个人自付、个人自理总金额（元）", "medicalFourTotalMoney", 30)); +// excelExportEntities.add(new ExcelExportEntity("医保系统中个人自付金额（元）", "selfPayTotalMoney", 30)); +// excelExportEntities.add(new ExcelExportEntity("学校补充医疗保险报销金额（元）", "schoolSecondSubsidyMoney", 30)); +// excelExportEntities.add(new ExcelExportEntity("个人支付金额（元）", "selfPayMoney", 20)); +// excelExportEntities.add(new ExcelExportEntity("补助金额（元）", "subsidyMoney", 20)); excelExportEntities.add(new ExcelExportEntity("未补助年份", "noSubsidyYear", 20)); excelExportEntities.add(new ExcelExportEntity("备注", "remarks", 20)); diff --git a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java index d5c2215..f0fed28 100644 --- a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java +++ b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java @@ -369,15 +369,15 @@ public class SickHelpMedicalInsController { @At @RequiresPermissions("sickHelp.medicalIns") public Result checkEc() { - int count = dao.count(SickHelpMedicalIns.class, Cnd.where("year", "=", DateUtil.thisYear() - 1) - .and("ecbx", "is", null)); - if (count > 0) { - return Result.error("二次报销数据还有" + count + "条未核对正确，请先核对!"); - } - int fullCount = dao.count(SickHelpMedicalIns.class, Cnd.where("year", "=", DateUtil.thisYear() - 1)); - if (fullCount == 0) { - return Result.error("二次报销数据未导入!"); - } +// int count = dao.count(SickHelpMedicalIns.class, Cnd.where("year", "=", DateUtil.thisYear() - 1) +// .and("ecbx", "is", null)); +// if (count > 0) { +// return Result.error("二次报销数据还有" + count + "条未核对正确，请先核对!"); +// } +// int fullCount = dao.count(SickHelpMedicalIns.class, Cnd.where("year", "=", DateUtil.thisYear() - 1)); +// if (fullCount == 0) { +// return Result.error("二次报销数据未导入!"); +// } return Result.success(); } diff --git a/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java b/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java index 4f50439..423ce4b 100644 --- a/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java +++ b/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java @@ -96,8 +96,9 @@ public class SickHelpMemberController { fundMember.setUnitId(user.getString("unitid")); fundMember.setUnitName(user.getString("unitname")); fundMember.setSex(user.getString("sex")); - fundMember.setIsMember(true); +// fundMember.setIsMember(true); } + fundMember.setIsMember(false); } return list; } diff --git a/src/main/java/io/v/nutz/web/controllers/platform/AgendaController.java b/src/main/java/io/v/nutz/web/controllers/platform/AgendaController.java index a6ee436..3f6de35 100644 --- a/src/main/java/io/v/nutz/web/controllers/platform/AgendaController.java +++ b/src/main/java/io/v/nutz/web/controllers/platform/AgendaController.java @@ -40,6 +40,7 @@ public class AgendaController { list.add(new NutMap().addv("iconClass", "").addv("imgUrl", "/assets/platform/img/quickentry/welfare.png").addv("label", "福利慰问").addv("url", "/platform/welfare/mine").addv("color", "#c88f5c")); list.add(new NutMap().addv("iconClass", "").addv("imgUrl", "/assets/platform/img/quickentry/db.png").addv("label", "大病互助").addv("url", "/platform/sickHelp/mySubsidyRecord").addv("color", "#dd5858")); list.add(new NutMap().addv("iconClass", "").addv("imgUrl", "/assets/platform/img/quickentry/jy.png").addv("label", "建言献策").addv("url", "/platform/offerAdviceWrite").addv("color", "#2fbabf")); + list.add(new NutMap().addv("iconClass", "").addv("imgUrl", "/assets/platform/img/quickentry/db.png").addv("label", "医疗互助").addv("url", "/platform/sickHelp/list").addv("color", "#b20e0ed9")); /*list.add(new NutMap().addv("iconClass", "fa fa-address-card-o").addv("label", "代表推选").addv("url", "/platform/teacherMeet/push").addv("color", "#0CB2B7")); list.add(new NutMap().addv("iconClass", "fa el-icon-user").addv("label", "申请入会").addv("url", "/platform/member/apply/submit").addv("color", "#0CB2B7")); diff --git a/src/main/resources/views/platform/sickHelp/import/excel.html b/src/main/resources/views/platform/sickHelp/import/excel.html index 35e9866..584c984 100644 --- a/src/main/resources/views/platform/sickHelp/import/excel.html +++ b/src/main/resources/views/platform/sickHelp/import/excel.html @@ -239,8 +239,8 @@ layout("/layouts/platform.html"){ async doImport() { const hasErrorData = this.tableData.some(v => !v.valid) if (hasErrorData) { - this.notifyWarning('数据校验不合格，无法导入') - return + // this.notifyWarning('数据校验不合格，无法导入') + // return } const resp = await $.post('/platform/sickHelp/import/doImport', {sickHelps: JSON.stringify(this.tableData)}) if (resp.code === 0) { diff --git a/src/main/resources/views/platform/sickHelp/medicalIns/index.html b/src/main/resources/views/platform/sickHelp/medicalIns/index.html index 5a7ab3d..7ddc784 100644 --- a/src/main/resources/views/platform/sickHelp/medicalIns/index.html +++ b/src/main/resources/views/platform/sickHelp/medicalIns/index.html @@ -235,8 +235,8 @@ layout("/layouts/platform.html"){ {prop: 'zhzf', label: '账户自付'}, {prop: 'xjzl', label: '现金自理'}, {prop: 'xjzf', label: '现金自付'}, - {prop: 'sxzf', label: '四项之和'}, - {prop: 'lxzf', label: '两项之和'}, + {prop: 'sxzf', label: '个人自付、个人自理'}, + {prop: 'lxzf', label: '个人自付'}, {prop: 'ecbx', label: '学校二次报销金额'}, {prop: 'calc', label: '补助计算金额'}, ], diff --git a/src/main/resources/views/platform/sickHelp/member/execlImport.html b/src/main/resources/views/platform/sickHelp/member/execlImport.html index 833579a..5d7d396 100644 --- a/src/main/resources/views/platform/sickHelp/member/execlImport.html +++ b/src/main/resources/views/platform/sickHelp/member/execlImport.html @@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
diff --git a/src/main/resources/views/platform/sickHelp/member/list.html b/src/main/resources/views/platform/sickHelp/member/list.html index c25f797..1754265 100644 --- a/src/main/resources/views/platform/sickHelp/member/list.html +++ b/src/main/resources/views/platform/sickHelp/member/list.html @@ -77,7 +77,7 @@ layout("/layouts/platform.html"){ - + +