|
|
@@ -22,6 +22,7 @@ import org.sky.core.tool.utils.Func;
|
|
|
import org.sky.scientific.mapper.ArchiveAttachMapper;
|
|
|
import org.sky.scientific.mapper.DownloadTaskMapper;
|
|
|
import org.sky.scientific.mapper.SettingMapper;
|
|
|
+import org.sky.scientific.mapper.XmTechnicianMapper;
|
|
|
import org.sky.scientific.pojo.dto.*;
|
|
|
import org.sky.scientific.pojo.entity.*;
|
|
|
import org.sky.scientific.pojo.vo.*;
|
|
|
@@ -133,6 +134,8 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
private IXmOtherCostService xmOtherCostService;
|
|
|
@Resource
|
|
|
private IXmWwxmCostService wwxmCostService;
|
|
|
+ @Resource
|
|
|
+ private XmTechnicianMapper xmTechnicianMapper;
|
|
|
|
|
|
@Override
|
|
|
public ArchiveAttachEntity fjbczl(String year) {
|
|
|
@@ -434,7 +437,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
try {
|
|
|
XmFinanceEntity dto2 = new XmFinanceEntity();
|
|
|
dto2.setYearAndMonth(year);
|
|
|
- dto2.setType(2);
|
|
|
+ dto2.setType(3);
|
|
|
generateD17(path18, xmFinanceService.selectXmFinanceList(dto2), year, futureList);
|
|
|
} catch (Exception e) {
|
|
|
throw new RuntimeException(e);
|
|
|
@@ -446,7 +449,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
try {
|
|
|
XmFinanceEntity dto2 = new XmFinanceEntity();
|
|
|
dto2.setYearAndMonth(year);
|
|
|
- dto2.setType(3);
|
|
|
+ dto2.setType(2);
|
|
|
generateD17(path19, xmFinanceService.selectXmFinanceList(dto2), year, futureList);
|
|
|
} catch (Exception e) {
|
|
|
throw new RuntimeException(e);
|
|
|
@@ -506,11 +509,11 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
log.info("一键导出耗时:{}", (new Date().getTime() - date.getTime()) / 1000 + "秒");
|
|
|
|
|
|
|
|
|
- String zipPath = basePath+".zip";
|
|
|
+ String zipPath = basePath + ".zip";
|
|
|
try {
|
|
|
ZipUtil.zip(basePath.toString(), zipPath);
|
|
|
} catch (IORuntimeException e) {
|
|
|
- log.error("创建zip文件失败,{}",e.getLocalizedMessage());
|
|
|
+ log.error("创建zip文件失败,{}", e.getLocalizedMessage());
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -526,6 +529,8 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
private void generateD17(Path path, List<XmFinanceEntity> list, String year, List<CompletableFuture<Void>> futureList) {
|
|
|
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
|
|
|
for (XmFinanceEntity xm : list) {
|
|
|
+ Long xmId = xm.getXmId();
|
|
|
+
|
|
|
//创建项目文件夹
|
|
|
Path xmmcPath = FileUtil.mkdir(FileUtil.mkdir(Paths.get(path.toString(), xm.getXmmc())));
|
|
|
|
|
|
@@ -533,26 +538,26 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
Path path17_1 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "1.人员人工费用"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- //1-1.每月研发人员工资"
|
|
|
- generateD17_1_1(path17_1, year);
|
|
|
+ //1-1.每月研发人员工资
|
|
|
+ generateD17_1_1(path17_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
//1-2.每月研发人员出勤
|
|
|
- generateD17_1_2(path17_1, year);
|
|
|
+ generateD17_1_2(path17_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
//1-3.每月研发工时打卡
|
|
|
- generateD17_1_3(path17_1, year);
|
|
|
+ generateD17_1_3(path17_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
//1-4.人工费用分配表
|
|
|
- generateD17_1_4(path17_1, year);
|
|
|
+ generateD17_1_4(path17_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//2.直接投入费用
|
|
|
@@ -565,7 +570,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
////2-1-1.每月领料燃料动力明细
|
|
|
- generateD17_2_1_1(path17_2_1_1, year);
|
|
|
+ generateD17_2_1_1(path17_2_1_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//2-1-2.研发领料单
|
|
|
@@ -579,14 +584,14 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
Path path17_2_1_3 = FileUtil.mkdir(Paths.get(path17_2_1.toString(), "3.研发燃料耗用单"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generateD17_2_1_2(year, path17_2_1_3, xm.getXmId(), "燃料");
|
|
|
+ generateD17_2_1_2(year, path17_2_1_3, xmId, "燃料");
|
|
|
}));
|
|
|
|
|
|
//2-1-4.研发动力耗用单
|
|
|
Path path17_2_1_4 = FileUtil.mkdir(Paths.get(path17_2_1.toString(), "4.研发动力耗用单"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generateD17_2_1_2(year, path17_2_1_4, xm.getXmId(), "动力");
|
|
|
+ generateD17_2_1_2(year, path17_2_1_4, xmId, "动力");
|
|
|
}));
|
|
|
|
|
|
//2-2.研发固定资产租赁费用
|
|
|
@@ -595,7 +600,7 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
Path path17_2_2_1 = FileUtil.mkdir(Paths.get(path17_2_2.toString(), "1.每月租赁资产费用明细"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generateD17_2_2_1(path17_2_2_1, year);
|
|
|
+ generateD17_2_2_1(path17_2_2_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//2-2-2.研发租赁费用分配表
|
|
|
@@ -603,14 +608,14 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_2_2_2(year, path17_2_2_2, xm.getXmId());
|
|
|
+ generate17_2_2_2(year, path17_2_2_2, xmId);
|
|
|
}));
|
|
|
|
|
|
//2-3.每月直接投入费用
|
|
|
Path path17_2_3 = FileUtil.mkdir(Paths.get(path17_2.toString(), "3.每月直接投入费用"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_2_3(path17_2_3, year);
|
|
|
+ generate17_2_3(path17_2_3, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//3.折旧费用与长期待摊费用
|
|
|
@@ -619,63 +624,64 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
Path path17_3_1 = FileUtil.mkdir(Paths.get(path17_3.toString(), "1.每月仪器设备工时打卡"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_3_1(path17_3_1, year);
|
|
|
+ generate17_3_1(path17_3_1, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//3-2.仪器设备折旧费用分配表
|
|
|
Path path17_3_2 = FileUtil.mkdir(Paths.get(path17_3.toString(), "2.仪器设备折旧费用分配表"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_3_2(path17_3_2, year);
|
|
|
+ generate17_3_2(path17_3_2, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//3-3.在用建筑物折旧费用分配表
|
|
|
Path path17_3_3 = FileUtil.mkdir(Paths.get(path17_3.toString(), "3.在用建筑物折旧费用分配表"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_3_3(path17_3_3, year);
|
|
|
+ generate17_3_3(path17_3_3, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//3-4.长期待摊费用分配表
|
|
|
Path path17_3_4 = FileUtil.mkdir(Paths.get(path17_3.toString(), "4.长期待摊费用分配表"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_3_4(path17_3_4, year);
|
|
|
+ generate17_3_4(path17_3_4, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//4.无形资产摊销费用
|
|
|
Path path17_4 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "4.无形资产摊销费用"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_4(path17_4, year);
|
|
|
+ generate17_4(path17_4, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//5和6.设计费用、装备调试费用与试验费用
|
|
|
Path path17_5 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "5和6.设计费用、装备调试费用与试验费用"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_5(path17_5, year);
|
|
|
+ generate17_5(path17_5, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//7.其他费用
|
|
|
Path path17_7 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "7.其他费用"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_7(path17_7, year);
|
|
|
+ generate17_7(path17_7, year, xmId);
|
|
|
}));
|
|
|
|
|
|
//8.委托外部研究开发费用
|
|
|
Path path17_8 = FileUtil.mkdir(Paths.get(xmmcPath.toString(), "8.委托外部研究开发费用"));
|
|
|
futureList.add(CompletableFuture.runAsync(() -> {
|
|
|
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
|
- generate17_8(path17_8, year);
|
|
|
+ generate17_8(path17_8, year, xmId);
|
|
|
}));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_8(Path path, String year) {
|
|
|
+ private void generate17_8(Path path, String year, Long xmId) {
|
|
|
XmWwxmCostQuery wwxmCost = new XmWwxmCostQuery();
|
|
|
+ wwxmCost.setXmId(xmId);
|
|
|
wwxmCost.setYearAndMonth(year);
|
|
|
List<XmWwxmCostVO> wwxmCostList = wwxmCostService.selectPage(Condition.getPage(new Query().setCurrent(1).setSize(Integer.MAX_VALUE)), wwxmCost).getRecords();
|
|
|
if (Func.isNotEmpty(wwxmCostList)) {
|
|
|
@@ -684,8 +690,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_7(Path path, String year) {
|
|
|
+ private void generate17_7(Path path, String year, Long xmId) {
|
|
|
XmOtherCostQuery otherCost = new XmOtherCostQuery();
|
|
|
+ otherCost.setXmId(xmId);
|
|
|
otherCost.setYearAndMonth(year);
|
|
|
List<XmOtherCostEntity> otherCostList = xmOtherCostService.selectPageByCondition(Condition.getPage(new Query().setCurrent(1).setSize(Integer.MAX_VALUE)), otherCost).getRecords();
|
|
|
if (Func.isNotEmpty(otherCostList)) {
|
|
|
@@ -694,8 +701,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_5(Path path, String year) {
|
|
|
+ private void generate17_5(Path path, String year, Long xmId) {
|
|
|
XmDesignCostQuery designCost = new XmDesignCostQuery();
|
|
|
+ designCost.setXmId(xmId);
|
|
|
designCost.setYearAndMonth(year);
|
|
|
List<XmDesignCostVO> designCostList = xmDesignCostService.selectXmDesignCostPage(Condition.getPage(new Query().setCurrent(1).setSize(Integer.MAX_VALUE)), designCost).getRecords();
|
|
|
if (Func.isNotEmpty(designCostList)) {
|
|
|
@@ -704,8 +712,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_4(Path path, String year) {
|
|
|
+ private void generate17_4(Path path, String year, Long xmId) {
|
|
|
XmAssetQueryParam wxzctxCost = new XmAssetQueryParam();
|
|
|
+ wxzctxCost.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
wxzctxCost.setYearAndMonth(year + month);
|
|
|
@@ -717,8 +726,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_3_4(Path path, String year) {
|
|
|
+ private void generate17_3_4(Path path, String year, Long xmId) {
|
|
|
XmCqdtfyDTO xmCqdtfyDTO = new XmCqdtfyDTO();
|
|
|
+ xmCqdtfyDTO.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
xmCqdtfyDTO.setYearAndMonth(year + month);
|
|
|
@@ -730,8 +740,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_3_3(Path path, String year) {
|
|
|
+ private void generate17_3_3(Path path, String year, Long xmId) {
|
|
|
XmAssetQueryParam jzwCost = new XmAssetQueryParam();
|
|
|
+ jzwCost.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
jzwCost.setYearAndMonth(year + month);
|
|
|
@@ -743,8 +754,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_3_2(Path path, String year) {
|
|
|
+ private void generate17_3_2(Path path, String year, Long xmId) {
|
|
|
XmAssetQueryParam yqsbCost = new XmAssetQueryParam();
|
|
|
+ yqsbCost.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
yqsbCost.setYearAndMonth(year + month);
|
|
|
@@ -756,8 +768,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_3_1(Path path, String year) {
|
|
|
+ private void generate17_3_1(Path path, String year, Long xmId) {
|
|
|
XmAssetHoursDto assetHoursDto = new XmAssetHoursDto();
|
|
|
+ assetHoursDto.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
assetHoursDto.setYearAndMonth(year + month);
|
|
|
@@ -769,8 +782,9 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generate17_2_3(Path path, String year) {
|
|
|
+ private void generate17_2_3(Path path, String year, Long xmId) {
|
|
|
XmDirectCostEntity xmDirectCost = new XmDirectCostEntity();
|
|
|
+ xmDirectCost.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
xmDirectCost.setYearAndMonth(year + month);
|
|
|
@@ -1281,14 +1295,17 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generateD17_1_1(Path path, String year) {
|
|
|
+ private void generateD17_1_1(Path path, String year, Long xmId) {
|
|
|
//1-1.每月研发人员工资
|
|
|
Path path1_1 = FileUtil.mkdir(Paths.get(path.toString(), "1.每月研发人员工资"));
|
|
|
SalaryDTO salaryDTO = new SalaryDTO();
|
|
|
+ salaryDTO.setXmId(xmId);
|
|
|
String month = null;
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
month = (i < 10 ? "0" + i : i + "");
|
|
|
- salaryDTO.setYearAndMonth(year + month);
|
|
|
+ String yearAndMonth = year + month;
|
|
|
+ salaryDTO.setYearAndMonth(yearAndMonth);
|
|
|
+ //查询项目参研人员的工资数据
|
|
|
List<SalaryVO> salaryList = salaryService.selectSalaryPage(Condition.getPage(new Query().setCurrent(1).setSize(Integer.MAX_VALUE)), salaryDTO).getRecords();
|
|
|
if (Func.isNotEmpty(salaryList)) {
|
|
|
salaryService.exportSalary(new FileOutputStream(path1_1 + "/" + year + "年" + month + "月研发人员工资.xlsx"), salaryList, salaryDTO.getYearAndMonth());
|
|
|
@@ -1297,10 +1314,11 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generateD17_1_2(Path path, String year) {
|
|
|
+ private void generateD17_1_2(Path path, String year, Long xmId) {
|
|
|
//1-2.每月研发人员出勤
|
|
|
Path path1_2 = FileUtil.mkdir(Paths.get(path.toString(), "2.每月研发人员出勤"));
|
|
|
AttendanceDto attendanceDto = new AttendanceDto();
|
|
|
+ attendanceDto.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
attendanceDto.setYearAndMonth(year + month);
|
|
|
@@ -1312,10 +1330,11 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generateD17_1_3(Path path, String year) {
|
|
|
+ private void generateD17_1_3(Path path, String year, Long xmId) {
|
|
|
//1-3.每月研发工时打卡
|
|
|
Path path1_3 = FileUtil.mkdir(Paths.get(path.toString(), "3.每月研发工时打卡"));
|
|
|
XmTechnicianHoursVO xmtechnicianHoursVO = new XmTechnicianHoursVO();
|
|
|
+ xmtechnicianHoursVO.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
xmtechnicianHoursVO.setYearAndMonth(year + month);
|
|
|
@@ -1327,10 +1346,11 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generateD17_1_4(Path path, String year) {
|
|
|
+ private void generateD17_1_4(Path path, String year, Long xmId) {
|
|
|
//1-4.人工费用分配表
|
|
|
Path path1_4 = FileUtil.mkdir(Paths.get(path.toString(), "4.人工费用分配表"));
|
|
|
XmTechnicianDto xmTechnicianDto = new XmTechnicianDto();
|
|
|
+ xmTechnicianDto.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
xmTechnicianDto.setYearAndMonth(year + month);
|
|
|
@@ -1342,9 +1362,10 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generateD17_2_1_1(Path path, String year) {
|
|
|
+ private void generateD17_2_1_1(Path path, String year, Long xmId) {
|
|
|
//2-1-1.每月领料燃料动力明细
|
|
|
XmGoodsDTO dto = new XmGoodsDTO();
|
|
|
+ dto.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
dto.setYearAndMonth(year + month);
|
|
|
@@ -1356,9 +1377,10 @@ public class ArchiveServiceImpl implements IArchiveService {
|
|
|
}
|
|
|
|
|
|
@SneakyThrows
|
|
|
- private void generateD17_2_2_1(Path path, String year) {
|
|
|
+ private void generateD17_2_2_1(Path path, String year, Long xmId) {
|
|
|
//2-2-1.每月租赁资产费用明细
|
|
|
XmLeaseEntity xmLease = new XmLeaseEntity();
|
|
|
+ xmLease.setXmId(xmId);
|
|
|
for (int i = 1; i <= 12; i++) {
|
|
|
String month = (i < 10 ? "0" + i : i + "");
|
|
|
xmLease.setYearAndMonth(year + month);
|
|
|
@@ -1374,8 +1396,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.setYearAndMonth(yearAndMonth);
|
|
|
+ param.setYearAndMonth(yearAndMonth);
|
|
|
param.setXmId(xmId);
|
|
|
List<JSONObject> leaseList = xmLeaseService.yanfazulinzichanfeiyongfenpeibiao(param);
|
|
|
if (Func.isEmpty(leaseList)) {
|