From 058bad4b02bf4cc75a485ed16d4a90c6336bf144 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 06 二月 2026 16:42:29 +0800
Subject: [PATCH] 添加状态：停止服务-cgf
---
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/demo/contract/controller/ExcelImportController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 1a7f368..d62bd33 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
@@ -10,8 +10,10 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.demo.contract.entity.Contract;
import org.jeecg.modules.demo.contract.entity.ExcelDataDTO;
import org.jeecg.modules.demo.contract.entity.SemanticWord;
+import org.jeecg.modules.demo.contract.service.IContractService;
import org.jeecg.modules.demo.contract.service.ISemanticWordService;
import org.jeecg.modules.demo.copywriting.controller.CopywritingAsyncService;
import org.jeecg.modules.listener.ExcelDataListener;
@@ -39,6 +41,8 @@
private ISysUserService sysUserService;
@Autowired
private ISemanticWordService semanticWordService;
+ @Autowired
+ private IContractService contractService;
/**
* Excel鏂囦欢瀵煎叆鎺ュ彛锛堥�傞厤澶х被銆佸搧鐗岀瓑浜斿垪锛�
* @return 瀵煎叆缁撴灉
@@ -81,8 +85,8 @@
copy.setContractId(importParam.getContractId());
copy.setBrand(data.getBrand());
copy.setCategoryOne(data.getCategory());
- copy.setWord(data.getLeakWord());
- copy.setOutWord(data.getSemanticQuestion());
+ 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();
@@ -95,7 +99,10 @@
}
}
semanticWordService.saveBatch(semanticWords);
-
+ Contract contract = new Contract();
+ contract.setId(importParam.getContractId());
+ contract.setIsImportStatus("1");
+ contractService.updateById(contract);
// 绀轰緥锛氳皟鐢⊿ervice淇濆瓨鏁版嵁锛堟浛鎹负浣犵殑瀹為檯涓氬姟閫昏緫锛�
// excelDataService.saveBatch(dataList);
@@ -127,10 +134,6 @@
return Result.error("鏂囦欢涓嶈兘涓虹┖");
} else if (cp.getYoushang().isEmpty()) {
return Result.error("鍙嬪晢涓嶈兘涓虹┖");
- } else if (cp.getWenti().isEmpty()) {
- return Result.error("闂鎻忚堪涓嶈兘涓虹┖");
- } else if (cp.getCopywritingRequirements().isEmpty()) {
- return Result.error("鏂囨瑕佹眰涓嶈兘涓虹┖");
} else if (cp.getAuditor().isEmpty() || cp.getAuditorName().isEmpty()) {
return Result.error("鐢ㄦ埛涓嶈兘涓虹┖");
}
@@ -142,8 +145,8 @@
} else {
// 璋冪敤寮傛鏂规硶鎵ц瀹為檯鐢熸垚閫昏緫
copywritingAsyncService.asyncBatchGenerateCopy(
- cp.getContractId(), list, cp.getFileName(), cp.getYoushang(), cp.getWenti(),
- cp.getCopywritingRequirements(),cp.getAuditor(), cp.getAuditorName()
+ cp.getContractId(), list, cp.getFileName(), cp.getYoushang(),
+ cp.getBenchmarkUrl(),cp.getAuditor(), cp.getAuditorName()
);
// 绔嬪嵆杩斿洖鍝嶅簲锛屼笉绛夊緟鐢熸垚瀹屾垚
return Result.OK("寮�濮嬬敓鎴愶紝浠诲姟宸叉彁浜よ嚦鍚庡彴澶勭悊");
--
Gitblit v1.8.0