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

fix 87908 所有会议--未封锁的列表的企业单位没更新

Browse Source 
87913 打包管理-封锁更新逻辑做反了
This commit is contained in:
lijiarao
2024-07-31 18:14:44 +08:00
parent 511dcaa46c
commit 55ebacca4a
5 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+41 -16
View File
@@ -32,6 +32,9 @@ import com.jero.company.vo.CompanyOrContactsCount;
import com.jero.company.vo.UpdateInvoicePram;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.mapper.PayMeetingSituationMapper;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.jero.member.mapper.TbMemberProjectSubitemMapper;
@@ -40,6 +43,7 @@ import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.entity.PayPackCompany;
import com.jero.pack.mapper.PayPackCompanyMapper;
import com.jero.pack.service.IPayPackCompanyService;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -103,7 +107,15 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
@Resource
private AnnualDataLockingService annualDataLockingService;
@Resource
private IPayMeetingSituationService meetingSituationService;
@Resource
private PayMeetingSituationMapper meetingSituationMapper;
@Resource
private PayPackCompanyMapper packCompanyMapper;
@Resource
private IPayPackCompanyService packCompanyService;
@Override
public void addMeeting(PayCompanyManagement payCompanyManagement) {
if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
@@ -752,10 +764,10 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
* @Exception
*/
private void updateBatchData(PayCompanyManagement payCompanyManagement){
String companyManagementId = payCompanyManagement.getId();
//更新人员
LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getCompanyId,payCompanyManagement.getId());
updatePayContactsManagement.eq(PayContactsManagement::getCompanyId, companyManagementId);
updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payCompanyManagement.getCompanyName());
payContactsManagementService.update(updatePayContactsManagement);
List<String> allYear = annualDataLockingService.getAllYear();
@@ -763,7 +775,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
List<String> companyTemporaryIdList = new ArrayList<>();
// 更新普通项目
LambdaQueryWrapper<PayCommonProject> quaryPayCommonProject = new LambdaQueryWrapper<>();
quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId());
quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId, companyManagementId);
quaryPayCommonProject.notIn(PayCommonProject::getYear,allYear);
@@ -781,7 +793,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
// 更新工作组
QueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new QueryWrapper<>();
queryPayWorkingGroupSubItem.notIn("pwg.year",allYear);
queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId());
queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId, companyManagementId);
List<PayWorkingGroupSubItem> workingGroupSubItemList = payWorkingGroupSubItemService.queryList(queryPayWorkingGroupSubItem);
List<String> collect1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryId).collect(Collectors.toList());
@@ -793,11 +805,21 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName());
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
}
//会议项目
List<PayMeetingSituation> meetingSituations = meetingSituationMapper.listByYearNotIn(allYear,companyManagementId);
List<String> collect4 = meetingSituations.stream().map(PayMeetingSituation::getCompanyTemporaryId).collect(Collectors.toList());
List<String> idList4 = meetingSituations.stream().map(PayMeetingSituation::getId).collect(Collectors.toList());
companyTemporaryIdList.addAll(collect4);
if (!idList4.isEmpty()){
LambdaUpdateWrapper<PayMeetingSituation> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(PayMeetingSituation::getId,idList4);
updateWrapper.set(PayMeetingSituation::getCompanyName,payCompanyManagement.getCompanyName());
meetingSituationService.update(updateWrapper);
}
// 更新会员
QueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new QueryWrapper<>();
queryPayMemberProjectSubitem.notIn("pmp.particular_year",allYear) ;
queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId());
queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId, companyManagementId);
List<PayMemberProjectSubitem> payMemberProjectSubitems = memberProjectSubitemService.queryPageListCompany(queryPayMemberProjectSubitem);
List<String> collect2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList());
@@ -812,7 +834,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
// 更新标协会员
QueryWrapper<TbMemberProjectSubitem> queryTbMemberProjectSubitem = new QueryWrapper<>();
queryTbMemberProjectSubitem.notIn("tmp.year",allYear);
queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId,payCompanyManagement.getId());
queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId, companyManagementId);
List<TbMemberProjectSubitem> tbMemberProjectSubitems = tbMemberProjectSubitemMapper.queryListCompanyYear(queryTbMemberProjectSubitem);
List<String> collect3 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList());
@@ -824,6 +846,17 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
updateWrapper.set(TbMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName());
tbMemberProjectSubitemService.update(updateWrapper);
}
//打包项目
List<PayPackCompany> packCompanyList = packCompanyMapper.listByYearNotIn(allYear,companyManagementId);
List<String> collect5 = packCompanyList.stream().map(PayPackCompany::getCompanyTemporaryId).collect(Collectors.toList());
List<String> idList6 = packCompanyList.stream().map(PayPackCompany::getId).collect(Collectors.toList());
companyTemporaryIdList.addAll(collect5);
if (!idList6.isEmpty()){
LambdaUpdateWrapper<PayPackCompany> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(PayPackCompany::getId,idList6);
updateWrapper.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName());
packCompanyService.update(updateWrapper);
}
// 更新临时数据
if (!companyTemporaryIdList.isEmpty()) {
LambdaUpdateWrapper<PayCompanyManagementTemporary> updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>();
@@ -846,19 +879,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
// 更新合同
LambdaUpdateWrapper<PayIncomeContract> updatePayIncomeContract = new LambdaUpdateWrapper<>();
updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,payCompanyManagement.getId());
updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId, companyManagementId);
//updatePayIncomeContract.ge(PayIncomeContract::getCreateTime,payCompanyManagement.getEditTime());
updatePayIncomeContract.exists(" select 1 from pay_company_management_temporary where " +
"pay_income_contract.signed_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
updatePayIncomeContract.set(PayIncomeContract::getSignedCompanyTemporaryName,payCompanyManagement.getCompanyName());
payIncomeContractService.update(updatePayIncomeContract);
// 更新打包
LambdaUpdateWrapper<PayPackCompany> updatePayPackCompany = new LambdaUpdateWrapper<>();
updatePayPackCompany.eq(PayPackCompany::getCompanyId,payCompanyManagement.getId());
//updatePayPackCompany.ge(PayPackCompany::getCreateTime,payCompanyManagement.getEditTime());
updatePayPackCompany.exists(" select 1 from pay_company_management_temporary where " +
"pay_pack_company.company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
updatePayPackCompany.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName());
payPackCompanyService.update(updatePayPackCompany);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
+8
View File
@@ -45,4 +45,12 @@ public interface PayMeetingSituationMapper extends BaseMapper<PayMeetingSituatio
*/
List<PayMeetingSituation> listByYear(@Param("year")String year);
/**
* 根据年份获取参会人
*
* @param yearList 年份
* @param companyManagementId
*/
List<PayMeetingSituation> listByYearNotIn(@Param("yearList") List<String> yearList, @Param("companyManagementId") String companyManagementId);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
+15
View File
@@ -259,4 +259,19 @@
meeting_id in (select id from pay_meeting where particular_year = #{year})
</where>
</select>
<select id="listByYearNotIn" resultType="com.jero.meeting.entity.PayMeetingSituation">
select
*
from pay_meeting_situation
<where>
company_id = #{companyManagementId}
and meeting_id in (
select id from pay_meeting where particular_year not in
<foreach item="item" index="index" collection="yearList" open="(" separator="," close=")">
#{item}
</foreach>
)
</where>
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java
+2 -1
View File
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.pack.entity.PayPackCompany;
import com.jero.pack.vo.PayPackCompanyProjectInput;
import com.jero.project.entity.PayCommonProject;
import org.apache.ibatis.annotations.Param;
@@ -58,4 +57,6 @@ public interface PayPackCompanyMapper extends BaseMapper<PayPackCompany> {
String getComeAllMoney(@Param("payPackCompany") PayPackCompany payPackCompany);
List<PayPackCompany> listByYear(@Param("year") String year);
List<PayPackCompany> listByYearNotIn(@Param("yearList") List<String> yearList, @Param("companyManagementId") String companyManagementId);
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+10
View File
@@ -113,4 +113,14 @@
select * from pay_pack_company
where pack_year = #{year}
</select>
<select id="listByYearNotIn" resultType="com.jero.pack.entity.PayPackCompany">
select * from pay_pack_company
where
company_id = #{companyManagementId}
and pack_year not in
<foreach item="item" index="index" collection="yearList" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper>