|
@@ -335,11 +335,11 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
}
|
|
|
if (finalTypes.contains(5)) {
|
|
if (finalTypes.contains(5)) {
|
|
|
//5 高新研发项目汇总表:对外报表-高新口径研发费用报表-高新-研发项目清单表
|
|
//5 高新研发项目汇总表:对外报表-高新口径研发费用报表-高新-研发项目清单表
|
|
|
- generateD5(Paths.get(basePath.toString(), "5.高新研发项目汇总表"), year, 2);
|
|
|
|
|
|
|
+ generateD5(Paths.get(basePath.toString(), "5.高新研发项目汇总表"), year, 3);
|
|
|
}
|
|
}
|
|
|
if (finalTypes.contains(6)) {
|
|
if (finalTypes.contains(6)) {
|
|
|
//6 加计扣除研发项目汇总表:对外报表-加计扣除口径研发费用报表-加计扣除-研发项目清单表
|
|
//6 加计扣除研发项目汇总表:对外报表-加计扣除口径研发费用报表-加计扣除-研发项目清单表
|
|
|
- generateD5(Paths.get(basePath.toString(), "6.加计扣除研发项目汇总表"), year, 3);
|
|
|
|
|
|
|
+ generateD5(Paths.get(basePath.toString(), "6.加计扣除研发项目汇总表"), year, 2);
|
|
|
}
|
|
}
|
|
|
}));
|
|
}));
|
|
|
|
|
|
|
@@ -789,7 +789,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
generateD7_1(xmmcPath, xm);
|
|
generateD7_1(xmmcPath, xm);
|
|
|
//2.研发预算编制
|
|
//2.研发预算编制
|
|
|
Path path7_2 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "2.研发预算编制"));
|
|
Path path7_2 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "2.研发预算编制"));
|
|
|
- generateD7_2(xmmcPath, xmId);
|
|
|
|
|
|
|
+ generateD7_2(path7_2, xmId);
|
|
|
//2-1.人员人工费用
|
|
//2-1.人员人工费用
|
|
|
generateD7_2_1(path7_2, xmId);
|
|
generateD7_2_1(path7_2, xmId);
|
|
|
//2-2.直接投入费用
|
|
//2-2.直接投入费用
|
|
@@ -918,7 +918,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
private boolean generateD5(Path path, String year, Integer type) {
|
|
private boolean generateD5(Path path, String year, Integer type) {
|
|
|
try {
|
|
try {
|
|
|
FileUtil.mkdir(path);
|
|
FileUtil.mkdir(path);
|
|
|
- FileOutputStream out = new FileOutputStream(path + "/" + (type == 2 ? "高新研发项目汇总表.xlsx" : "加计扣除研发项目汇总表.xlsx"));
|
|
|
|
|
|
|
+ FileOutputStream out = new FileOutputStream(path + "/" + (type == 3 ? "高新研发项目汇总表.xlsx" : "加计扣除研发项目汇总表.xlsx"));
|
|
|
XmFinanceEntity dto = new XmFinanceEntity();
|
|
XmFinanceEntity dto = new XmFinanceEntity();
|
|
|
dto.setYearAndMonth(year);
|
|
dto.setYearAndMonth(year);
|
|
|
dto.setType(type);
|
|
dto.setType(type);
|