zhoulisky 4 months ago
parent
commit
42b3ccf142

+ 6 - 8
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmCostDetailsServiceImpl.java

@@ -418,10 +418,6 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
 		map.put("year", yearAndMonth.substring(0, 4));
 		map.put("year", yearAndMonth.substring(0, 4));
 		map.put("month", yearAndMonth.substring(4));
 		map.put("month", yearAndMonth.substring(4));
 
 
-		R<Tenant> tenant = sysClient.getTenant(SecureUtil.getTenantId());
-		if (tenant.isSuccess()) {
-			map.put("enterpriseName", tenant.getData().getTenantName());
-		}
 		excelWriter.fill(map, writeSheet);
 		excelWriter.fill(map, writeSheet);
 		excelWriter.finish();
 		excelWriter.finish();
 		if (templateFileName != null) {
 		if (templateFileName != null) {
@@ -623,6 +619,8 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
 		map.put("wxzctxTotalSum", list.stream().map(HighTechCostSummary::getWxzctxTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("wxzctxTotalSum", list.stream().map(HighTechCostSummary::getWxzctxTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("zbtsfyysyfyTotalSum", list.stream().map(HighTechCostSummary::getZbtsfyysyfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("zbtsfyysyfyTotalSum", list.stream().map(HighTechCostSummary::getZbtsfyysyfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("qtfyTotalSum", list.stream().map(HighTechCostSummary::getQtfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("qtfyTotalSum", list.stream().map(HighTechCostSummary::getQtfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
+		map.put("qtfyLimitSum", list.stream().map(HighTechCostSummary::getQtfyLimit).reduce(BigDecimal.ZERO, BigDecimal::add));
+		map.put("qtfyAdjustSum", list.stream().map(HighTechCostSummary::getQtfyAdjust).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("wwyfTotalSum", list.stream().map(HighTechCostSummary::getWwyfTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("wwyfTotalSum", list.stream().map(HighTechCostSummary::getWwyfTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("totalSum", list.stream().map(HighTechCostSummary::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		map.put("totalSum", list.stream().map(HighTechCostSummary::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
 		WriteSheet writeSheet = EasyExcel.writerSheet().build();
 		WriteSheet writeSheet = EasyExcel.writerSheet().build();
@@ -632,10 +630,10 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
 		map.put("year", yearAndMonth.substring(0, 4));
 		map.put("year", yearAndMonth.substring(0, 4));
 		map.put("month", yearAndMonth.substring(4));
 		map.put("month", yearAndMonth.substring(4));
 
 
-		R<Tenant> tenant = sysClient.getTenant(SecureUtil.getTenantId());
-		if (tenant.isSuccess()) {
-			map.put("enterpriseName", tenant.getData().getTenantName());
-		}
+//		R<Tenant> tenant = sysClient.getTenant(SecureUtil.getTenantId());
+//		if (tenant.isSuccess()) {
+//			map.put("enterpriseName", tenant.getData().getTenantName());
+//		}
 
 
 		excelWriter.fill(map, writeSheet);
 		excelWriter.fill(map, writeSheet);
 		excelWriter.finish();
 		excelWriter.finish();

+ 3 - 3
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/XmFinanceServiceImpl.java

@@ -125,12 +125,12 @@ public class XmFinanceServiceImpl extends BaseServiceImpl<XmFinanceMapper, XmFin
 			temp.setXh(index.getAndIncrement() + "");
 			temp.setXh(index.getAndIncrement() + "");
 		});
 		});
 
 
-		String title = dto.getYearAndMonth() + "年会计-研发项目清单";
+		String title = dto.getYearAndMonth() + "年会计口径-研发项目清单";
 		//类型,1:会计,2:加计扣除,3:高新
 		//类型,1:会计,2:加计扣除,3:高新
 		if (Func.equals(dto.getType(), 2)) {
 		if (Func.equals(dto.getType(), 2)) {
-			title = dto.getYearAndMonth() + "年加计扣除-研发项目清单";
+			title = dto.getYearAndMonth() + "年加计扣除口径-研发项目清单";
 		} else if (Func.equals(dto.getType(), 3)) {
 		} else if (Func.equals(dto.getType(), 3)) {
-			title = dto.getYearAndMonth() + "年高新-研发项目清单";
+			title = dto.getYearAndMonth() + "年高新口径-研发项目清单";
 		}
 		}
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/对外报表管理/三口径-研发项目清单.xls");
 		InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream("export-template/对外报表管理/三口径-研发项目清单.xls");
 
 

BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/会计口径-研发支出辅助明细账.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/会计口径-研发支出辅助账汇总表.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/加计扣除-研发支出辅助汇总表.xls


BIN
kd-service/kd-scientific/src/main/resources/export-template/对外报表管理/高新口径-研发支出辅助账汇总表.xls