From 5daff3511eb027b6ad22c70c4de080cadc6def47 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期三, 18 十二月 2024 16:52:42 +0800
Subject: [PATCH] feat: 格式化
---
land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java b/land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java
index ab8ca32..5ff371d 100644
--- a/land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java
+++ b/land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java
@@ -48,7 +48,6 @@
@PostMapping(UrlConstants.STATE_AGREEMENT_SAVE)
public AjaxResult<Boolean> createAgreement(@RequestBody StateAgreementSaveBO saveBO) {
-
//根据协议类型和房产id进行排重 每个协议只能存在一份
LambdaQueryWrapper<StateAgreement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StateAgreement::getAgreementFileType, saveBO.getAgreementFileType());
@@ -59,6 +58,7 @@
if (ObjectUtil.isNotEmpty(stateAgreement) && Objects.isNull(saveBO.getId())) {
throw new GlobalException("每种协议类型只能存在一份");
}
+
if (!CollectionUtils.isEmpty(saveBO.getFileBOList())) {
saveBO.setFileUrl(JSON.toJSONString(saveBO.getFileBOList()));
String appendFileName = saveBO.getFileBOList().stream().map(FileBO::getOriginalFilename).collect(Collectors.joining(","));
@@ -103,7 +103,6 @@
.set(StateAgreement::getFileUrl, null);
return AjaxResult.success(stateAgreementService.update(updateWrapper));
}
-
return AjaxResult.success(stateAgreementService.removeById(agreementId));
}
@@ -118,7 +117,11 @@
}
@GetMapping(UrlConstants.STATE_AGREEMENT_GENERATE)
- public void generateAgreementDetail(@RequestParam String stateHouseholdId, @RequestParam String stateAgreementId, HttpServletResponse response) throws Exception {
+ public void generateAgreementDetail(
+ @RequestParam String stateHouseholdId,
+ @RequestParam String stateAgreementId,
+ HttpServletResponse response
+ ) throws Exception {
StateAgreementBO request = new StateAgreementBO();
request.setStateHouseholdId(stateHouseholdId);
Map<String, Object> wordData = stateAgreementService.getWordData(stateHouseholdId, stateAgreementId);
@@ -142,7 +145,6 @@
default:
templatePath = "templates/word_template.docx";
}
-
XWPFDocument document = WordExportUtil.exportWord07(templatePath, wordData);
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
@@ -187,7 +189,6 @@
processStartBO.setVariable(variable);
stateProcessTemplateService.start(processStartBO);
}
-
return AjaxResult.success(stateAgreementService.saveOrUpdateBatch(agreementList));
}
}
--
Gitblit v1.7.1