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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-03-19 17:58:38 +08:00
parent b07029c57c
commit a9169e4c9e
12 changed files with 292 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java
+2 -1
View File
@@ -77,6 +77,7 @@ public class CondolenceBranchUnionApprovalController {
t.finishTime, t.finishTime,
t.taskParentId, t.taskParentId,
t.variable taskVariable, t.variable taskVariable,
GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')' ) AS auditUser,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
IF(rt.id IS NOT NULL, 1, 0) AS canRevoke IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
FROM FROM
@@ -113,7 +114,7 @@ public class CondolenceBranchUnionApprovalController {
} else { } else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
} }
cnd.groupBy("t.id"); cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO); return Result.success(pageVO);
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java
+235 -232
View File
@@ -79,34 +79,36 @@ import java.util.zip.ZipOutputStream;
@Slf4j @Slf4j
public class CondolenceMineController { public class CondolenceMineController {
@Inject @Inject
private CondolenceService condolenceService; private CondolenceService condolenceService;
@Inject @Inject
private Dao dao; private Dao dao;
@Inject @Inject
private FlowEngine flowEngine; private FlowEngine flowEngine;
@Inject @Inject
private SmsService smsService; private SmsService smsService;
@Inject @Inject
private SysOfficeTemplateUtil sysOfficeTemplateUtil; private SysOfficeTemplateUtil sysOfficeTemplateUtil;
@At("/") @At("/")
@Ok("beetl:/platform/zhgh/staffbenefit/condolence/mine/index.html") @Ok("beetl:/platform/zhgh/staffbenefit/condolence/mine/index.html")
@SaCheckPermission("condolence.mine") @SaCheckPermission("condolence.mine")
public void index() {} public void index() {
}
@At("/h5") @At("/h5")
@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/mine/index.html") @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/mine/index.html")
@SaCheckPermission("h5.condolence.mine") @SaCheckPermission("h5.condolence.mine")
public void h5Index() {} public void h5Index() {
}
@At @At
@ApiOperation("分页查询") @ApiOperation("分页查询")
@SaCheckPermission(value = {"condolence.mine", "h5.condolence.mine"}, mode = SaMode.OR) @SaCheckPermission(value = {"condolence.mine", "h5.condolence.mine"}, mode = SaMode.OR)
public Result pageData(PageForm pageForm, public Result pageData(PageForm pageForm,
@Param(value = "year") Integer year, @Param(value = "year") Integer year,
@Param(value = "type") String type) { @Param(value = "type") String type) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
info.*, info.*,
type.name as typeName, type.name as typeName,
@@ -124,6 +126,7 @@ public class CondolenceMineController {
t.finishTime, t.finishTime,
t.taskParentId, t.taskParentId,
t.variable taskVariable, t.variable taskVariable,
GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')' ) AS auditUser,
IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
(select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
FROM FROM
@@ -134,61 +137,61 @@ public class CondolenceMineController {
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
$condition $condition
"""); """);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup(); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%"); seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%"); seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(seg); cnd.and(seg);
} }
cnd.andEX("year(info.createTime)", "=", year); cnd.andEX("year(info.createTime)", "=", year);
cnd.andEX("info.type", "=", type); cnd.andEX("info.type", "=", type);
cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) { if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
} else { } else {
cnd.desc("info.createTime"); cnd.desc("info.createTime");
} }
cnd.groupBy("info.id");
sql.setCondition(cnd);
Pagination<NutMap> pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
}
sql.setCondition(cnd); @At
Pagination<NutMap> pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @ApiOperation("删除")
return Result.success(pagination); @Aop(TransAop.READ_COMMITTED)
} @SaCheckPermission(value = {"condolence.mine", "h5.condolence.mine"}, mode = SaMode.OR)
@SLog(tag = "职工慰问系统-我的申请", msg = "删除职工慰问")
public Result delete(@Param("id") String id) {
condolenceService.delete(id);
flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
return Result.success();
}
@At @At
@ApiOperation("删除") @ApiOperation("查询单个慰问申请信息")
@Aop(TransAop.READ_COMMITTED) @SaCheckPermission("condolence")
@SaCheckPermission(value = {"condolence.mine", "h5.condolence.mine"}, mode = SaMode.OR) public Result info(String id) {
@SLog(tag = "职工慰问系统-我的申请", msg = "删除职工慰问") Condolence condolence = condolenceService.fetch(id);
public Result delete(@Param("id") String id) { CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, Cnd.where(CondolenceType::getId, "=", condolence.getType()));
condolenceService.delete(id); NutMap nutMap = Lang.obj2nutmap(condolence);
flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); nutMap.put("typeName", type.getName());
return Result.success(); //smsService.send("20182040", "这是一条由智慧工会系统发出的测试消息。");
} return Result.success(nutMap);
}
@At
@ApiOperation("查询单个慰问申请信息")
@SaCheckPermission("condolence")
public Result info(String id) {
Condolence condolence = condolenceService.fetch(id);
CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, Cnd.where(CondolenceType::getId, "=", condolence.getType()));
NutMap nutMap = Lang.obj2nutmap(condolence);
nutMap.put("typeName", type.getName());
//smsService.send("20182040", "这是一条由智慧工会系统发出的测试消息。");
return Result.success(nutMap);
}
@At @At
@Ok("void") @Ok("void")
public void doExport(String id, HttpServletResponse response) throws Exception { public void doExport(String id, HttpServletResponse response) throws Exception {
Condolence condolence = condolenceService.fetch(id); Condolence condolence = condolenceService.fetch(id);
if (condolence == null) { if (condolence == null) {
throw new RuntimeException("慰问记录不存在"); throw new RuntimeException("慰问记录不存在");
} }
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
info.*, info.*,
ins.id AS instanceId ins.id AS instanceId
@@ -198,28 +201,28 @@ public class CondolenceMineController {
WHERE WHERE
ins.state = 20 AND info.id = @id ins.state = 20 AND info.id = @id
""").setParam("id", id); """).setParam("id", id);
sql.setCallback(Sqls.callback.map()); sql.setCallback(Sqls.callback.map());
dao.execute(sql); dao.execute(sql);
NutMap info = (NutMap) sql.getResult(); NutMap info = (NutMap) sql.getResult();
HashMap<String, Object> docData = new HashMap<>(); HashMap<String, Object> docData = new HashMap<>();
HashMap<String, Object> docData2 = new HashMap<>(); HashMap<String, Object> docData2 = new HashMap<>();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime createTime = LocalDateTime.parse(condolence.getCreateTime(), formatter); LocalDateTime createTime = LocalDateTime.parse(condolence.getCreateTime(), formatter);
docData.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日")); docData.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日"));
docData.put("applyUnionName", condolence.getApplyUnionName()); docData.put("applyUnionName", condolence.getApplyUnionName());
docData.put("info", info); docData.put("info", info);
docData2.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日")); docData2.put("createTime", DateUtil.format(createTime, "yyyy年MM月dd日"));
docData2.put("applyUnionName", condolence.getApplyUnionName()); docData2.put("applyUnionName", condolence.getApplyUnionName());
docData2.put("bankUserName", condolence.getBankUserName()); docData2.put("bankUserName", condolence.getBankUserName());
docData2.put("bankCardNumber", condolence.getBankCardNumber()); docData2.put("bankCardNumber", condolence.getBankCardNumber());
docData2.put("bankOfDeposit", condolence.getBankOfDeposit()); docData2.put("bankOfDeposit", condolence.getBankOfDeposit());
docData2.put("info", info); docData2.put("info", info);
// 金额转大写 // 金额转大写
// if (condolence.getMoney() != null) { // if (condolence.getMoney() != null) {
// docData.put("money_big", MoneyUtil.toRMBUpper(String.valueOf(condolence.getMoney()))); // docData.put("money_big", MoneyUtil.toRMBUpper(String.valueOf(condolence.getMoney())));
// } else { // } else {
@@ -227,171 +230,171 @@ public class CondolenceMineController {
// } // }
// docData.put("money", condolence.getMoney()); // docData.put("money", condolence.getMoney());
String fileName; String fileName;
String templateName; String templateName;
String type = condolence.getType(); String type = condolence.getType();
if (("6fb2ae129e674c0dbadc21d9abc22943").equals(type)) { if (("6fb2ae129e674c0dbadc21d9abc22943").equals(type)) {
fileName = "工会会员结婚慰问报销审批单"+ "_" + fileName = "工会会员结婚慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_marry"; templateName = "condolence_marry";
docData.put("type", "会员结婚慰问"); docData.put("type", "会员结婚慰问");
docData.put("way", "现金"); docData.put("way", "现金");
docData.put("occurTime", condolence.getOccurTime()); docData.put("occurTime", condolence.getOccurTime());
docData2.put("type", "会员结婚慰问"); docData2.put("type", "会员结婚慰问");
docData2.put("money", "1000"); docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整"); docData2.put("money_big", "壹仟元整");
} else if (("cf4ce7af322d464f8f86d818fcc00203").equals(type)){ } else if (("cf4ce7af322d464f8f86d818fcc00203").equals(type)) {
fileName = "工会会员生病住院慰问报销审批单"+ "_" + fileName = "工会会员生病住院慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_hospitalization"; templateName = "condolence_hospitalization";
docData.put("type", "会员生病慰问"); docData.put("type", "会员生病慰问");
docData.put("way", "现金"); docData.put("way", "现金");
docData.put("hospitalizationTime", condolence.getHospitalizationTime()); docData.put("hospitalizationTime", condolence.getHospitalizationTime());
docData.put("leaveHospitalTime", condolence.getLeaveHospitalTime()); docData.put("leaveHospitalTime", condolence.getLeaveHospitalTime());
docData.put("thisYearHospitalizationNum", condolence.getThisYearHospitalizationNum()); docData.put("thisYearHospitalizationNum", condolence.getThisYearHospitalizationNum());
docData2.put("type", "会员生病慰问"); docData2.put("type", "会员生病慰问");
docData2.put("money", "1000"); docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整"); docData2.put("money_big", "壹仟元整");
} else if (("c90cb10dce6542e99ae271bee6fe8cc0").equals(type)){ } else if (("c90cb10dce6542e99ae271bee6fe8cc0").equals(type)) {
fileName = "工会会员生育慰问报销审批单"+ "_" + fileName = "工会会员生育慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_birth"; templateName = "condolence_birth";
docData.put("type", "会员生育慰问"); docData.put("type", "会员生育慰问");
docData.put("way", "现金"); docData.put("way", "现金");
docData.put("occurTime", condolence.getOccurTime()); docData.put("occurTime", condolence.getOccurTime());
docData.put("hospitalizationTime", condolence.getHospitalizationTime()); docData.put("hospitalizationTime", condolence.getHospitalizationTime());
docData.put("leaveHospitalTime", condolence.getLeaveHospitalTime()); docData.put("leaveHospitalTime", condolence.getLeaveHospitalTime());
docData2.put("type", "会员生育慰问"); docData2.put("type", "会员生育慰问");
docData2.put("money", "1000"); docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整"); docData2.put("money_big", "壹仟元整");
}else if (("4e316737e71047e0b01aea78524c1416").equals(type)){ } else if (("4e316737e71047e0b01aea78524c1416").equals(type)) {
fileName = "工会会员直系亲属去世报销审批单"+ "_" + fileName = "工会会员直系亲属去世报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_relative_died"; templateName = "condolence_relative_died";
docData.put("type", "会员直系亲属去世慰问"); docData.put("type", "会员直系亲属去世慰问");
docData.put("way", "现金"); docData.put("way", "现金");
docData.put("relation", condolence.getRelation()); docData.put("relation", condolence.getRelation());
docData.put("occurTime", condolence.getOccurTime()); docData.put("occurTime", condolence.getOccurTime());
docData2.put("type", "会员直系亲属去世慰问"); docData2.put("type", "会员直系亲属去世慰问");
docData2.put("money", "1000"); docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整"); docData2.put("money_big", "壹仟元整");
}else if (("b8ee30faacb2469593dfedb5b52565aa").equals(type)){ } else if (("b8ee30faacb2469593dfedb5b52565aa").equals(type)) {
fileName = "工会会员职工去世慰问报销审批单"+ "_" + fileName = "工会会员职工去世慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_died"; templateName = "condolence_died";
docData.put("type", "会员职工去世慰问"); docData.put("type", "会员职工去世慰问");
docData.put("way", "现金"); docData.put("way", "现金");
docData.put("occurTime", condolence.getOccurTime()); docData.put("occurTime", condolence.getOccurTime());
docData2.put("type", "会员职工去世慰问"); docData2.put("type", "会员职工去世慰问");
docData2.put("money", "3000"); docData2.put("money", "3000");
docData2.put("money_big", "叁仟元整"); docData2.put("money_big", "叁仟元整");
}else if (("1a2f7e8decb649a6ba8ca76e2af07779").equals(type)){ } else if (("1a2f7e8decb649a6ba8ca76e2af07779").equals(type)) {
fileName = "工会会员退休慰问报销审批单"+ "_" + fileName = "工会会员退休慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_retirement"; templateName = "condolence_retirement";
docData.put("type", "会员退休慰问"); docData.put("type", "会员退休慰问");
docData.put("way", "工会统一发放慰问信及慰问卷"); docData.put("way", "工会统一发放慰问信及慰问卷");
docData.put("occurTime", condolence.getOccurTime()); docData.put("occurTime", condolence.getOccurTime());
docData2.put("type", "会员退休慰问"); docData2.put("type", "会员退休慰问");
docData2.put("money", "1000"); docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整"); docData2.put("money_big", "壹仟元整");
} else { } else {
fileName = "工会会员慰问报销审批单"+ "_" + fileName = "工会会员慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx"; DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_other"; templateName = "condolence_other";
docData.put("type", "会员其他慰问"); docData.put("type", "会员其他慰问");
docData.put("way", "现金"); docData.put("way", "现金");
docData.put("occurTime", condolence.getOccurTime()); docData.put("occurTime", condolence.getOccurTime());
} }
List<ProcessTaskVO> doneTaskVos = new ArrayList<>(); List<ProcessTaskVO> doneTaskVos = new ArrayList<>();
List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(info.getLong("instanceId"), null); List<ProcessTask> doneTaskList = flowEngine.processTaskService().getDoneTaskList(info.getLong("instanceId"), null);
for (ProcessTask doneTask : doneTaskList) { for (ProcessTask doneTask : doneTaskList) {
ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId()); ProcessTaskVO taskVO = flowEngine.processTaskService().findById(doneTask.getId());
doneTaskVos.add(taskVO); doneTaskVos.add(taskVO);
} }
// 分工会审核 // 分工会审核
doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName())) doneTaskVos.stream().filter(task -> "分工会审核".equals(task.getDisplayName()))
.max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
.ifPresent(v -> { .ifPresent(v -> {
Dict taskFormData = v.getTaskFormData(); Dict taskFormData = v.getTaskFormData();
HashMap<String, Object> approval = new HashMap<>(); HashMap<String, Object> approval = new HashMap<>();
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
docData2.put("fgh", approval); docData2.put("fgh", approval);
}); });
// 校工会副主席审核 // 校工会副主席审核
doneTaskVos.stream().filter(task -> "校工会审核".equals(task.getDisplayName())) doneTaskVos.stream().filter(task -> "校工会审核".equals(task.getDisplayName()))
.max(Comparator.comparing(ProcessTaskVO::getCreatedAt)) .max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
.ifPresent(v -> { .ifPresent(v -> {
Dict taskFormData = v.getTaskFormData(); Dict taskFormData = v.getTaskFormData();
HashMap<String, Object> approval = new HashMap<>(); HashMap<String, Object> approval = new HashMap<>();
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) {
approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign")));
} }
approval.put("opinion", taskFormData.getStr("tf_opinion")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xzx", approval); docData.put("xzx", approval);
docData2.put("xzx", approval); docData2.put("xzx", approval);
}); });
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
response.setHeader("content-disposition", "attachment;filename=" response.setHeader("content-disposition", "attachment;filename="
+ URLEncoder.encode("报销审批单.zip", "UTF-8")); + URLEncoder.encode("报销审批单.zip", "UTF-8"));
try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) { try (ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream())) {
ZipEntry zipEntry = new ZipEntry(fileName); ZipEntry zipEntry = new ZipEntry(fileName);
zipOut.putNextEntry(zipEntry); zipOut.putNextEntry(zipEntry);
try (ByteArrayOutputStream wordOut = new ByteArrayOutputStream()) { try (ByteArrayOutputStream wordOut = new ByteArrayOutputStream()) {
XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName)) XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate(templateName))
.render(docData) .render(docData)
.writeAndClose(wordOut); .writeAndClose(wordOut);
zipOut.write(wordOut.toByteArray()); zipOut.write(wordOut.toByteArray());
} }
zipOut.closeEntry(); zipOut.closeEntry();
String fileName2 = "武汉城市职业学院报销审批单" + ".docx"; String fileName2 = "武汉城市职业学院报销审批单" + ".docx";
ZipEntry zipEntry2 = new ZipEntry(fileName2); ZipEntry zipEntry2 = new ZipEntry(fileName2);
zipOut.putNextEntry(zipEntry2); zipOut.putNextEntry(zipEntry2);
try (ByteArrayOutputStream wordOut2 = new ByteArrayOutputStream()) { try (ByteArrayOutputStream wordOut2 = new ByteArrayOutputStream()) {
XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("reimbursement_approval")) XWPFTemplate.compile(sysOfficeTemplateUtil.getTemplate("reimbursement_approval"))
.render(docData2) .render(docData2)
.writeAndClose(wordOut2); .writeAndClose(wordOut2);
zipOut.write(wordOut2.toByteArray()); zipOut.write(wordOut2.toByteArray());
} }
zipOut.closeEntry(); zipOut.closeEntry();
zipOut.finish(); zipOut.finish();
} catch (IOException e) { } catch (IOException e) {
log.error("导出 ZIP 文件失败，ID: {}, 错误信息: {}", id, e.getMessage()); log.error("导出 ZIP 文件失败，ID: {}, 错误信息: {}", id, e.getMessage());
throw e; throw e;
} }
} }
} }
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java
+2 -2
View File
@@ -102,7 +102,7 @@ public class CondolenceSchoolPrincipalApprovalController {
cnd.andEX("info.applyUnitId", "=", unitId); cnd.andEX("info.applyUnitId", "=", unitId);
cnd.and("t.taskName", "=", "34f7938e-47a3-4b3a-b4e0-92b7a3f47865"); cnd.and("t.taskName", "=", "34f7938e-47a3-4b3a-b4e0-92b7a3f47865");
// cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
if (approval) { if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
@@ -115,7 +115,7 @@ public class CondolenceSchoolPrincipalApprovalController {
} else { } else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
} }
cnd.groupBy("t.id"); cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO); return Result.success(pageVO);
src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html
+4
View File
@@ -81,6 +81,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button> <el-button @click="$refs.guava.index()" size="small">取消</el-button>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js
+7 -1
View File
@@ -75,9 +75,15 @@ const condolenceInfo = {
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE" <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag> :value="task.ext.submitType"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode":span="3">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-image :src="task.taskFormData.tf_userSign"
v-if="task.taskFormData.tf_userSign"
class="signature-image"></el-image>
<span v-else>暂无签字</span>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </template>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html
+4
View File
@@ -101,6 +101,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button> <el-button @click="$refs.guava.index()" size="small">取消</el-button>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html
+4
View File
@@ -101,6 +101,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button> <el-button @click="$refs.guava.index()" size="small">取消</el-button>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html
+8 -1
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.applyUnionName}}</table-column> <table-column label="所属工会">{{row.applyUnionName}}</table-column>
<table-column label="所属单位">{{row.applyUnitName}}</table-column> <table-column label="所属单位">{{row.applyUnitName}}</table-column>
<table-column label="慰问类型">{{row.typeName}}</table-column> <table-column label="慰问类型">{{row.typeName}}</table-column>
<table-column label="当前节点">{{row.curTaskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}<span v-if="row.auditUser">-{{row.auditUser}}</span></table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
@@ -70,6 +70,13 @@ layout("/layouts/platform_h5.html"){
maxlength="100" maxlength="100"
show-word-limit show-word-limit
></van-field> ></van-field>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
</van-form> </van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px"> <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button> <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js
+5
View File
@@ -68,6 +68,11 @@ const condolenceInfo = {
<van-cell title="办理意见" v-if="!task.ext.isFirstTaskNode" class="direction-column-cell"> <van-cell title="办理意见" v-if="!task.ext.isFirstTaskNode" class="direction-column-cell">
<div v-html="task.taskFormData.tf_opinion"></div> <div v-html="task.taskFormData.tf_opinion"></div>
</van-cell> </van-cell>
<van-cell class="direction-column-cell" title="签字"v-if="!task.ext.isFirstTaskNode">
<van-image :src="task.taskFormData.tf_userSign" v-if="task.taskFormData.tf_userSign"
class="signature-image"></van-image>
<span v-else>暂无签字</span>
</van-cell>
</van-cell-group> </van-cell-group>
</template> </template>
</div> </div>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/mine/index.html
+7 -5
View File
@@ -33,7 +33,8 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.applyUnionName}}</table-column> <table-column label="所属工会">{{row.applyUnionName}}</table-column>
<table-column label="所属单位">{{row.applyUnitName}}</table-column> <table-column label="所属单位">{{row.applyUnitName}}</table-column>
<table-column label="慰问类型">{{row.typeName}}</table-column> <table-column label="慰问类型">{{row.typeName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.taskName}}<span v-if="row.auditUser">-{{row.auditUser}}</span>
</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
@@ -78,7 +79,7 @@ layout("/layouts/platform_h5.html"){
year: new Date().getFullYear(), year: new Date().getFullYear(),
type: null type: null
}, },
typeOptions: [], typeOptions: []
} }
}, },
methods: { methods: {
@@ -129,10 +130,11 @@ layout("/layouts/platform_h5.html"){
} }
}) })
}) })
.catch(() => {}) .catch(() => {
})
}, },
async queryCondolenceType() { async queryCondolenceType() {
const res = await this.$axios.post('/platform/condolence/type/queryCondolenceType') const res = await this.$axios.post("/platform/condolence/type/queryCondolenceType")
return res.data return res.data
}, },
doSearch() { doSearch() {
@@ -142,7 +144,7 @@ layout("/layouts/platform_h5.html"){
this.$refs.tableListRef.doSearch() this.$refs.tableListRef.doSearch()
}) })
} }
}, }
}) })
</script> </script>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html
+7
View File
@@ -70,6 +70,13 @@ layout("/layouts/platform_h5.html"){
maxlength="100" maxlength="100"
show-word-limit show-word-limit
></van-field> ></van-field>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
</van-form> </van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px"> <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button> <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html
+7
View File
@@ -70,6 +70,13 @@ layout("/layouts/platform_h5.html"){
maxlength="100" maxlength="100"
show-word-limit show-word-limit
></van-field> ></van-field>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
</van-form> </van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px"> <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button> <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>