LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:bug

Browse Source
This commit is contained in:
zhangqinlin
2021-12-23 11:18:32 +08:00
parent 5388af9fb6
commit d96220c654
9 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java
+24 -23
View File
@@ -68,7 +68,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
if(StringUtils.isNotBlank(payResearchProject.getProjectName())){
queryWrapper.like("project_name",payResearchProject.getProjectName());
}
Page<PayResearchProject> page = new Page<PayResearchProject>(pageNo, pageSize);
Page<PayResearchProject> page = new Page<>(pageNo, pageSize);
IPage<PayResearchProject> pageList = payResearchProjectService.pageList(page, queryWrapper);
return Result.OK(pageList);
}
@@ -121,6 +121,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayResearchProject payResearchProject) {
QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("working_group_id",payResearchProject.getWorkingGroupId());
queryWrapper.eq("project_name",payResearchProject.getProjectName());
int count = payResearchProjectService.count(queryWrapper);
if (count>0) {
@@ -154,33 +155,33 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
public Result<?> edit(@RequestBody PayResearchProject payResearchProject) {
QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_name",payResearchProject.getProjectName());
queryWrapper.ne("id",payResearchProject.getId());
queryWrapper.eq("id",payResearchProject.getId());
int count = payResearchProjectService.count(queryWrapper);
if (count>0) {
if (count>1) {
return Result.error("项目名称已存在");
}
//删除关联文件表
payResearchProjectService.deleteFile(payResearchProject.getId());
//删除文件表
PayResearchProject byId = payResearchProjectService.getById(payResearchProject.getId());
if(StringUtils.isNotBlank(byId.getFiles())){
List<String> filesList = Arrays.asList(byId.getFiles().split(","));
if(StringUtils.isNotBlank(payResearchProject.getFiles())) {
List<String> newFilesList = Arrays.asList(payResearchProject.getFiles().split(","));
for(String s:filesList){
if(StringUtils.isBlank(s)){
throw new JeroBootException("文件id不能为空!");
}
//旧文件包含在新文件中则不删除
if(!newFilesList.contains(s)){
iossFileService.removeById(s);
}
}
}else {
//新文件为空则全部删除旧文件
iossFileService.removeByIds(filesList);
}
}
// //删除文件表
// PayResearchProject byId = payResearchProjectService.getById(payResearchProject.getId());
// if(StringUtils.isNotBlank(byId.getFiles())){
// List<String> filesList = Arrays.asList(byId.getFiles().split(","));
// if(StringUtils.isNotBlank(payResearchProject.getFiles())) {
// List<String> newFilesList = Arrays.asList(payResearchProject.getFiles().split(","));
// for(String s:filesList){
// if(StringUtils.isBlank(s)){
// throw new JeroBootException("文件id不能为空!");
// }
// //旧文件包含在新文件中则不删除
// if(!newFilesList.contains(s)){
// iossFileService.removeById(s);
// }
// }
// }else {
// //新文件为空则全部删除旧文件
// iossFileService.removeByIds(filesList);
// }
// }
//重新加入关系表
if(StringUtils.isNotBlank(payResearchProject.getFiles())){
String files = payResearchProject.getFiles();