From 59e896ed4ea42f82057474227ea7ec78cb5a8be9 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期五, 13 六月 2025 16:53:20 +0800
Subject: [PATCH] 航宇dnc定型流程功能开发
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 2 +-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IDispatchFileService.java | 6 +++++-
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java | 21 +++++++++++++++++++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java | 22 ++++++++++++++++++++++
4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java
index 35234c4..0afad22 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java
@@ -10,6 +10,10 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.dnc.entity.DocInfo;
+import org.jeecg.modules.dnc.response.CommonCode;
+import org.jeecg.modules.dnc.response.ResponseResult;
+import org.jeecg.modules.dnc.service.IDocInfoService;
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.service.IDispatchFileService;
import org.jeecg.modules.dncFlow.vo.DispatchFileFlowTaskVo;
@@ -40,6 +44,8 @@
@Autowired
private IHisWorkTaskService hisWorkTaskService;
+ @Autowired
+ private IDocInfoService docInfoService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -231,5 +237,21 @@
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DispatchFile.class);
}
+ @AutoLog(value = "鏂囨。琛�-瀹氬瀷娴佺▼鍙戣捣")
+ @ApiOperation(value = "鏂囨。琛�-瀹氬瀷娴佺▼鍙戣捣", notes = "鏂囨。琛�-瀹氬瀷娴佺▼鍙戣捣")
+ @PostMapping("/submitProccess")
+ public ResponseResult submitProccess(@RequestBody DispatchFile dispatchFile) {
+ dispatchFileService.submitProccess(dispatchFile);
+ return new ResponseResult(CommonCode.SUCCESS);
+ }
+ @AutoLog(value = "鏂囨。琛�-淇℃伅鏌ヨ")
+ @ApiOperation(value = "鏂囨。琛�-淇℃伅鏌ヨ", notes = "鏂囨。琛�-淇℃伅鏌ヨ")
+ @GetMapping("/queryDocInfoByFlowDataId")
+ public Result<DocInfo> queryDocInfoByFlowDataId(@RequestParam("dataId") String dataId) {
+ DispatchFile dispatchFile = dispatchFileService.getById(dataId);
+ DocInfo docInfo = docInfoService.getById(dispatchFile.getDocId());
+ return Result.OK(docInfo);
+ }
+
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IDispatchFileService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IDispatchFileService.java
index 7246401..d183c52 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IDispatchFileService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IDispatchFileService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.vo.DispatchFileFlowTaskVo;
@@ -53,5 +54,8 @@
* @param id
*/
Result<?> queryDispatchFile(String id);
-
+ /**
+ * 瀹氬瀷娴佺▼
+ */
+ Result<?> submitProccess(DispatchFile dispatchFile);
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java
index 0314c77..90326a7 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java
@@ -374,6 +374,27 @@
List<DocInfo> docInfoList = docInfoService.findList(docInfoQueryRequest);
return Result.OK(docInfoList);
}
+ /**
+ * 鍙戣捣瀹氬瀷娴佺▼
+ */
+ @Override
+ public Result<?> submitProccess(DispatchFile dispatchFile) {
+ checkParam(dispatchFile);
+ super.save(dispatchFile);
+ //鑾峰彇鏂囦欢淇℃伅
+ DocInfo docInfo = docInfoService.getById(dispatchFile.getDocId());
+ flowCommonService.initActBusiness(docInfo.getDocName()+"."+docInfo.getDocSuffix()+"鏂囦欢杩涜瀹氬瀷",
+ dispatchFile.getId(), "IDispatchFileService", "process_rf27duhy", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", dispatchFile.getId());
+ variables.put("organization", "瀵煎叆鏂囨。榛樿鍚姩娴佺▼");
+ variables.put("comment", "瀵煎叆鏂囨。榛樿鍚姩娴佺▼");
+ variables.put("proofreading",true);
+ Result result= flowDefinitionService.startProcessInstanceByKey("process_rf27duhy", variables);
+ if (!result.isSuccess())
+ super.removeById(dispatchFile.getId());
+ return result;
+ }
private Map<String, Object> setProcessVariables(DispatchFile dispatchFile, String userId, DispatchFileFlowTaskVo dispatchFileFlowTaskVo) {
Map<String, Object> values = new HashMap<>();
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index eeda31e..686fd74 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -126,7 +126,7 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_HANGYU;nullCatalogMeansCurrent=true
+ url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_HANGYU_GK;nullCatalogMeansCurrent=true
username: sa
password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
--
Gitblit v1.9.3