社保多比例&派减截止日期开发-fxj

yifu-social/yifu-social-biz/pom.xml

@@ -100,21 +100,6 @@
 		</dependency>
 
 		<!-- Apache POI -->
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>5.2.3</version> <!-- 使用最新版本 -->
-		</dependency>
-		<dependency>
-		<groupId>org.apache.poi</groupId>
-		<artifactId>poi-ooxml</artifactId>
-		<version>5.2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.12.0</version>
-		</dependency>
 		<dependency>
 			<groupId>spire.xls</groupId>
 			<artifactId>spire.xls</artifactId>

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -83,10 +83,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -7536,6 +7533,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isEmpty(socialInfo)){
 			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 		}
+		//查询户名称对应的户配置 以获取公章信息
+		SysBaseSetInfo socialBaseSet = baseSetMapper.selectById(socialInfo.getSocialHousehold());
+		if (Common.isEmpty(socialBaseSet)){
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
 		searchVo.setSocialHouseholdName(socialInfo.getSocialHouseholdName());
 		//searchVo.setDisMonth(DateUtil.getThisMonth());
 		searchVo.setDisMonth("202410");
@@ -7876,6 +7878,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				excelWriter.finish();
 			}
 			//读取文件 生成电子章
+			FileInputStream inputStream = new FileInputStream(filePath);
+			String outPath = projectRoot+"//out_"+fileName;
+			FileOutputStream fileOUt = new FileOutputStream(outPath);
+			URL url =ossUtil.getObjectUrl(null,"");
+			InputStream inStream = url.openStream();
+			excelMergeImage.addPictureToExcel(inputStream,inStream,fileOUt,0);
 
 		}catch (Exception e){
 			log.error("执行异常" ,e);