update 更改企业名称时处理项目的单位名称（工作组项目完成）

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java

@@ -787,19 +787,69 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         }
 
         // 更新工作组
-        LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
+        QueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new QueryWrapper<>();
-        updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId());
+        queryPayWorkingGroupSubItem.eq("pwg.year",thisYear);
-        updatePayWorkingGroupSubItem.exists(" select 1 from pay_company_management_temporary where " +
+        queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId())
-                "pay_working_group_subitem.charge_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
+            .and(
-        updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName());
+                a -> {
-        payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
+                    a.eq(PayWorkingGroupSubItem::getPaidAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayWorkingGroupSubItem::getPaidAmount);
+                })
+        .and(
+                a -> {
+                    a.eq(PayWorkingGroupSubItem::getInvoiceAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayWorkingGroupSubItem::getInvoiceAmount);
+                })
+        .and(
+                a -> {
+                    a.eq(PayWorkingGroupSubItem::getConfirmAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayWorkingGroupSubItem::getConfirmAmount);
+                });
+        List<PayWorkingGroupSubItem> workingGroupSubItemList = payWorkingGroupSubItemService.queryList(queryPayWorkingGroupSubItem);
+        List<String> collect1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryId).collect(Collectors.toList());
+        companyTemporaryIdList.addAll(collect1);
+        if (!collect1.isEmpty()){
+            LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
+            updatePayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getChargeCompanyId,collect1);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName());
+            payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
+        }
+
         // 更新会员
-        LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
+        QueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new QueryWrapper<>();
-        updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId());
+        queryPayMemberProjectSubitem.eq("pmp.particular_year",thisYear);
-        updatePayMemberProjectSubitem.exists(" select 1 from pay_company_management_temporary where " +
+        queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId())
-                "pay_member_project_subitem.company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
+        .and(
-        updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName());
+                a -> {
-        memberProjectSubitemService.update(updatePayMemberProjectSubitem);
+                    a.eq(PayMemberProjectSubitem::getPaidAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayMemberProjectSubitem::getPaidAmount);
+                })
+        .and(
+                a -> {
+                    a.eq(PayMemberProjectSubitem::getInvoiceAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayMemberProjectSubitem::getInvoiceAmount);
+                })
+        .and(
+                a -> {
+                    a.eq(PayMemberProjectSubitem::getConfirmAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayMemberProjectSubitem::getConfirmAmount);
+                });
+        List<PayMemberProjectSubitem> payMemberProjectSubitems = memberProjectSubitemService.queryPageListCompany(queryPayMemberProjectSubitem);
+        List<String> collect2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList());
+        companyTemporaryIdList.addAll(collect2);
+        if (!collect2.isEmpty()){
+            LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
+            updatePayMemberProjectSubitem.in(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId());
+            updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName());
+            memberProjectSubitemService.update(updatePayMemberProjectSubitem);
+        }
+
 
         // 更新临时数据
         if (!companyTemporaryIdList.isEmpty()) {

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java

@@ -8,6 +8,8 @@ import com.jero.member.entity.PayMemberProjectSubitem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Description: 会员项目_subitem
  * @Author: jero-boot
@@ -18,5 +20,7 @@ public interface PayMemberProjectSubitemMapper extends BaseMapper<PayMemberProje
 
     IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<PayMemberProjectSubitem> queryWrapper);
 
+    List<PayMemberProjectSubitem> queryPageListCompany(@Param(Constants.WRAPPER) QueryWrapper<PayMemberProjectSubitem> queryWrapper);
+
     IPage<PayMemberProjectSubitem> getPage(Page<PayMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<PayMemberProjectSubitem> queryWrapper);
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java

@@ -70,6 +70,8 @@ public interface IPayMemberProjectSubitemService extends IService<PayMemberProje
 
     IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper);
 
+	List<PayMemberProjectSubitem> queryPageListCompany(QueryWrapper<PayMemberProjectSubitem> queryWrapper);
+
     IPage<PayMemberProjectSubitem> getPage(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper);
 
 	void check(String subitemId, String permission);

jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java

@@ -497,6 +497,11 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
         return baseMapper.queryPageListCompany(page,queryWrapper);
     }
 
+	@Override
+	public List<PayMemberProjectSubitem> queryPageListCompany(QueryWrapper<PayMemberProjectSubitem> queryWrapper) {
+		return baseMapper.queryPageListCompany(queryWrapper);
+	}
+
 	@Override
 	public IPage<PayMemberProjectSubitem> getPage(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper) {
 		return baseMapper.getPage(page, queryWrapper);

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java

@@ -1,6 +1,9 @@
 package com.jero.project.mapper;
 
+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.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.project.entity.PayWorkGroupSubletStatistics;
@@ -59,4 +62,6 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup
     AllMoney queryPageList233(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, @Param("id") String id);
 
     IPage<PayWorkingGroupSubItem> publishReminderList(Page<PayWorkingGroupSubItem> page, @Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem);
+
+    List<PayWorkingGroupSubItem> queryList(@Param(Constants.WRAPPER) QueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem);
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -346,4 +346,9 @@
         </where>
     </select>
 
+    <select id="queryList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
+        select pwgs.* from pay_working_group_subitem pwgs
+            left join pay_working_group pwg ON pwgs.working_group_id = pwg.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java

@@ -1,5 +1,7 @@
 package com.jero.project.service;
 
+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.baomidou.mybatisplus.extension.service.IService;
@@ -123,4 +125,6 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
     void setLabel(SetLabelVO setLabelVO);
 
     void deleteLabel(SetLabelVO setLabelVO);
+
+    List<PayWorkingGroupSubItem> queryList(QueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem);
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

@@ -2,6 +2,7 @@ package com.jero.project.service.impl;
 
 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;
@@ -1040,6 +1041,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         payWorkingGroupSubItemMapper.update(null, updateWrapper);
     }
 
+    @Override
+    public List<PayWorkingGroupSubItem> queryList(QueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem) {
+
+        return payWorkingGroupSubItemMapper.queryList(queryPayWorkingGroupSubItem);
+    }
+
     /**
      * @Description 删除项目打包关联，临时企业、联系信息
      * @Author  lqt