Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java

@@ -13,6 +13,8 @@ import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.service.FlowCommonService;
+import com.budwk.app.sys.models.Sys_config;
+import com.budwk.app.sys.utils.DateUtil;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
@@ -34,6 +36,7 @@ import org.nutz.mvc.annotation.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @version 1.0
@@ -75,6 +78,32 @@ public class DifficultHelpApplyController {
     public void h5() {
     }
 
+    @At
+    @ApiOperation("获取申请次数和时间")
+    @SaCheckPermission("member.apply.submit")
+    public Result getIsCanPlay() {
+        //获取申请次数，不想再写一个接口, are you ok?  .and("zt", "=", 600)
+        int applyCount = dao.count(DifficultHelpInfo.class, Cnd.where("proxyUserId", "=", SecurityUtil.getUserId()));
+        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) {
+            // 获取今天的日期
+            String today = cn.hutool.core.date.DateUtil.today();
+            // 开始
+            String start = DateUtil.getYear() + "-" + startConfig.getConfigValue();
+            // 结束
+            String end = DateUtil.getYear() + "-" + endConfig.getConfigValue();
+            // 比较
+            int startResult = cn.hutool.core.date.DateUtil.compare(cn.hutool.core.date.DateUtil.parse(today), cn.hutool.core.date.DateUtil.parse(start));
+            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));
+        } else {
+            return Result.success(Map.of("applyCount", applyCount,"time", "", "result", false));
+        }
+    }
+
     @At
     @ApiOperation("保存申请")
     @SaCheckPermission("member.apply.submit")

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java

@@ -73,7 +73,9 @@ public class DifficultHelpBranchUnionApprovalController {
                     info.unitName,
                     info.unionName,
                     info.subsidyStandards,
-                    info.applyTime,
+                    LEFT(info.applyTime, 10) AS applyTime,
+                    info.applyCount,
+                    info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
                     ins.state instanceState,

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionLeaderApprovalController.java

@@ -0,0 +1,128 @@
+package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：DifficultHelpBranchUnionApprovalController
+ * @Date 2025/7/31 11:47
+ * @注释
+ */
+@IocBean
+@Ok("json")
+@ApiOperation("困难补助二级党组织审核")
+@At("/platform/difficultHelp/unionLeaderApproval")
+public class DifficultHelpBranchUnionLeaderApprovalController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private DifficultHelpCommonService difficultHelpCommonService;
+
+    @At("")
+    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html")
+    public void index() {
+    }
+
+    @At
+    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/form.html")
+    public void form() {
+    }
+
+    @At
+    @SaCheckPermission("h5.difficultHelp.unionLeaderApproval")
+    @Ok("beetl:/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html")
+    public void h5() {
+    }
+
+
+    @At
+    @ApiOperation("困难补助分工会审核列表")
+    @SaCheckPermission("difficultHelp.unionLeaderApproval")
+    public Result pageData(DifficultHelpPageParam pageParam) {
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.id,
+                    info.proxyUserName,
+                    info.proxyLoginName,
+                    info.userName,
+                    info.loginName,
+                    info.unitName,
+                    info.unionName,
+                    info.subsidyStandards,
+                    LEFT(info.applyTime, 10) AS applyTime,
+                    info.applyCount,
+                    info.mobile,
+                    ins.id AS instanceId,
+                    ins.businessNo,
+                    ins.state instanceState,
+                    ins.variable instanceVariable,
+                    ins.processDefineId instanceProcessDefineId,
+                    t.id taskId,
+                    t.taskName AS taskKey,
+                    t.displayName taskName,
+                    t.taskType,
+                    t.performType taskPerformType,
+                    t.taskState,
+                    t.finishTime,
+                    t.taskParentId,
+                    t.variable taskVariable,
+                    IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                    IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                    wf_process_task t
+                    LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                    LEFT JOIN difficult_help_info info ON info.id = ins.businessNo
+                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                    LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                    LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        pageParam.buildSearch(cnd, "info.");
+
+        cnd.and("t.taskName", "=", "36ebafda-44c2-4bd3-bd7f-10839a575a0d");
+        cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+
+        if (pageParam.getAudit()) {
+            cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
+        } else {
+            cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        }
+        if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) {
+            cnd.desc("t.createdAt");
+            cnd.desc("info.applyTime");
+        } else {
+            cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy()));
+        }
+        cnd.groupBy("t.id");
+        sql.setCondition(cnd);
+
+        Pagination<NutMap> pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);
+        return Result.success().addData(pagination);
+    }
+
+}

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java

