From 381255e593da84aac0ed5f2c884ef0c80ca642ca Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Wed, 15 Dec 2021 11:56:47 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayResearchProjectController.java | 17 +++++++--- .../PayWorkingGroupDataFileController.java | 21 +++++++----- ...kingGroupDistributionRecordController.java | 32 +++++++++++++---- .../mapper/PayResearchProjectMapper.java | 2 ++ .../service/IPayResearchProjectService.java | 1 + .../impl/PayResearchProjectServiceImpl.java | 2 ++ .../impl/PayWorkingGroupServiceImpl.java | 34 ++++++++++++++++--- 7 files changed, 84 insertions(+), 25 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java index 0dc64671..68493d84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.entity.PayResearchProject; @@ -126,16 +127,16 @@ public class PayResearchProjectController extends JeroController queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("project_name",payResearchProject.getProjectName()); - PayResearchProject one = payResearchProjectService.getOne(queryWrapper2); if(StringUtils.isNotBlank(payResearchProject.getFiles())){ String files = payResearchProject.getFiles(); List filesList = Arrays.asList(files.split(",")); for(String s:filesList){ + if(StringUtils.isBlank(s)){ + throw new JeroBootException("文件id不能为空!"); + } UUID uuid = UUID.randomUUID(); - payResearchProjectService.saveFile(uuid.toString(),s,one.getId()); - } + payResearchProjectService.saveFile(uuid.toString(),s,payResearchProject.getId()); + } } return Result.OK("新增成功!"); } @@ -167,6 +168,9 @@ public class PayResearchProjectController extends JeroController 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); @@ -182,6 +186,9 @@ public class PayResearchProjectController extends JeroController filesList = Arrays.asList(files.split(",")); for(String s:filesList){ + if(StringUtils.isBlank(s)){ + throw new JeroBootException("文件id不能为空!"); + } UUID uuid = UUID.randomUUID(); payResearchProjectService.saveFile(uuid.toString(),s,payResearchProject.getId()); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index b252be53..c67142e9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -62,7 +62,7 @@ public class PayWorkingGroupDataFileController extends JeroController pageList = payWorkingGroupDataFileService.queryPageList(page, payWorkingGroupDataFile); return Result.OK(pageList); } - + /** * 上传 * @@ -123,7 +124,8 @@ public class PayWorkingGroupDataFileController extends JeroController listData = new ArrayList<>(); @@ -245,13 +250,26 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< listData.add(payContactsManagement); }); } - }else{ + }else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE3){ + LambdaQueryWrapper queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); + queryPayCaseCommitteeSubitem.eq(PayCaseCouncilSubitem::getCouncilId,projectId); + List list = payCaseCouncilSubitemService.list(queryPayCaseCommitteeSubitem); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + PayContactsManagement payContactsManagement = new PayContactsManagement(); + payContactsManagement.setId(p.getContactsId()); + payContactsManagement.setName(p.getContactsName()); + listData.add(payContactsManagement); + }); + } + + }else { throw new JeroBootException("项目状态不正确！"); } return Result.OK(listData); } - + /** * 分发 * @@ -281,7 +299,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< payWorkingGroupDistributionRecordService.addBatch(payWorkingGroupDistributionRecord); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -295,7 +313,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< payWorkingGroupDistributionRecordService.updateById(payWorkingGroupDistributionRecord); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -309,7 +327,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< payWorkingGroupDistributionRecordService.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -323,7 +341,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< this.payWorkingGroupDistributionRecordService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } - + /** * 通过id查询 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java index d9c96e4f..e687e028 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java @@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.yaml.snakeyaml.scanner.Constant; +import java.util.List; + /** * @Description: pay_research_project * @Author: jeecg-boot diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java index c241ba5a..222e7589 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java @@ -8,6 +8,7 @@ import com.jero.project.entity.PayResearchProject; import com.baomidou.mybatisplus.extension.service.IService; import java.io.IOException; +import java.util.List; /** * @Description: pay_research_project diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java index af2489ce..89649775 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java @@ -32,6 +32,7 @@ import java.security.SecureRandom; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; +import java.util.List; /** * @Description: pay_research_project @@ -156,4 +157,5 @@ public class PayResearchProjectServiceImpl extends ServiceImpl queryPageList(Page page, PayWorkingGroup payWorkingGroup) { @@ -204,6 +210,26 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("working_group_id",payWorkingGroup.getId()); + List list = payResearchProjectService.list(queryWrapper); + if(ObjectUtils.isNotEmpty(list)){ + for(PayResearchProject payResearchProject:list){ + payResearchProject.setWorkingGroupId(payWorkingGroupOld.getId()); + payResearchProject.setId(null); + payResearchProjectService.save(payResearchProject); + //复制在研关联文件表 + if(StringUtils.isNotBlank(payResearchProject.getFiles())){ + String files = payResearchProject.getFiles(); + List filesList = Arrays.asList(files.split(",")); + for(String s:filesList){ + UUID uuid = UUID.randomUUID(); + payResearchProjectService.saveFile(uuid.toString(),s,payResearchProject.getId()); + } + } + } + } // 拷贝工作组成员 LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId());