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

add:复制

Browse Source
This commit is contained in:
zhangqinlin
2021-12-15 11:56:47 +08:00
parent fa0dc4b3c5
commit 381255e593
7 changed files with 84 additions and 25 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
+12 -5
View File
@@ -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<PayResearchProj
return Result.error("项目名称已存在");
}
payResearchProjectService.save(payResearchProject);
QueryWrapper<PayResearchProject> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("project_name",payResearchProject.getProjectName());
PayResearchProject one = payResearchProjectService.getOne(queryWrapper2);
if(StringUtils.isNotBlank(payResearchProject.getFiles())){
String files = payResearchProject.getFiles();
List<String> 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<PayResearchProj
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);
@@ -182,6 +186,9 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
String files = payResearchProject.getFiles();
List<String> 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());
}
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
+12 -9
View File
@@ -62,7 +62,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
private IPayWorkingGroupService payWorkingGroupService;
@Value("${jero.path.upload}")
private String upLoadPath;
/**
* 分页列表查询
*
@@ -83,7 +83,8 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
return Result.error("工作组id不能为空！");
}
if(payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE3){
return Result.error("项目状态不正确！");
}
@@ -107,7 +108,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
IPage<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.queryPageList(page, payWorkingGroupDataFile);
return Result.OK(pageList);
}
/**
* 上传
*
@@ -123,7 +124,8 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
return Result.error("项目id不能为空!");
}
if(payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE1
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE3){
return Result.error("项目状态不正确！");
}
if(StringUtils.isBlank(payWorkingGroupDataFile.getFileIds())){
@@ -146,7 +148,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
}
return Result.OK("上传成功！");
}
/**
* 编辑
*
@@ -163,7 +165,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
payWorkingGroupDataFileService.updateById(payWorkingGroupDataFile);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
@@ -198,7 +200,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
payWorkingGroupDataFileService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@@ -239,7 +241,7 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
this.payWorkingGroupDataFileService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
@@ -285,7 +287,8 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
throw new JeroBootException("项目id不能为空!");
}
if(!Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)
&& !Objects.equals(payWorkingGroupDataFile.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)){
throw new JeroBootException("项目状态不正确！");
}
if(payWorkingGroupDataFile.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+25 -7
View File
@@ -26,7 +26,9 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils;
import com.jero.company.entity.PayContactsManagement;
import com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.entity.PayCaseCouncilSubitem;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.data.service.IPayCaseCouncilSubitemService;
import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -70,6 +72,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
@Autowired
private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
@Resource
private IOSSFileService iossFileService;
@@ -203,7 +207,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
throw new JeroBootException("项目id不能为空!");
}
if(projectType != PayProjectCommon.PROJECT_TYPE_FILE1
&& projectType != PayProjectCommon.PROJECT_TYPE_FILE2){
&& projectType != PayProjectCommon.PROJECT_TYPE_FILE2
&& projectType != PayProjectCommon.PROJECT_TYPE_FILE3){
return Result.error("项目状态不正确！");
}
List<PayContactsManagement> listData = new ArrayList<>();
@@ -245,13 +250,26 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
listData.add(payContactsManagement);
});
}
}else{
}else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE3){
LambdaQueryWrapper<PayCaseCouncilSubitem> queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>();
queryPayCaseCommitteeSubitem.eq(PayCaseCouncilSubitem::getCouncilId,projectId);
List<PayCaseCouncilSubitem> 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查询
*
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayResearchProjectMapper.java
+2
View File
@@ -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
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayResearchProjectService.java
+1
View File
@@ -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
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java
+2
View File
@@ -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<PayResearchProjec
public void deleteFile(String id) {
payResearchProjectMapper.deleteFile(id);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+30 -4
View File
@@ -3,6 +3,7 @@ package com.jero.project.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,10 +14,12 @@ import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.*;
import com.jero.project.service.IPayResearchProjectService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.project.vo.PayWorkingGroupVO;
import com.jero.project.service.IPayWorkingGroupService;
@@ -27,8 +30,10 @@ import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,10 +41,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -69,6 +71,10 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
@Resource
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
@Resource
private IPayResearchProjectService payResearchProjectService;
@Resource
private IOSSFileService iossFileService;
@Override
public IPage<PayWorkingGroupVO> queryPageList(Page<PayWorkingGroupVO> page, PayWorkingGroup payWorkingGroup) {
@@ -204,6 +210,26 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
payWorkingGroupOld.setUpdateTime(null);
setPayWorkingGroup(payWorkingGroupOld);
payWorkingGroupService.save(payWorkingGroupOld);
//拷贝在研项目
QueryWrapper<PayResearchProject> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("working_group_id",payWorkingGroup.getId());
List<PayResearchProject> 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<String> filesList = Arrays.asList(files.split(","));
for(String s:filesList){
UUID uuid = UUID.randomUUID();
payResearchProjectService.saveFile(uuid.toString(),s,payResearchProject.getId());
}
}
}
}
// 拷贝工作组成员
LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
query.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId());