From 24bfd38bb9f89042028f757e05386cdd2558fc67 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 10 二月 2026 18:13:57 +0800
Subject: [PATCH] 添加状态：停止服务-cgf
---
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/demo/contract/controller/ExcelImportController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/demo/contract/controller/ExcelImportController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/demo/contract/controller/ExcelImportController.java
index 9ff24d3..523daf0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/demo/contract/controller/ExcelImportController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/demo/contract/controller/ExcelImportController.java
@@ -97,19 +97,22 @@
} else {
SemanticWord copy = new SemanticWord();
BeanUtils.copyProperties(copy, importParam);
+ if (copy.getChanger() == null || copy.getChanger().isEmpty()) {
+ return Result.error("鏂囨缂栬緫涓嶈兘涓虹┖锛�");
+ }
copy.setContractId(importParam.getContractId());
copy.setBrand(data.getBrand());
copy.setCategoryOne(data.getCategory());
copy.setWord(data.getSemanticQuestion());
copy.setOutWord(data.getLeakWord());
- QueryWrapper qw = new QueryWrapper<SysUser>();
- qw.eq("realName", data.getCreator());
- Page result = (Page) sysUserService.queryPageList(req, qw, 2, 1).getResult();
- if (result.getTotal() != 1) {
- return Result.error("鏈煡璇㈠埌鐢ㄦ埛锛�" + data.getCreator());
- }
- String userId = ((SysUser)(result).getRecords().get(0)).getId();
- copy.setChanger(userId);
+// QueryWrapper qw = new QueryWrapper<SysUser>();
+// qw.eq("realName", data.getCreator());
+// Page result = (Page) sysUserService.queryPageList(req, qw, 2, 1).getResult();
+// if (result.getTotal() != 1) {
+// return Result.error("鏈煡璇㈠埌鐢ㄦ埛锛�" + data.getCreator());
+// }
+// String userId = ((SysUser)(result).getRecords().get(0)).getId();
+// copy.setChanger(userId);
semanticWords.add(copy);
}
}
@@ -143,6 +146,9 @@
@RequiresPermissions("contract:contract:batchGenerateCopy")
@RequestMapping(value = "/batchGenerateCopy", method = RequestMethod.POST)
public Result<?> batchGenerateCopy(@RequestBody ContractParam cp) {
+ if (cp.getCsId() == null){
+ cp.setCsId("2020795745607319553");
+ }
if (cp.getContractId().isEmpty()) {
return Result.error("鏂囨缂栧彿涓嶈兘涓虹┖");
} else if (cp.getFileName().isEmpty()) {
@@ -159,10 +165,7 @@
return Result.error("璇ュ悎鍚屼笉瀛樺湪璇箟璇�");
} else {
// 璋冪敤寮傛鏂规硶鎵ц瀹為檯鐢熸垚閫昏緫
- copywritingAsyncService.asyncBatchGenerateCopy(
- cp.getContractId(), list, cp.getFileName(), cp.getYoushang(),
- cp.getBenchmarkUrl(),cp.getAuditor(), cp.getAuditorName()
- );
+ copywritingAsyncService.asyncBatchGenerateCopy(list, cp);
// 绔嬪嵆杩斿洖鍝嶅簲锛屼笉绛夊緟鐢熸垚瀹屾垚
return Result.OK("寮�濮嬬敓鎴愶紝浠诲姟宸叉彁浜よ嚦鍚庡彴澶勭悊");
}
--
Gitblit v1.8.0