@@ -75,7 +75,9 @@ public class DifficultHelpMineController {
                     info.unitName,
                     info.unionName,
                     info.subsidyStandards,
-                    info.applyTime,
+                    LEFT(info.applyTime, 10) AS applyTime,
+                    info.applyCount,
+                    info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
                     ins.state instanceState,

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java

@@ -1,13 +1,46 @@
 package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.base.utils.CommonDownloadUtil;
+import com.budwk.app.base.utils.MoneyUtil;
+import com.budwk.app.base.utils.OfficePlusUtil;
+import com.budwk.app.base.utils.SysOfficeTemplateUtil;
 import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.sys.models.Sys_union;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.web.commons.base.Globals;
+import com.budwk.app.zhgh.activity.declarereimbursement.vo.ActivityBudgetVO;
+import com.budwk.app.zhgh.dayofficework.unionReimburse.model.UnionReimburse;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.PictureRenderData;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.ddr.poi.html.HtmlRenderPolicy;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -16,11 +49,26 @@ 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.lang.Lang;
+import org.nutz.lang.random.R;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
 /**
  * @version 1.0
  * @Author zzr
@@ -32,6 +80,7 @@ import org.nutz.mvc.annotation.Param;
 @Ok("json")
 @ApiOperation("困难补助汇总阅览")
 @At("/platform/difficultHelp/reading")
+@Slf4j
 public class DifficultHelpReadingController {
 
     @Inject
@@ -40,6 +89,10 @@ public class DifficultHelpReadingController {
     private FlowEngine flowEngine;
     @Inject
     private DifficultHelpCommonService difficultHelpCommonService;
+    @Inject
+    private SysUserService sysUserService;
+    @Inject
+    private SysOfficeTemplateUtil sysOfficeTemplateUtil;
 
     @At("")
     @SaCheckPermission("difficultHelp.reading")
@@ -62,7 +115,9 @@ public class DifficultHelpReadingController {
                     info.unitName,
                     info.unionName,
                     info.subsidyStandards,
-                    info.applyTime,
+                    LEFT(info.applyTime, 10) AS applyTime,
+                    info.applyCount,
+                    info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
                     ins.state instanceState,
@@ -104,4 +159,265 @@ public class DifficultHelpReadingController {
         flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
         return Result.success();
     }
+
+    @At
+    @Ok("void")
+    public void doExportAllApply(DifficultHelpPageParam pageParam, HttpServletResponse response) throws Exception {
+        Sql sql = Sqls.create("""
+            SELECT
+                info.id,
+                info.proxyUserName,
+                info.proxyLoginName,
+                info.userName,
+                info.loginName,
+                info.unitName,
+                info.unionName,
+                info.subsidyStandards,
+                LEFT(info.applyTime, 10) AS applyTime,
+                info.applyCount,
+                info.mobile,
+                info.sex,
+                info.homeIncome,
+                info.homeNumber,
+                info.position,
+                info.officialCapacity,
+                info.homeAddress,
+                info.bankOfDeposit,
+                info.bankCardNum,
+                info.reason,
+                info.applyTime as fullApplyTime,
+                info.familyList
+            FROM
+                difficult_help_info info
+            $condition
+            """);
+        Cnd cnd = Cnd.NEW();
+        pageParam.buildSearch(cnd, "info.");
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        List<NutMap> list = difficultHelpCommonService.listMap(sql);
+
+        response.setContentType("application/octet-stream");
+        response.setHeader("content-disposition", "attachment;filename="
+                + URLEncoder.encode("申请表汇总.zip", "UTF-8"));
+
+        try (ZipOutputStream zipOutputStream = new ZipOutputStream(response.getOutputStream())) {
+            for (int i = 0; i < list.size(); i++) {
+                NutMap record = list.get(i);
+
+                HashMap<String, Object> docData = new HashMap<>();
+                docData.put("unionName", record.getString("unitName"));
+                docData.put("proxyUserName", record.getString("proxyUserName"));
+                docData.put("sex", record.getString("sex"));
+                docData.put("loginName", record.getString("loginName"));
+                docData.put("unitName", record.getString("unitName"));
+                docData.put("homeIncome", record.getDouble("homeIncome"));
+                docData.put("homeNumber", record.getInt("homeNumber"));
+                docData.put("position", record.getString("position"));
+                docData.put("officialCapacity", record.getString("officialCapacity"));
+                docData.put("mobile", record.getString("mobile"));
+                docData.put("userName", record.getString("userName"));
+                docData.put("homeAddress", record.getString("homeAddress"));
+                docData.put("bankOfDeposit", record.getString("bankOfDeposit"));
+                docData.put("bankCardNum", record.getString("bankCardNum"));
+                docData.put("reason", record.getString("reason"));
+                docData.put("applyTime", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy年MM月dd日"));
+                docData.put("schoolname", "中国地质大学（武汉）");
+                docData.put("year", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy"));
+
+                String familyListStr = record.getString("familyList");
+                if (StrUtil.isNotBlank(familyListStr)) {
+                    docData.put("familyList", JSONUtil.toList(familyListStr, Object.class));
+                } else {
+                    docData.put("familyList", new ArrayList<>());
+                }
+
+                String fileName = (i + 1) + record.getString("userName") + "申请表.docx";
+                zipOutputStream.putNextEntry(new ZipEntry(fileName));
+
+                LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
+                Configure config = Configure.builder().bind("familyList", policy).build();
+
+                XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("difficulty_apply"), config)
+                        .render(docData)
+                        .write(zipOutputStream);
+                zipOutputStream.closeEntry();
+            }
+            zipOutputStream.flush();
+        }
+    }
+
+
+    @At
+    @Ok("void")
+    public void doExportApply(String id, HttpServletResponse response,  Boolean print) throws Exception {
+        DifficultHelpInfo difficultHelp = difficultHelpCommonService.fetch(id);
+        if (difficultHelp == null) {
+            throw new RuntimeException("该条记录不存在");
+        }
+        HashMap<String, Object> docData = new HashMap<>();
+
+        docData.put("unionName", difficultHelp.getUnitName());
+        docData.put("proxyUserName", difficultHelp.getProxyUserName());
+        docData.put("sex", difficultHelp.getSex());
+        docData.put("loginName", difficultHelp.getLoginName());
+        docData.put("unitName", difficultHelp.getUnitName());
+        docData.put("homeIncome", difficultHelp.getHomeIncome());
+        docData.put("homeNumber", difficultHelp.getHomeNumber());
+        docData.put("position", difficultHelp.getPosition());
+        docData.put("officialCapacity", difficultHelp.getOfficialCapacity());
+        docData.put("mobile", difficultHelp.getMobile());
+        docData.put("userName", difficultHelp.getUserName());
+        docData.put("homeAddress", difficultHelp.getHomeAddress());
+        docData.put("bankOfDeposit", difficultHelp.getBankOfDeposit());
+        docData.put("bankCardNum", difficultHelp.getBankCardNum());
+        docData.put("reason", difficultHelp.getReason());
+        docData.put("applyTime", DateUtil.format(difficultHelp.getApplyTime(), "yyyy-MM-dd"));
+        docData.put("schoolname","中国地质大学（武汉）");
+        docData.put("year",DateUtil.format(difficultHelp.getApplyTime(), "yyyy"));
+
+        docData.put("familyList", difficultHelp.getFamilyList() != null ? difficultHelp.getFamilyList() : new ArrayList<>());
+
+        LoopRowTableRenderPolicy familyPolicy = new LoopRowTableRenderPolicy();
+        Configure config = Configure.builder()
+                .bind("familyList", familyPolicy)
+                .build();
+
+        String templateName= "difficulty_apply";
+        if (print) {
+            exportAsPDF(templateName, docData, config, difficultHelp, response);
+        } else {
+            exportAsWord(templateName, docData, config, difficultHelp,response);
+        }
+    }
+
+    @At
+    private void exportAsPDF(String templateName, HashMap<String, Object> docData,Configure config,
+                             DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
+        String fileName = "中国地质大学（武汉）困难慰问申请表_" + difficultHelp.getUserName() + "_" +
+                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf";
+
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName),config)
+                    .render(docData)
+                    .writeAndClose(byteArrayOutputStream);
+            byte[] bytes = byteArrayOutputStream.toByteArray();
+            File sourceFile = File.createTempFile("file_convert_origin", ".docx");
+            Files.write(sourceFile.toPath(), bytes, StandardOpenOption.WRITE);
+
+            File pdfFile = File.createTempFile("file_convert", ".pdf");
+            OfficePlusUtil.convert(sourceFile.getPath(), pdfFile.getPath());
+            CommonDownloadUtil.download(fileName, IoUtil.readBytes(FileUtil.getInputStream(pdfFile)), response);
+            // 删除临时文件
+            FileUtil.del(sourceFile);
+            FileUtil.del(pdfFile.toPath());
+        } catch (IOException e) {
+            log.error("困难慰问申请表导出PDF失败,id:{},错误信息：{}", difficultHelp.getId(), e.getMessage());
+        }
+    }
+
+    @At
+    private void exportAsWord(String templateName, HashMap<String, Object> docData,Configure config,
+                              DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
+        String fileName = "中国地质大学（武汉）困难慰问申请表_" + difficultHelp.getUserName() + "_" +
+                DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx";
+
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName),config)
+                    .render(docData)
+                    .writeAndClose(byteArrayOutputStream);
+            CommonDownloadUtil.download(fileName, byteArrayOutputStream.toByteArray(), response);
+        } catch (IOException e) {
+            log.error("困难慰问申请表导出Word失败,id:{},错误信息：{}", difficultHelp.getId(), e.getMessage());
+        }
+    }
+
+    @At
+    @Ok("void")
+    public void exportSummary(DifficultHelpPageParam pageParam,String flag,
+                              HttpServletResponse response) throws Exception {
+        NutMap result = new NutMap();
+        Sql sql = Sqls.create("""
+                SELECT
+                    info.userName,
+                    info.loginName,
+                    info.sex,
+                    info.idCard,
+                    us.age,
+                    info.position,
+                    info.officialCapacity,
+                    concat(info.position, '/', info.officialCapacity) as zwzc,
+                    info.unitName,
+                    info.mobile,
+                    info.reason,
+                    info.level,
+                    concat(info.homeIncome, '万元') as homeIncome,
+                    info.homeNumber,
+                    info.subsidyStandards,
+                    info.bankOfDeposit,
+                    info.bankCardNum,
+                    info.applyCount
+                FROM
+                    difficult_help_info info
+                    LEFT JOIN `vw_user` us ON info.userId = us.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        pageParam.buildSearch(cnd, "info.");
+        cnd.groupBy("info.id");
+        sql.setCondition(cnd);
+        List<NutMap> list = difficultHelpCommonService.listMap(sql);
+        Sys_user user = sysUserService.fetch(SecurityUtil.getUserId());
+
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).put("index", (i + 1));
+        }
+
+        result.put("schoolName", "中国地址大学（武汉）");
+        result.put("year", DateUtil.format(new Date(), "yyyy"));
+        result.put("applyTime", DateUtil.format(new Date(), "yyyy年MM月dd日"));
+        result.put("proxyUserName",SecurityUtil.getUserUsername() );
+        result.put("mobile", user.getMobile());
+        result.put("da", list);
+
+        String resource;
+        if ("xlsx".equals(flag)) {
+            resource = "difficulty_summary_xlsx";
+            if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+                resource = "difficulty_summary_school_xlsx";
+            }
+        } else {
+            resource = "difficulty_summary";
+            if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+                resource = "difficulty_summary_school";
+            }
+        }
+
+        String fileName = "困难慰问汇总表_" + DateUtil.format(new Date(), "yyyyMMdd");
+
+        if ("xlsx".equals(flag)) {
+            try {
+                InputStream is = sysOfficeTemplateUtil.getTemplate(resource);
+                TemplateExportParams exportParams = new TemplateExportParams(is, null);
+                Workbook workbook = ExcelExportUtil.exportExcel(exportParams, result);
+                CommonDownloadUtil.download(fileName + ".xlsx", workbook, response);
+            } catch (Exception e) {
+                log.error("导出Excel汇总表失败", e);
+                throw new RuntimeException("导出Excel汇总表失败：" + e.getMessage());
+            }
+        } else if ("docx".equals(flag)) {
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                Configure config = Configure.builder()
+                        .bind("da", new LoopRowTableRenderPolicy())
+                        .build();
+
+                XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(resource), config)
+                        .render(result)
+                        .writeAndClose(out);
+                CommonDownloadUtil.download(fileName + ".docx", out.toByteArray(), response);
+            }
+        }
+    }
+
+
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java

@@ -1,12 +1,15 @@
 package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
 import io.swagger.annotations.ApiOperation;
@@ -19,7 +22,9 @@ import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -72,7 +77,9 @@ public class DifficultHelpSchoolUnionApprovalController {
                     info.unitName,
                     info.unionName,
                     info.subsidyStandards,
-                    info.applyTime,
+                    LEFT(info.applyTime, 10) AS applyTime,
+                    info.applyCount,
+                    info.mobile,
                     ins.id AS instanceId,
                     ins.businessNo,
                     ins.state instanceState,
@@ -122,4 +129,13 @@ public class DifficultHelpSchoolUnionApprovalController {
         return Result.success().addData(pagination);
     }
 
+    @At
+    @ApiOperation("保存补助金额、级别")
+    @SaCheckPermission("difficultHelp.schoolUnionApproval")
+    @SLog(tag = "困难补助申请", msg = "保存申请,填写人: ${args[0].proxyUserName}")
+    public Result save(@Param("data") DifficultHelpInfo difficultHelpInfo) {
+        dao.updateIgnoreNull(difficultHelpInfo);
+        return Result.success();
+    }
+
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/models/DifficultHelpInfo.java

@@ -114,7 +114,12 @@ public class DifficultHelpInfo extends BaseModel {
     private String idCard;
 
     @Column
-    @Comment("职务职称")
+    @Comment("职务")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String position;
+
+    @Column
+    @Comment("职称")
     @ColDefine(type = ColType.VARCHAR, width = 100)
     private String officialCapacity;
 
@@ -140,7 +145,22 @@ public class DifficultHelpInfo extends BaseModel {
     private String homeAddress;
 
     @Column
-    @Comment("补助标准")
+    @Comment("家庭年总收入")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private Double homeIncome;
+
+    @Column
+    @Comment("家庭人数")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private Integer homeNumber;
+
+    @Column
+    @Comment("补助类型")
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    private String subsidy;
+
+    @Column
+    @Comment("困难类型")
     @ColDefine(type = ColType.VARCHAR, width = 500)
     private String subsidyStandards;
 
@@ -150,7 +170,7 @@ public class DifficultHelpInfo extends BaseModel {
     private List<JSONObject> familyList;
 
     @Column
-    @Comment("申请理由")
+    @Comment("生活致困原因")
     @ColDefine(type = ColType.VARCHAR, width = 500)
     private String reason;
 
@@ -168,4 +188,19 @@ public class DifficultHelpInfo extends BaseModel {
     @Comment("申请人签字")
     @ColDefine(type = ColType.VARCHAR, width = 500)
     private String sign;
+
+    @Column
+    @Comment("申请次数")
+    @ColDefine(type = ColType.INT)
+    private Integer applyCount;
+
+    @Column
+    @Comment("补助金额")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private Double money;
+
+    @Column
+    @Comment("补助级别")
+    @ColDefine(type = ColType.VARCHAR, width = 200)
+    private String level;
 }