From ee99290acc01bf294b44f39194f93762d7a3de2d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 二月 2024 18:50:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 16 ++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 7 ++++---
ruoyi-common/pom.xml | 27 +++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 5897033..1e83243 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -598,12 +598,13 @@
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceFund.setOfficedirector(user.getNickName());
+ serviceFund.setUploadStates(0);
}
System.out.println("serviceFund鐨勫�兼槸--------:" + serviceFund);
log.info("寮�濮嬫洿鏂扮殑鐨勫�兼槸--------");
- ServiceFund updateServiceFund = new ServiceFund();
- updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
- updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
+// ServiceFund updateServiceFund = new ServiceFund();
+// updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
+// updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
Boolean aBoolean1 = serviceFundService.updateById(serviceFund);
log.info("integer鏇存柊鐨勭殑鍊兼槸-------- :{}", aBoolean1);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 35e47e0..bf99142 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.MergeFilesToPDFUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -58,6 +59,9 @@
public class ServiceReimbursementController extends BaseController {
@Autowired
private IServiceReimbursementService serviceReimbursementService;
+
+// @Autowired
+// private MergeFilesToPDFUtils mergeFilesToPDFUtils;
@Autowired
private IServiceReimbursementSharedService serviceReimbursementSharedService;
@@ -235,6 +239,17 @@
}
return error();
}
+
+// /**
+// * 宸梾璐逛笂鎶�
+// */
+// @ApiOperation("宸梾璐逛笂鎶�")
+// @Log(title = "宸梾璐逛笂鎶�", businessType = BusinessType.OTHER)
+// @PostMapping("/test")
+// public AjaxResult test(@RequestBody CheckFundVO checkFundVO) {
+// mergeFilesToPDFUtils.generatePdf(checkFundVO.getFileNames(), checkFundVO.getOutputFile());
+// return AjaxResult.success(200);
+// }
/**
@@ -466,6 +481,7 @@
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceReimbursement.setOfficedirector(user.getNickName());
+ serviceReimbursement.setUploadStates(0);
}
serviceReimbursementService.updateById(serviceReimbursement);
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index a5dbbc0..de8dcca 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -143,6 +143,33 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>2.0.24</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.7.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jodconverter</groupId>
+ <artifactId>jodconverter-spring-boot-starter</artifactId>
+ <version>4.4.6</version>
+ </dependency>
+ <!--jodconverter 寮曠敤LibreOffice搴�-->
+ <dependency>
+ <groupId>org.jodconverter</groupId>
+ <artifactId>jodconverter-local-lo</artifactId>
+ <version>4.4.6</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
--
Gitblit v1.9.3