|
|
@@ -304,7 +304,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
archivesAuto.setEndDate(LocalDateTime.parse(endDate));//文件结束时间
|
|
|
archivesAuto.setStorageTime(node.getStorageTime());//保管期限 从节点规格获取
|
|
|
archivesAuto.setSecretLevel("");//保密级别 没地方设置 暂留
|
|
|
- //archivesAuto.setCarrierType();//载体类型
|
|
|
+ //载体类型
|
|
|
+ if (node.getStorageType()!= null){
|
|
|
+ archivesAuto.setCarrierType(node.getStorageType().toString());
|
|
|
+ }
|
|
|
//archivesAuto.setKeywords();//主题词
|
|
|
//archivesAuto.setStorageLocation();//存放位置
|
|
|
archivesAuto.setIsArchive(1);//已归档
|
|
|
@@ -751,7 +754,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
*/
|
|
|
public List<ArchivesAuto> findArchivesAutosByIds(List<Long> ids) {
|
|
|
QueryWrapper<ArchivesAuto> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.in("id", ids)
|
|
|
+ queryWrapper.in("node_id", ids)
|
|
|
.orderByDesc("tree_sort")
|
|
|
.orderByAsc("auto_file_sort");
|
|
|
|
qianxb