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

bug整改

Browse Source
This commit is contained in:
c-zhangr1
2026-04-25 11:41:14 +08:00
parent 14a150a335
commit 9b92c29197
11 changed files with 486 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/OutlayManageUnionAllocateService.java
+41
View File
@@ -3,8 +3,12 @@ package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo;
import org.apache.poi.ss.usermodel.Workbook;
import org.nutz.mvc.upload.TempFile;
import java.math.BigDecimal;
import java.util.List;
/**
* 分工会季度额度分配服务。
@@ -35,6 +39,43 @@ public interface OutlayManageUnionAllocateService extends BaseService<OutLayAllo
*/
Result doBatchAllocate(BigDecimal allocateMoney, Integer quarterly, Integer year);
/**
* 判断某年某季度是否已经做过额度分配。
*
* <p>只要当前季度记录中存在分配额度大于 0 的有效记录，
* 就认为该季度已经分配过额度，前端据此决定是否提示再次分配。</p>
*
* @param quarterly 要检查的季度，例如 1/2/3/4
* @param year 要检查的年份
* @return true 已分配过；false 未分配
*/
boolean hasAllocated(Integer quarterly, Integer year);
/**
* 解析导入文件并返回预览数据。
*
* @param file Excel 文件
* @return 解析后的预览数据
*/
List<OutlayUnionAllocateImportVo> readImportExcel(TempFile file);
/**
* 根据导入数据按分工会逐条分配季度额度。
*
* @param importList 导入预览数据
* @param quarterly 当前季度
* @param year 当前年度
* @return 导入分配结果
*/
Result doImportAllocate(List<OutlayUnionAllocateImportVo> importList, Integer quarterly, Integer year);
/**
* 导出分工会额度导入模板。
*
* @return 模板工作簿
*/
Workbook exportImportTemplate();
/**
* 重置当前季度的分配记录。
*
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/service/impl/OutlayManageUnionAllocateServiceImpl.java
+150
View File
@@ -1,20 +1,36 @@
package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.impl;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.sys.models.Sys_union;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayManageUnionAllocateService;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo;
import org.apache.poi.ss.usermodel.Workbook;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.mvc.upload.TempFile;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 分工会季度额度分配实现。
@@ -57,6 +73,140 @@ public class OutlayManageUnionAllocateServiceImpl extends BaseServiceImpl<OutLay
return Result.success();
}
@Override
public boolean hasAllocated(Integer quarterly, Integer year) {
if (quarterly == null || year == null) {
return false;
}
int count = dao().count(OutLayAllocateUnion.class,
Cnd.where(OutLayAllocateUnion::getQuarterly, "=", quarterly)
.and(OutLayAllocateUnion::getYear, "=", year)
.and(OutLayAllocateUnion::getDelFlag, "=", false)
.and("allocateMoney", ">", BigDecimal.ZERO));
return count > 0;
}
@Override
public List<OutlayUnionAllocateImportVo> readImportExcel(TempFile file) {
String extName = FileUtil.extName(file.getFile());
if (!"xlsx".equalsIgnoreCase(extName) && !"xls".equalsIgnoreCase(extName)) {
throw Lang.makeThrow("请上传xlsx或xls格式文件");
}
List<OutlayUnionAllocateImportVo> importList = ExcelImportUtil.importExcel(file.getFile(),
OutlayUnionAllocateImportVo.class, new ImportParams());
List<Sys_union> unionList = dao().query(Sys_union.class, Cnd.NEW());
Map<String, Sys_union> unionMap = new HashMap<>();
for (Sys_union union : unionList) {
unionMap.put(union.getUnionCode(), union);
}
Set<String> duplicateUnionCodeSet = new LinkedHashSet<>();
Set<String> existUnionCodeSet = new LinkedHashSet<>();
for (OutlayUnionAllocateImportVo item : importList) {
if (StrUtil.isBlank(item.getUnionCode())) {
continue;
}
if (!existUnionCodeSet.add(item.getUnionCode())) {
duplicateUnionCodeSet.add(item.getUnionCode());
}
}
for (int i = 0; i < importList.size(); i++) {
OutlayUnionAllocateImportVo item = importList.get(i);
item.setRowNum(i + 2);
if (StrUtil.isBlank(item.getUnionCode())) {
item.setErrMsg("工会编码不能为空");
continue;
}
if (item.getAllocateMoney() == null) {
item.setErrMsg("分配额度不能为空");
continue;
}
if (item.getAllocateMoney().compareTo(BigDecimal.ZERO) < 0) {
item.setErrMsg("分配额度不能小于0");
continue;
}
Sys_union union = unionMap.get(item.getUnionCode());
if (Lang.isEmpty(union)) {
item.setErrMsg("工会编码不存在");
continue;
}
item.setUnionName(union.getName());
if (duplicateUnionCodeSet.contains(item.getUnionCode())) {
item.setErrMsg("工会编码重复");
}
}
return importList;
}
@Override
public Result doImportAllocate(List<OutlayUnionAllocateImportVo> importList, Integer quarterly, Integer year) {
if (importList == null || importList.isEmpty()) {
return Result.error("请先上传导入数据");
}
List<OutLayAllocateUnion> allocateUnionList = dao().query(OutLayAllocateUnion.class,
Cnd.where(OutLayAllocateUnion::getQuarterly, "=", quarterly)
.and(OutLayAllocateUnion::getYear, "=", year)
.and(OutLayAllocateUnion::getDelFlag, "=", false));
if (allocateUnionList == null || allocateUnionList.isEmpty()) {
return Result.error("当前季度没有分配记录！");
}
List<Sys_union> unionList = dao().query(Sys_union.class, Cnd.NEW());
Map<String, Sys_union> unionMap = new HashMap<>();
for (Sys_union union : unionList) {
unionMap.put(union.getUnionCode(), union);
}
Map<String, OutLayAllocateUnion> allocateUnionMap = new HashMap<>();
for (OutLayAllocateUnion allocateUnion : allocateUnionList) {
allocateUnionMap.put(allocateUnion.getUnionId(), allocateUnion);
}
List<String> errorList = new ArrayList<>();
for (OutlayUnionAllocateImportVo item : importList) {
if (StrUtil.isBlank(item.getUnionCode())) {
errorList.add("第" + item.getRowNum() + "行：工会编码不能为空");
continue;
}
if (item.getAllocateMoney() == null) {
errorList.add("第" + item.getRowNum() + "行：分配额度不能为空");
continue;
}
if (item.getAllocateMoney().compareTo(BigDecimal.ZERO) < 0) {
errorList.add("第" + item.getRowNum() + "行：分配额度不能小于0");
continue;
}
if (StrUtil.isNotBlank(item.getErrMsg())) {
errorList.add("第" + item.getRowNum() + "行：" + item.getErrMsg());
continue;
}
Sys_union union = unionMap.get(item.getUnionCode());
if (Lang.isEmpty(union)) {
errorList.add("第" + item.getRowNum() + "行：工会编码不存在");
continue;
}
if (!allocateUnionMap.containsKey(union.getId())) {
errorList.add("第" + item.getRowNum() + "行：当前季度未生成该分工会分配记录");
}
}
if (!errorList.isEmpty()) {
return Result.error(String.join("；", errorList));
}
for (OutlayUnionAllocateImportVo item : importList) {
Sys_union union = unionMap.get(item.getUnionCode());
OutLayAllocateUnion allocateUnion = allocateUnionMap.get(union.getId());
// 导入分配与手工分配保持同一套金额同步规则，确保季度表和年度预算表数据一致。
applyAllocateMoney(allocateUnion, item.getAllocateMoney());
}
return Result.success("导入分配成功");
}
@Override
public Workbook exportImportTemplate() {
List<ExcelExportEntity> entityList = new ArrayList<>();
entityList.add(new ExcelExportEntity("工会编码", "unionCode", 20));
entityList.add(new ExcelExportEntity("分配额度", "allocateMoney", 20));
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
return ExcelExportUtil.exportExcel(exportParams, entityList, new ArrayList<>());
}
@Override
public Result deleteAllocateRecord() {
int currentQuarter = getCurrentQuarter();
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionAllocateController.java
+62
View File
@@ -1,5 +1,6 @@
package com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.controller;
import com.budwk.app.base.utils.CommonDownloadUtil;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
@@ -12,9 +13,11 @@ import com.budwk.app.sys.models.Sys_union;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.service.OutlayManageUnionAllocateService;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutLayAllocateUnion;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.model.OutlayManageUnion;
import com.budwk.app.zhgh.dayofficework.outlay.outlayManage.union.vo.OutlayUnionAllocateImportVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
@@ -22,11 +25,17 @@ import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.json.Json;
import org.nutz.lang.Lang;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import org.nutz.mvc.annotation.POST;
import org.nutz.mvc.upload.TempFile;
import org.nutz.mvc.upload.UploadAdaptor;
import org.nutz.mvc.annotation.AdaptBy;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -107,6 +116,59 @@ public class OutlayManageUnionAllocateController {
return outlayManageUnionAllocateService.doBatchAllocate(allocateMoney, quarterly, year);
}
@At
@ApiOperation("校验当前季度是否已分配额度")
@SaCheckPermission("outlay.outlayManage.union.allocate")
public Result hasAllocated(@Param("quarterly") Integer quarterly,
@Param("year") Integer year) {
if (quarterly == null || year == null) {
return Result.error("参数错误！");
}
return Result.success(outlayManageUnionAllocateService.hasAllocated(quarterly, year));
}
@At
@POST
@AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
@ApiOperation("读取导入分配Excel")
@SaCheckPermission("outlay.outlayManage.union.allocate")
public Result readImportExcel(TempFile file) {
try {
return Result.success(outlayManageUnionAllocateService.readImportExcel(file));
} catch (Exception e) {
log.error("读取分工会额度导入文件失败", e);
return Result.error(e.getMessage());
}
}
@At
@ApiOperation("导入分配分工会额度")
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "分工会预算-季度预算分配", msg = "导入分配分工会额度")
@SaCheckPermission("outlay.outlayManage.union.allocate")
public Result doImportAllocate(String data,
@Param("quarterly") Integer quarterly,
@Param("year") Integer year) {
if (StrUtil.isBlank(data) || quarterly == null || year == null) {
return Result.error("参数错误！");
}
List<OutlayUnionAllocateImportVo> importList = Json.fromJsonAsList(OutlayUnionAllocateImportVo.class, data);
return outlayManageUnionAllocateService.doImportAllocate(importList, quarterly, year);
}
@At
@Ok("void")
@ApiOperation("下载导入分配模板")
@SaCheckPermission("outlay.outlayManage.union.allocate")
public void downloadImportTemplate(HttpServletResponse response) {
try {
Workbook workbook = outlayManageUnionAllocateService.exportImportTemplate();
CommonDownloadUtil.download("分工会额度导入模板.xlsx", workbook, response);
} catch (Exception e) {
log.error("下载分工会额度导入模板失败", e);
}
}
@At
@ApiOperation("重置预算季度记录")
src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java
+17 -2
View File
@@ -84,6 +84,9 @@ public class DifficultHelpApplyController {
public Result getIsCanPlay() {
//获取申请次数，不想再写一个接口, are you ok? .and("zt", "=", 600)
int applyCount = dao.count(DifficultHelpInfo.class, Cnd.where("proxyUserId", "=", SecurityUtil.getUserId()));
// 页面初始化时需要先判断当前登录人本年度是否已经申请过，避免重复进入新增申请。
boolean hasCurrentYearApply = dao.count(DifficultHelpInfo.class, Cnd.where("userId", "=", SecurityUtil.getUserId())
.and("YEAR(applyTime)", "=", DateUtil.getYear())) > 0;
Sys_config startConfig = dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "DifficultyApplyStartTime"));
Sys_config endConfig = dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "DifficultyApplyEndTime"));
if(startConfig != null && endConfig != null) {
@@ -98,9 +101,9 @@ public class DifficultHelpApplyController {
int endResult = cn.hutool.core.date.DateUtil.compare(cn.hutool.core.date.DateUtil.parse(today), cn.hutool.core.date.DateUtil.parse(end));
String time = startConfig.getConfigValue().replace("-", "月") + "日-" + endConfig.getConfigValue().replace("-", "月") + "日";
return Result.success(Map.of("applyCount", applyCount,"time", time, "result", startResult >=0 && endResult <= 0));
return Result.success(Map.of("applyCount", applyCount,"time", time, "result", startResult >=0 && endResult <= 0, "hasCurrentYearApply", hasCurrentYearApply));
} else {
return Result.success(Map.of("applyCount", applyCount,"time", "", "result", false));
return Result.success(Map.of("applyCount", applyCount,"time", "", "result", false, "hasCurrentYearApply", hasCurrentYearApply));
}
}
@@ -110,6 +113,10 @@ public class DifficultHelpApplyController {
@SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}")
public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) {
difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date()));
difficultHelpCommonService.refreshApplyCount(difficultHelpInfo);
if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) {
return Result.error("该人员本年度已申请困难帮扶，不能重复申请");
}
dao.insertOrUpdate(difficultHelpInfo);
return Result.success();
}
@@ -122,6 +129,10 @@ public class DifficultHelpApplyController {
@SLog(tag = "困难补助申请", msg = "提交申请,填写人: ${args[0].proxyUserName}")
public Result submit(@Param("data") DifficultHelpInfo difficultHelpInfo){
difficultHelpInfo.setApplyTime(new Date());
difficultHelpCommonService.refreshApplyCount(difficultHelpInfo);
if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) {
return Result.error("该人员本年度已申请困难帮扶，不能重复申请");
}
dao.insertOrUpdate(difficultHelpInfo);
// 开启流程实例
@@ -146,6 +157,10 @@ public class DifficultHelpApplyController {
@SLog(tag = "困难补助申请", msg = "重新提交申请,填写人: ${args[0].proxyUserName}")
public Result submitAgain(@Param("data") DifficultHelpInfo difficultHelpInfo, @Param("taskId") Long taskId) {
difficultHelpInfo.setApplyTime(ObjectUtil.defaultIfNull(difficultHelpInfo.getApplyTime(), new Date()));
difficultHelpCommonService.refreshApplyCount(difficultHelpInfo);
if (difficultHelpCommonService.hasAppliedInYear(difficultHelpInfo.getUserId(), difficultHelpInfo.getApplyTime(), difficultHelpInfo.getId())) {
return Result.error("该人员本年度已申请困难帮扶，不能重复申请");
}
dao.insertOrUpdate(difficultHelpInfo);
Dict dict = Dict.create();
src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java
+18
View File
@@ -7,6 +7,7 @@ import com.budwk.app.zhgh.staffbenefit.medicalMutualAid.aidFund.param.AidFundPag
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.upload.TempFile;
import java.util.Date;
import java.util.List;
/**
@@ -26,4 +27,21 @@ public interface DifficultHelpCommonService extends BaseService<DifficultHelpInf
NutMap handlingMoneyImport(TempFile file, Boolean isFlag);
List<NutMap> getYearPayList(DifficultHelpPageParam pageForm);
/**
* 校验同一受补助人同一年是否已存在申请记录。
*
* @param userId 受补助人id
* @param applyTime 申请时间
* @param excludeRecordId 排除的当前记录id，编辑/重新提交时使用
* @return true 已存在同年申请记录
*/
boolean hasAppliedInYear(String userId, Date applyTime, String excludeRecordId);
/**
* 新申请时按历史总申请次数重新计算申请次数字段，已有记录则保留原值。
*
* @param difficultHelpInfo 申请信息
*/
void refreshApplyCount(DifficultHelpInfo difficultHelpInfo);
}
src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java
+32
View File
@@ -50,6 +50,38 @@ public class DifficultHelpCommonServiceImpl extends BaseServiceImpl<DifficultHel
@Inject
private ManyAddOrRenewUtil manyAddOrRenewUtil;
@Override
public boolean hasAppliedInYear(String userId, Date applyTime, String excludeRecordId) {
if (StrUtil.isBlank(userId) || applyTime == null) {
return false;
}
Cnd cnd = Cnd.where("userId", "=", userId);
cnd.and("YEAR(applyTime)", "=", DateUtil.year(applyTime));
if (StrUtil.isNotBlank(excludeRecordId)) {
cnd.and("id", "<>", excludeRecordId);
}
// 按受补助人和申请年份校验，确保同一个人每年只能保留一条申请记录。
return dao().count(DifficultHelpInfo.class, cnd) > 0;
}
@Override
public void refreshApplyCount(DifficultHelpInfo difficultHelpInfo) {
if (difficultHelpInfo == null || StrUtil.isBlank(difficultHelpInfo.getUserId())) {
return;
}
if (StrUtil.isNotBlank(difficultHelpInfo.getId())) {
DifficultHelpInfo dbInfo = dao().fetch(DifficultHelpInfo.class, difficultHelpInfo.getId());
if (dbInfo != null) {
// 已存在的申请记录沿用原申请次数，避免编辑或重新提交时重复累加。
difficultHelpInfo.setApplyCount(dbInfo.getApplyCount());
return;
}
}
int historyApplyCount = dao().count(DifficultHelpInfo.class, Cnd.where("userId", "=", difficultHelpInfo.getUserId()));
// 新申请记录按历史总申请次数 + 1 重新计算申请次数，不使用前端传入值。
difficultHelpInfo.setApplyCount(historyApplyCount + 1);
}
@Override
public List<NutMap> getYearPayList(DifficultHelpPageParam pageForm) {
// 1. 生成年份列表
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html
+4 -4
View File
@@ -249,24 +249,24 @@ layout("/layouts/platform.html"){
async getActivityBudgetType() {
const data = await this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE")
let budgetTypeOption = []
if (this.$auth.hasRoleOr(['SYSADMIN'])) {
if (this.$auth.hasPermission(['activity.budget.apply.system'])) {
this.budgetTypeOption = data
} else {
if (this.$auth.hasRoleOr(['SCHOOL_UNION_ADMIN'])) {
if (this.$auth.hasPermission(['activity.budget.apply.schoolAdmin'])) {
data.map(v => {
if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) {
budgetTypeOption.push(v)
}
})
}
if (this.$auth.hasRoleOr(['BRANCH_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])) {
if (this.$auth.hasPermission(['activity.budget.apply.branchAdmin'])) {
data.map(v => {
if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) {
budgetTypeOption.push(v)
}
})
}
if (this.$auth.hasRoleOr(['CLUB_PRESIDENT'])) {
if (this.$auth.hasPermission(['activity.budget.apply.clubPresident'])) {
data.map(v => {
if (["ACTIVITY_BUDGET_TYPE_THREE"].includes(v.code)) {
budgetTypeOption.push(v)
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/allocate/index.html
+136 -14
View File
@@ -98,13 +98,54 @@ layout("/layouts/platform.html"){
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<el-dialog title="一键分配所有工会额度" :visible.sync="batchAllocateDialogVisible" width="500px">
<el-dialog title="一键分配所有工会额度" :visible.sync="batchAllocateDialogVisible" width="700px">
<el-form :model="batchAllocateForm" label-width="120px">
<el-form-item label="统一分配额度">
<el-form-item label="分配模式">
<el-radio-group v-model="batchAllocateForm.allocateMode">
<el-radio label="uniform">统一分配</el-radio>
<el-radio label="import">导入分配</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="统一分配额度" v-if="batchAllocateForm.allocateMode === 'uniform'">
<el-input-number v-model="batchAllocateForm.allocateMoney" :min="0" :precision="2"
style="width: 100%" placeholder="请输入每个工会的分配额度">
</el-input-number>
</el-form-item>
<template v-else>
<el-form-item label="导入模板">
<el-button type="primary" plain icon="el-icon-download" @click="downloadImportTemplate">下载模板</el-button>
<div class="text-secondary mt5">请按模板填写工会编码和分配额度，导入后将按工会逐条分配。</div>
</el-form-item>
<el-form-item label="上传文件">
<el-upload
name="file"
ref="importUploadRef"
:limit="1"
action="/platform/outlay/outlayManage/unionAllocate/readImportExcel"
:on-success="onImportSuccess"
:on-remove="onImportRemove"
:before-upload="beforeImportUpload"
:file-list="importFileList"
drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将Excel文件拖到此处，或<em>点击上传</em></div>
</el-upload>
</el-form-item>
<el-form-item label="导入预览" v-if="batchAllocateForm.importPreviewList.length > 0">
<el-table :data="batchAllocateForm.importPreviewList" border size="mini" max-height="260">
<el-table-column type="index" label="序号" width="60"></el-table-column>
<el-table-column prop="unionCode" label="工会编码" min-width="120"></el-table-column>
<el-table-column prop="unionName" label="工会名称" min-width="160"></el-table-column>
<el-table-column prop="allocateMoney" label="分配额度" min-width="120"></el-table-column>
<el-table-column prop="errMsg" label="校验结果" min-width="180">
<template slot-scope="{row}">
<span class="text-danger" v-if="row.errMsg">{{row.errMsg}}</span>
<span class="text-success" v-else>通过</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</template>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="batchAllocateDialogVisible = false">取 消</el-button>
@@ -137,8 +178,11 @@ layout("/layouts/platform.html"){
quarterlyList: [],
batchAllocateDialogVisible: false,
batchAllocateForm: {
allocateMoney: 0
}
allocateMode: "uniform",
allocateMoney: 0,
importPreviewList: []
},
importFileList: []
}
},
methods: {
@@ -201,22 +245,100 @@ layout("/layouts/platform.html"){
this.$message.warning('当前没有可分配的工会记录，请先生成季度记录')
return
}
this.batchAllocateForm = {
allocateMoney: 0
const quarter = this.$moment().quarter()
const openDialog = () => {
this.resetBatchAllocateForm()
this.batchAllocateDialogVisible = true
}
this.batchAllocateDialogVisible = true
this.$axios.post("/platform/outlay/outlayManage/unionAllocate/hasAllocated", {
quarterly: quarter,
year: this.pageForm.year
}).then((resp) => {
if (resp.code !== 0) {
return
}
if (resp.data) {
this.$confirm('温馨提示：当前季度已分配过额度，再次分配将覆盖本季度原有分配结果，是否继续？', '温馨提示', {
confirmButtonText: '继续',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
openDialog()
}).catch(() => {
})
} else {
openDialog()
}
})
},
resetBatchAllocateForm() {
this.batchAllocateForm = {
allocateMode: "uniform",
allocateMoney: 0,
importPreviewList: []
}
this.importFileList = []
},
downloadImportTemplate() {
this.$downLoad("/platform/outlay/outlayManage/unionAllocate/downloadImportTemplate")
},
beforeImportUpload(file) {
const suffix = file.name.split(".").pop()
if (["xls", "xlsx"].indexOf(suffix) === -1) {
this.$message.warning("请上传xls或xlsx格式文件")
return false
}
return true
},
onImportSuccess(resp, file, fileList) {
this.importFileList = fileList.slice(-1)
if (resp.code === 0) {
this.$set(this.batchAllocateForm, "importPreviewList", resp.data || [])
} else {
this.$message.error(resp.msg)
this.importFileList = []
this.$set(this.batchAllocateForm, "importPreviewList", [])
}
},
onImportRemove() {
this.importFileList = []
this.$set(this.batchAllocateForm, "importPreviewList", [])
},
doBatchAllocate() {
if (!this.batchAllocateForm.allocateMoney || this.batchAllocateForm.allocateMoney <= 0) {
this.$message.warning('请输入有效的分配额度')
const quarter = this.$moment().quarter()
if (this.batchAllocateForm.allocateMode === "uniform") {
if (!this.batchAllocateForm.allocateMoney || this.batchAllocateForm.allocateMoney <= 0) {
this.$message.warning('请输入有效的分配额度')
return
}
this.formLoading = true
this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doBatchAllocate", {
allocateMoney: this.batchAllocateForm.allocateMoney,
quarterly: quarter,
year: this.pageForm.year
}).then((resp) => {
if (resp.code === 0) {
this.$message.success(resp.msg)
this.batchAllocateDialogVisible = false
this.doSearch()
}
}).finally(() => {
this.formLoading = false
})
return
}
if (this.batchAllocateForm.importPreviewList.length === 0) {
this.$message.warning("请先上传导入文件")
return
}
const hasErrorRow = this.batchAllocateForm.importPreviewList.some((item) => item.errMsg)
if (hasErrorRow) {
this.$message.warning("导入数据存在校验未通过的记录，请修正后重新上传")
return
}
const quarter = this.$moment().quarter()
this.formLoading = true
this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doBatchAllocate", {
allocateMoney: this.batchAllocateForm.allocateMoney,
this.$axios.post("/platform/outlay/outlayManage/unionAllocate/doImportAllocate", {
data: JSON.stringify(this.batchAllocateForm.importPreviewList),
quarterly: quarter,
year: this.pageForm.year
}).then((resp) => {
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+11 -2
View File
@@ -294,7 +294,8 @@ layout("/layouts/platform.html"){
<el-card class="box-card" style="height: 92vh" shadow="never">
<el-result icon="warning" title="温馨提醒" subTitle="">
<template slot="extra">
抱歉，当前时间不能申请，可申请时间为{{time}}。
<span v-if="blockMessage">{{blockMessage}}</span>
<span v-else>抱歉，当前时间不能申请，可申请时间为{{time}}。</span>
</template>
</el-result>
</el-card>
@@ -312,6 +313,7 @@ layout("/layouts/platform.html"){
taskId: GetQueryString("taskId"),
isShow: false,
time: '',
blockMessage: '',
formData: {
id: GetQueryString("bizId"),
mode: '1',
@@ -602,7 +604,14 @@ layout("/layouts/platform.html"){
async getIsCanPlay() {
this.$axios.post('/platform/difficultHelp/apply/getIsCanPlay').then(res => {
if (res.code === 0) {
this.isShow = res.data.result
// 新增申请进入页面时，优先校验当前登录人本年度是否已经申请过，已申请则直接拦截新增。
if (!this.bizId && res.data.hasCurrentYearApply) {
this.isShow = false
this.$set(this, 'blockMessage', '抱歉，您本年度已申请困难帮扶，不能重复申请。')
} else {
this.isShow = res.data.result
this.$set(this, 'blockMessage', '')
}
this.$set(this, 'time', res.data.time);
if (res.data.applyCount !== null && res.data.applyCount !== undefined && res.data.applyCount !== 0) {
this.$set(this.formData, 'applyCount', res.data.applyCount)
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html
+1 -1
View File
@@ -159,7 +159,7 @@ layout("/layouts/platform.html"){
{ prop: "subsidyStandards", label: "困难类型", sortable: true },
{ prop: "applyTime", label: "申请时间", sortable: true },
{ prop: "applyCount", label: "申请次数", sortable: true },
{ prop: "taskName", label: "当前节点" },
{ prop: "curTaskName", label: "当前节点" },
{ prop: "instanceState", label: "流程状态" }
],
unions: [],
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html
+14 -5
View File
@@ -48,8 +48,9 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" @selection-change="handleSelectionChange"
ref="table" row-key="id" style="width: 100%">
<el-table-column type="selection" width="45"></el-table-column>
<el-table-column :index="indexMethod" header-align="center" label="序号"
type="index" width="60px"></el-table-column>
<el-table-column
@@ -130,14 +131,15 @@ layout("/layouts/platform.html"){
{ prop: "subsidyStandards", label: "困难类型", sortable: true },
{ prop: "applyTime", label: "申请时间", sortable: true },
{ prop: "applyCount", label: "申请次数", sortable: true },
{ prop: "taskName", label: "当前节点" },
{ prop: "curTaskName", label: "当前节点" },
{ prop: "instanceState", label: "流程状态" }
],
unions: [],
units: [],
formData: {},
showApprovalForm: false
showApprovalForm: false,
selectData: [],
}
},
components: {
@@ -155,13 +157,17 @@ layout("/layouts/platform.html"){
this.$message.warning('没有待审核的数据！');
return;
}
const message = '确定要一键审核这 ' + this.tableData.length + ' 条记录吗？';
if (this.selectData.length === 0) {
this.$message.warning('请勾选待审核数据！');
return;
}
const message = '确定要一键审核这 ' + this.selectData.length + ' 条记录吗？';
this.$confirm(message, '批量审核确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.batchApprove(this.tableData);
this.batchApprove(this.selectData);
}).catch(() => {
});
@@ -279,6 +285,9 @@ layout("/layouts/platform.html"){
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
}
},
handleSelectionChange: function (val) {
this.selectData = val
},
},
async created() {
this.pageData()