|
@@ -519,7 +519,7 @@ public class ArchivesAutoController extends BladeController {
|
|
@ApiOperationSupport(order = 13)
|
|
@ApiOperationSupport(order = 13)
|
|
@ApiOperation(value = "重新生成案卷", notes = "传入ids")
|
|
@ApiOperation(value = "重新生成案卷", notes = "传入ids")
|
|
@Transactional
|
|
@Transactional
|
|
- public R reCreateArchiveAuto(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
|
|
|
|
|
|
+ public R reCreateArchiveAuto(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,@ApiParam(value = "合并后的文件题目", required = true)String name){
|
|
//先查出勾选的案卷
|
|
//先查出勾选的案卷
|
|
List<ArchivesAuto> archivesAutoList=archivesAutoService.listByIds(Func.toLongList(ids));
|
|
List<ArchivesAuto> archivesAutoList=archivesAutoService.listByIds(Func.toLongList(ids));
|
|
if(archivesAutoList.size()<=1){
|
|
if(archivesAutoList.size()<=1){
|
|
@@ -542,8 +542,7 @@ public class ArchivesAutoController extends BladeController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
archiveFileClient.updateArchiveFile(updateArchiveFileList);
|
|
archiveFileClient.updateArchiveFile(updateArchiveFileList);
|
|
- //合并文件题名 暂时用第一个案卷的题目 以后用deepseek完成合并
|
|
|
|
-
|
|
|
|
|
|
+ auto.setName(name);
|
|
//删除其他案卷
|
|
//删除其他案卷
|
|
archivesAutoList.remove(auto);
|
|
archivesAutoList.remove(auto);
|
|
archivesAutoService.deleteLogic(archivesAutoList.stream().map(o->o.getId()).collect(Collectors.toList()));
|
|
archivesAutoService.deleteLogic(archivesAutoList.stream().map(o->o.getId()).collect(Collectors.toList()));
|