企业端我的普通项目接口，工作组接口添加
This commit is contained in:
梁琦涛
+9
-9
@@ -142,19 +142,19 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
if(Objects.isNull(sysUser)){
|
||||
return Result.error("没有查到用户信息！");
|
||||
}
|
||||
List<String> listUser = new ArrayList<>();
|
||||
List<String> listProjectIds = new ArrayList<>();
|
||||
// 项目的企业联系人
|
||||
LambdaQueryWrapper<PayCommonProject> queryPayCommonProject = new LambdaQueryWrapper<>();
|
||||
queryPayCommonProject.eq(PayCommonProject::getContactsId,sysUser.getId());
|
||||
List<PayCommonProject> listPayCommonProject = payCommonProjectService.list(queryPayCommonProject);
|
||||
if(!CollectionUtils.isEmpty(listPayCommonProject)){
|
||||
List<String> list = listPayCommonProject.stream().map(PayCommonProject::getId).collect(Collectors.toList());
|
||||
listUser.addAll(list);
|
||||
listProjectIds.addAll(list);
|
||||
}
|
||||
// 邮寄联系人
|
||||
LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
|
||||
queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
|
||||
List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
|
||||
// 邮寄联系人
|
||||
if(!CollectionUtils.isEmpty(listPayMailBill)){
|
||||
List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
|
||||
@@ -162,7 +162,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
|
||||
if(!CollectionUtils.isEmpty(listPayMailBillProject)){
|
||||
List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
|
||||
listUser.addAll(listProjectId);
|
||||
listProjectIds.addAll(listProjectId);
|
||||
}
|
||||
}
|
||||
// 打包的企业联系人和打包联系人
|
||||
@@ -178,7 +178,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
|
||||
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
|
||||
List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
|
||||
listUser.addAll(listId);
|
||||
listProjectIds.addAll(listId);
|
||||
}
|
||||
}
|
||||
// 关联合同的签订单位联系人
|
||||
@@ -193,13 +193,13 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
|
||||
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
|
||||
List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
|
||||
listUser.addAll(listProjectId);
|
||||
listProjectIds.addAll(listProjectId);
|
||||
}
|
||||
}
|
||||
listUser.stream().distinct();
|
||||
QueryWrapper<PayCommonProject> queryWrapper = QueryGenerator.initQueryWrapper(payCommonProject, req.getParameterMap());
|
||||
if(!CollectionUtils.isEmpty(listUser)){
|
||||
queryWrapper.in("id",listUser);
|
||||
if(!CollectionUtils.isEmpty(listProjectIds)){
|
||||
List<String> listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
|
||||
queryWrapper.in("id",listProjectIdsNew);
|
||||
}else{
|
||||
queryWrapper.in("id", Arrays.asList(""));
|
||||
}
|
||||
|
||||
-1
@@ -86,7 +86,6 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
|
||||
+18
-4
@@ -107,10 +107,24 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
|
||||
List<PayWorkingGroupSubItem> list = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
list.forEach(p->{
|
||||
PayContactsManagement payContactsManagement = new PayContactsManagement();
|
||||
payContactsManagement.setId(p.getContactsTemporaryIdOne());
|
||||
payContactsManagement.setName(p.getContactsTemporaryNameOne());
|
||||
listData.add(payContactsManagement);
|
||||
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);
|
||||
}
|
||||
});
|
||||
}
|
||||
}else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
|
||||
+124
-1
@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.dto.SendMessageDTO;
|
||||
@@ -13,16 +14,31 @@ import com.jero.common.enums.CompanyMessageEnums;
|
||||
import com.jero.common.service.ProjectDetailService;
|
||||
import com.jero.common.service.SendMessageService;
|
||||
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.PasswordUtil;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.common.vo.ProjectDetailVO;
|
||||
import com.jero.contract.entity.PayIncomeContract;
|
||||
import com.jero.contract.entity.PayIncomeContractAssociated;
|
||||
import com.jero.contract.service.IPayIncomeContractAssociatedService;
|
||||
import com.jero.contract.service.IPayIncomeContractService;
|
||||
import com.jero.mail.entity.PayMailBill;
|
||||
import com.jero.mail.entity.PayMailBillProject;
|
||||
import com.jero.mail.service.IPayMailBillProjectService;
|
||||
import com.jero.mail.service.IPayMailBillService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.pack.entity.PayPackCompany;
|
||||
import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.pack.service.IPayPackCompanyService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.*;
|
||||
import com.jero.project.service.IPayWorkingGroupService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.project.vo.PayWorkingGroupVO;
|
||||
import com.jero.project.vo.SetChargeInput;
|
||||
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
||||
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
|
||||
@@ -56,6 +72,18 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
|
||||
private IPayWorkingGroupService payWorkingGroupService;
|
||||
@Resource
|
||||
private SendMessageService sendMessageService;
|
||||
@Resource
|
||||
private IPayIncomeContractService payIncomeContractService;
|
||||
@Resource
|
||||
private IPayPackCompanyProjectService payPackCompanyProjectService;
|
||||
@Resource
|
||||
private IPayMailBillService payMailBillService;
|
||||
@Resource
|
||||
private IPayPackCompanyService payPackCompanyService;
|
||||
@Resource
|
||||
private IPayMailBillProjectService payMailBillProjectService;
|
||||
@Resource
|
||||
private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -95,7 +123,102 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 企业端-工作组项目-分页列表查询
|
||||
* 工作组的企业联系人1，2，3、邮寄联系人、打包的企业联系人、打包联系人、关联合同的签订单位联系人
|
||||
* @param payWorkingGroupSubItem 工作组项目成员
|
||||
* @param pageNo 页数
|
||||
* @param pageSize 条数
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="工作组项目-工作组项目-分页列表查询", notes="工作组项目-工作组项目-分页列表查询")
|
||||
@GetMapping(value = "/queryCompanyPageList")
|
||||
public Result<?> queryCompanyPageList(PayWorkingGroupSubItem payWorkingGroupSubItem,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if(Objects.isNull(sysUser)){
|
||||
return Result.error("没有查到用户信息！");
|
||||
}
|
||||
List<String> listProjectIds = new ArrayList<>();
|
||||
// 工作组的企业联系人1，2，3
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,sysUser.getId()).or()
|
||||
.eq(PayWorkingGroupSubItem::getContactsIdTwo,sysUser.getId()).or()
|
||||
.eq(PayWorkingGroupSubItem::getContactsIdThree,sysUser.getId());
|
||||
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
|
||||
List<String> listProjectId = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList());
|
||||
listProjectIds.addAll(listProjectId);
|
||||
}
|
||||
// 邮寄联系人
|
||||
LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
|
||||
queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
|
||||
List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
|
||||
if(!CollectionUtils.isEmpty(listPayMailBill)){
|
||||
List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
|
||||
queryPayMailBillProject.in(PayMailBillProject::getBillId,listId);
|
||||
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
|
||||
if(!CollectionUtils.isEmpty(listPayMailBillProject)){
|
||||
List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
|
||||
listProjectIds.addAll(listProjectId);
|
||||
}
|
||||
}
|
||||
// 打包的企业联系人和打包联系人
|
||||
LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
|
||||
queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or()
|
||||
.eq(PayPackCompany::getPackContactId,sysUser.getId());
|
||||
List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
|
||||
if(!CollectionUtils.isEmpty(listPayPackCompany)){
|
||||
List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
|
||||
queryPayPackCompanyProject.in(PayPackCompanyProject::getProjectId,listPayPackCompanyId);
|
||||
queryPayPackCompanyProject.eq(PayPackCompanyProject::getCome,PayProjectCommon.PROJECT_TYPE1);
|
||||
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
|
||||
if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
|
||||
List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
|
||||
listProjectIds.addAll(listId);
|
||||
}
|
||||
}
|
||||
// 关联合同的签订单位联系人
|
||||
LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
|
||||
queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId());
|
||||
List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
|
||||
if(!CollectionUtils.isEmpty(listPayIncomeContract)){
|
||||
List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
|
||||
queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId,listId);
|
||||
queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
|
||||
List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
|
||||
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
|
||||
List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
|
||||
listProjectIds.addAll(listProjectId);
|
||||
}
|
||||
}
|
||||
List<String> listProjectIdsNew = new ArrayList<>();
|
||||
if(!CollectionUtils.isEmpty(listProjectIds)){
|
||||
listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
|
||||
}else{
|
||||
listProjectIdsNew.add("");
|
||||
}
|
||||
Page<PayWorkingGroupSubItem> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listProjectIdsNew);
|
||||
if(!CollectionUtils.isEmpty(pageList.getRecords())){
|
||||
List<PayWorkingGroupSubItem> list = pageList.getRecords();
|
||||
list.forEach(p->{
|
||||
if(Objects.isNull(p.getReceivableAmount())){
|
||||
p.setReceivableAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
if(Objects.isNull(p.getPaidAmount())){
|
||||
p.setPaidAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
});
|
||||
pageList.setRecords(list);
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
|
||||
+9
@@ -46,4 +46,13 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup
|
||||
|
||||
List<PayWorkGroupSubletStatistics> queryPageList2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id") String id);
|
||||
|
||||
/**
|
||||
* @Description 企业端-我的工作组分页查询
|
||||
* @Author lqt
|
||||
* @Date 2021/9/29
|
||||
* @Param listProjectIds 项目成员id集合
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listProjectIds") List<String> listProjectIds);
|
||||
}
|
||||
|
||||
+22
@@ -127,5 +127,27 @@
|
||||
GROUP BY pwg.principal_id_a) pwg2 on (pwg2.principalId=pwg1.principalId)
|
||||
order by pwg1.create_time
|
||||
</select>
|
||||
<select id="queryCompanyPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
|
||||
select pwgs.*,pwg.working_group_project as chargeProject from pay_working_group_subitem pwgs
|
||||
left join pay_working_group pwg ON pwgs.working_group_id = pwg.id
|
||||
<where>
|
||||
<if test="payWorkingGroupSubItem.chargeProject != null and payWorkingGroupSubItem.chargeProject != ''">
|
||||
AND pwg.working_group_project like concat('%',concat(#{payWorkingGroupSubItem.chargeProject},'%'))
|
||||
</if>
|
||||
<if test="payWorkingGroupSubItem.pack != null and payWorkingGroupSubItem.pack != ''">
|
||||
AND pwg.pack = #{payWorkingGroupSubItem.pack}
|
||||
</if>
|
||||
<if test="payWorkingGroupSubItem.needInvoice != null and payWorkingGroupSubItem.needInvoice != ''">
|
||||
AND pwg.need_invoice = #{payWorkingGroupSubItem.needInvoice}
|
||||
</if>
|
||||
<if test="listProjectIds != null and listProjectIds.size() > 0">
|
||||
pwgs.id in
|
||||
<foreach collection="listProjectIds" index="index" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</where>
|
||||
group by pwgs.id order by pwgs.create_time desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
+9
@@ -98,5 +98,14 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
|
||||
* @Exception
|
||||
*/
|
||||
void deleteBatch(String ids);
|
||||
/**
|
||||
* @Description 企业端-我的工作组分页查询
|
||||
* @Author lqt
|
||||
* @Date 2021/9/29
|
||||
* @Param listProjectIds 项目成员id集合
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,PayWorkingGroupSubItem payWorkingGroupSubItem,List<String> listProjectIds);
|
||||
|
||||
}
|
||||
|
||||
+50
-35
@@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
import javax.annotation.Resource;
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_distribution_record
|
||||
@@ -106,27 +107,10 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
String msg = "";
|
||||
List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = new ArrayList<>();
|
||||
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
|
||||
setRecord( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId);
|
||||
LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
|
||||
queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
|
||||
List<PayContactsManagementTemporary> listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary);
|
||||
// 查询工作组成员
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s));
|
||||
queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupDistributionRecord.getProjectId());
|
||||
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
|
||||
listPayWorkingGroupSubItem.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.getId());
|
||||
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdOne());
|
||||
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameOne());
|
||||
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
|
||||
});
|
||||
}
|
||||
if(!CollectionUtils.isEmpty(listContacts)){
|
||||
list = listContacts;
|
||||
}
|
||||
@@ -236,23 +220,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
// 文件路径
|
||||
String url = byId.getUrl();
|
||||
listFile.add(path + url);
|
||||
// 查询工作组成员
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s));
|
||||
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
|
||||
listPayWorkingGroupSubItem.forEach(p1->{
|
||||
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
|
||||
payWorkingGroupDistributionRecordNew.setDataId(p.getId());
|
||||
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
|
||||
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
|
||||
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
|
||||
payWorkingGroupDistributionRecordNew.setSubId(p1.getId());
|
||||
payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsIdOne());
|
||||
payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsTemporaryNameOne());
|
||||
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
|
||||
});
|
||||
}
|
||||
setRecord( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId);
|
||||
});
|
||||
LambdaQueryWrapper<PayContactsManagementTemporary> queryPayContactsManagementTemporary = new LambdaQueryWrapper<>();
|
||||
queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s));
|
||||
@@ -341,4 +309,51 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
public IPage<DownloadFileRecord> pageFileList(Page<DownloadFileRecord> page, String fileName) {
|
||||
return payWorkingGroupDistributionRecordMapper.pageFileList(page,fileName);
|
||||
}
|
||||
|
||||
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());
|
||||
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());
|
||||
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());
|
||||
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+6
-14
@@ -4,16 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
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.common.ProjectCommon;
|
||||
import com.jero.common.common.RoleCommon;
|
||||
import com.jero.common.dto.SendMessageDTO;
|
||||
import com.jero.common.enums.CompanyMessageEnums;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.service.ContractCreateProjectSendMessageService;
|
||||
import com.jero.common.service.ProjectDetailService;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.common.vo.ProjectStatusVO;
|
||||
import com.jero.company.entity.PayCompanyManagement;
|
||||
@@ -21,12 +15,9 @@ import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayCompanyManagementService;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.contract.entity.PayIncomeContract;
|
||||
import com.jero.contract.entity.PayIncomeContractAssociated;
|
||||
import com.jero.contract.service.IPayIncomeContractAssociatedService;
|
||||
import com.jero.contract.service.IPayIncomeContractService;
|
||||
import com.jero.meeting.entity.PayMeetingRemindRecord;
|
||||
import com.jero.meeting.service.IPayMeetingRemindRecordService;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
@@ -35,8 +26,6 @@ import com.jero.project.service.IPayWorkingGroupService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
|
||||
import com.jero.project.vo.SetChargeInput;
|
||||
import com.jero.statistics.entity.AllProjectStatistics;
|
||||
import com.jero.statistics.entity.AllProjectStatisticsSearch;
|
||||
import com.jero.temporary.entity.PayCompanyManagementTemporary;
|
||||
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
||||
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
|
||||
@@ -44,18 +33,15 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.IOException;
|
||||
@@ -561,6 +547,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
|
||||
}
|
||||
payWorkingGroupSubItemService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubItem, List<String> listProjectIds) {
|
||||
return payWorkingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem, listProjectIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Description 删除项目打包关联，临时企业、联系信息
|
||||
* @Author lqt
|
||||
|
||||
Reference in New Issue
Block a user