|
|
@@ -295,7 +295,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
types = Arrays.asList(1, 2, 4, 5, 7, 9, 11, 14, 21, 22, 23, 25, 27);
|
|
|
} else {
|
|
|
dir = "加计扣除备查资料";
|
|
|
- types = Arrays.asList(3, 4, 6, 8, 10, 13, 15, 19, 20, 26, 28);
|
|
|
+ types = Arrays.asList(3, 4, 6, 8, 10, 13, 16, 19, 20, 26, 28);
|
|
|
}
|
|
|
Date date = new Date();
|
|
|
|
|
|
@@ -1374,7 +1374,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String yearAndMonth = year + (i < 10 ? "0" + i : i);
|
|
|
XmLeaseEntity param = new XmLeaseEntity();
|
|
|
- param.setType("仪器设备");
|
|
|
+// param.setType("仪器设备");
|
|
|
param.setYearAndMonth(yearAndMonth);
|
|
|
param.setXmId(xmId);
|
|
|
List<JSONObject> leaseList = xmLeaseService.yanfazulinzichanfeiyongfenpeibiao(param);
|
|
|
@@ -1395,7 +1395,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
|
|
|
@SneakyThrows
|
|
|
private void generateD17_2_1_2(String year, Path path, Long xmId, String type) {
|
|
|
- String fileName = type.equals("材料") ? "领料单" : (type.equals("动力") ? "研发动力耗用单" : "研发燃料耗用单") + ".xlsx";
|
|
|
+ String fileName = type.equals("材料") ? "领料单.xlsx" : (type.equals("动力") ? "研发动力耗用单" : "研发燃料耗用单") + ".xlsx";
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String yearAndMonth = year + (i < 10 ? "0" + i : i);
|
|
|
XmGoodsDTO param = new XmGoodsDTO();
|