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

commit

Browse Source
This commit is contained in:
JyuHsin
2025-08-12 15:18:41 +08:00
parent 1ab84aadc4
commit f4f92a9ced
9 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sickHelp/controller/SickHelpImportController.java
+1 -1
View File
@@ -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<SickHelp> sickHelps = sickHelpImportService.checkData(collect);
return Result.success(sickHelps);
src/main/java/io/v/nutz/sickHelp/controller/SickHelpListController.java
+39 -5
View File
@@ -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));
src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java
+9 -9
View File
@@ -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();
}
src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
+2 -1
View File
@@ -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;
}
src/main/java/io/v/nutz/web/controllers/platform/AgendaController.java
+1
View File
@@ -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"));
src/main/resources/views/platform/sickHelp/import/excel.html
+2 -2
View File
@@ -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) {
src/main/resources/views/platform/sickHelp/medicalIns/index.html
+2 -2
View File
@@ -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: '补助计算金额'},
],
src/main/resources/views/platform/sickHelp/member/execlImport.html
+1 -1
View File
@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<template #header>
<h3 style="color: rgb(24, 103, 176);">大病医疗互助会员数据导入</h3>
<h3 style="color: rgb(24, 103, 176);">重大疾病医疗互助会员数据导入</h3>
</template>
<el-row justify="center" style="position: relative" type="flex">
<div class="downLoadTemplate">
src/main/resources/views/platform/sickHelp/member/list.html
+8 -3
View File
@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
</el-card>
<el-card class="mt10" shadow="never">
<table-tool :app="this" label="大病医疗互助会员">
<table-tool :app="this" label="重大疾病医疗互助会员台账">
<template #func>
<el-radio-group v-model="pageForm.checkMode" size="small" @change="doSearch" class="mr10">
<el-radio-button label="">全部</el-radio-button>
@@ -113,6 +113,11 @@ layout("/layouts/platform.html"){
<span v-if="row.isMember==false">否</span>
<span v-if="row.isMember==null"></span>
</template>
<template scope="{row}" v-else-if="column.prop==='mutualGoldStartTime'">
<span v-if="row.mutualGoldStartTime">
{{moment(row.mutualGoldStartTime).format('YYYY-MM')}}
</span>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<template scope="{row}">
@@ -167,7 +172,7 @@ layout("/layouts/platform.html"){
:picker-options="pickerOptions"
placeholder="入会时间"
style="width: 100%"
type="date"
type="month"
v-model="formData.mutualGoldStartTime"
value-format="yyyy-MM-dd">
</el-date-picker>
@@ -206,7 +211,7 @@ layout("/layouts/platform.html"){
rules: {
loginName: [{required: true, message: '请输入工号', trigger: ['change', 'blur']}],
userName: [{required: true, message: '请输入姓名', trigger: ['change', 'blur']}],
sex: [{required: true, message: '请选择性别', trigger: ['change', 'blur']}],
// sex: [{required: true, message: '请选择性别', trigger: ['change', 'blur']}],
unitName: [{required: false, message: '请输入单位', trigger: ['change', 'blur']}],
unitId: [{required: true, message: '请选择单位', trigger: ['change', 'blur']}],
isMember: [{required: true, message: '请选择是否会员', trigger: ['change', 'blur']}],