|
@@ -132,6 +132,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
idList.add(vo.getId());
|
|
idList.add(vo.getId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ List<SbInfoDTO> updateList = new ArrayList<>();
|
|
List<SbInfoDTO> addIdList = new ArrayList<>();
|
|
List<SbInfoDTO> addIdList = new ArrayList<>();
|
|
for (SbInfoDTO sbInfoDTO: sbInfoDTOS){
|
|
for (SbInfoDTO sbInfoDTO: sbInfoDTOS){
|
|
Boolean flag2 = false;
|
|
Boolean flag2 = false;
|
|
@@ -145,9 +146,20 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
if (!flag2){
|
|
if (!flag2){
|
|
addIdList.add(sbInfoDTO);
|
|
addIdList.add(sbInfoDTO);
|
|
}
|
|
}
|
|
|
|
+ if (flag2){
|
|
|
|
+ updateList.add(sbInfoDTO);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ for (SbInfoDTO sbInfoDTO:sbInfoDTOS){
|
|
|
|
+ SysFile sysFile = sysFileService.getModelById(sbInfoDTO.getSbUnusedDetailId());
|
|
|
|
+ sysFile.setName(sbInfoDTO.getSbFileList().get(0).getName());
|
|
|
|
+ sysFile.setUrl(sbInfoDTO.getSbFileList().get(0).getUrl());
|
|
|
|
+ sysFileService.modModelByPrimaryKey(sysFile);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
List<SbUnusedDetail> sbUnusedDetails = new ArrayList<>();
|
|
List<SbUnusedDetail> sbUnusedDetails = new ArrayList<>();
|
|
if (addIdList.size()>0) {
|
|
if (addIdList.size()>0) {
|
|
for (SbInfoDTO sbInfoDTO : addIdList) {
|
|
for (SbInfoDTO sbInfoDTO : addIdList) {
|
|
@@ -173,6 +185,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
sbUnusedDetailMapper.deleteByExample(weekend);
|
|
sbUnusedDetailMapper.deleteByExample(weekend);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
if (dto.getSaveFlag()){
|
|
if (dto.getSaveFlag()){
|
|
//修改并提交
|
|
//修改并提交
|
|
dto.setStatus(SbUnusedStatusEnum.verifying_one.getValue());
|
|
dto.setStatus(SbUnusedStatusEnum.verifying_one.getValue());
|