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

工作组变更

Browse Source
This commit is contained in:
梁琦涛
2022-04-24 10:10:03 +08:00
parent 913c636f23
commit 7530628975
2 changed files with 54 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+32 -54
View File
@@ -1,27 +1,12 @@
package com.jero.project.controller;
import java.io.*;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils;
import com.jero.company.entity.PayContactsManagement;
@@ -29,31 +14,36 @@ 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;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.DownloadFileRecord;
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.mybatis.logging.Logger;
import org.mybatis.logging.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/**
* @Description: 资料
@@ -66,14 +56,16 @@ import io.swagger.annotations.ApiOperation;
@RequestMapping("/project/payWorkingGroupDistributionRecord")
@Slf4j
public class PayWorkingGroupDistributionRecordController extends JeroController<PayWorkingGroupDistributionRecord, IPayWorkingGroupDistributionRecordService> {
@Autowired
private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
@Autowired
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
@Autowired
private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
@Resource
private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
@Resource
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Resource
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
@Resource
private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
@Resource
private IOSSFileService iossFileService;
@@ -215,29 +207,15 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
}
List<PayContactsManagement> listData = new ArrayList<>();
if(projectType == PayProjectCommon.PROJECT_TYPE_FILE1){
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,projectId);
List<PayWorkingGroupSubItem> list = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId);
List<PayWorkingGroupSubItemContacts> list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
if(!CollectionUtils.isEmpty(list)){
list.forEach(p->{
if(!StringUtils.isEmpty(p.getContactsIdOne()) && !StringUtils.isEmpty(p.getContactsTemporaryNameOne())){
PayContactsManagement payContactsManagement = new PayContactsManagement();
payContactsManagement.setId(p.getContactsTemporaryIdOne());
payContactsManagement.setName(p.getContactsTemporaryNameOne());
listData.add(payContactsManagement);
}
if(!StringUtils.isEmpty(p.getContactsIdTwo()) && !StringUtils.isEmpty(p.getContactsTemporaryNameTwo())){
PayContactsManagement payContactsManagement1 = new PayContactsManagement();
payContactsManagement1.setId(p.getContactsTemporaryIdTwo());
payContactsManagement1.setName(p.getContactsTemporaryNameTwo());
listData.add(payContactsManagement1);
}
if(!StringUtils.isEmpty(p.getContactsIdThree()) && !StringUtils.isEmpty(p.getContactsTemporaryNameThree())){
PayContactsManagement payContactsManagement2 = new PayContactsManagement();
payContactsManagement2.setId(p.getContactsTemporaryIdThree());
payContactsManagement2.setName(p.getContactsTemporaryNameThree());
listData.add(payContactsManagement2);
}
PayContactsManagement payContactsManagement = new PayContactsManagement();
payContactsManagement.setId(p.getContactsTemporaryId());
payContactsManagement.setName(p.getContactsTemporaryName());
listData.add(payContactsManagement);
});
}
}else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE2){
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+22 -53
View File
@@ -29,20 +29,15 @@ import com.jero.modules.oss.service.IOSSFileService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.*;
import com.jero.project.mapper.PayWorkingGroupDistributionRecordMapper;
import com.jero.project.service.IPayWorkingGroupDataFileService;
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.project.service.*;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.File;
import java.util.*;
@@ -83,10 +78,12 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
private PayWorkingGroupDistributionRecordMapper payWorkingGroupDistributionRecordMapper;
@Resource
private RolePermissionService rolePermissionService;
@Autowired
@Resource
private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
@Autowired
@Resource
private IPayCaseCouncilService payCaseCouncilService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
@Override
@Transactional
@@ -438,51 +435,23 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
}
private void setRecord(PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord,String[] s,List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord,OSSFile byId){
// 查询工作组成员一，二，三
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItem.nested(i ->i.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s)).or()
.in(PayWorkingGroupSubItem::getContactsTemporaryIdTwo,Arrays.asList(s)).or()
.in(PayWorkingGroupSubItem::getContactsTemporaryIdThree,Arrays.asList(s)));
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupDistributionRecord.getProjectId());
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
listPayWorkingGroupSubItem.forEach(p->{
if(!StringUtils.isEmpty(p.getContactsTemporaryIdOne()) && Arrays.asList(s).contains(p.getContactsTemporaryIdOne())){
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdOne());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameOne());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdOne());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}
if(!StringUtils.isEmpty(p.getContactsTemporaryIdTwo()) && Arrays.asList(s).contains(p.getContactsTemporaryIdTwo())){
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdTwo());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameTwo());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdTwo());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}
if(!StringUtils.isEmpty(p.getContactsTemporaryIdThree()) && Arrays.asList(s).contains(p.getContactsTemporaryIdThree())){
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdThree());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameThree());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdThree());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}
// 查询工作组成员
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,payWorkingGroupDistributionRecord.getProjectId());
queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getContactsTemporaryId,Arrays.asList(s));
List<PayWorkingGroupSubItemContacts> list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
if(!CollectionUtils.isEmpty(list)){
list.forEach(p->{
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getWorkingGroupSubId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryName());
payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryId());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
});
}
}