From a3b6668eb3d3911908ad6ee34fba10d1f9f3220e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 2 Mar 2023 10:47:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=A1=AE=E8=AE=A4=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=90=8E=E6=9C=89=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayCompanyManagementServiceImpl.java | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
index 0226b16c..72137ffe 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.company.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -668,8 +669,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getDataSource,payCompanyManagement.getDataSource());
         updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getRemarks,payCompanyManagement.getRemarks());
         updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getEditTime,payCompanyManagement.getEditTime());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCreateBy,payCompanyManagement.getCreateBy());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCreateTime,payCompanyManagement.getCreateTime());
+        //updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCreateBy,payCompanyManagement.getCreateBy());
+        //updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCreateTime,payCompanyManagement.getCreateTime());
         updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateBy,payCompanyManagement.getUpdateBy());
         updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateTime,payCompanyManagement.getUpdateTime());
         payCompanyManagementTemporaryService.update(updatePayCompanyManagementTemporary);
@@ -681,31 +682,41 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         // 更新普通项目
         LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
         updatePayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId());
-        updatePayCommonProject.ge(PayCommonProject::getCreateTime,payCompanyManagement.getEditTime());
+        //updatePayCommonProject.ge(PayCommonProject::getCreateTime,payCompanyManagement.getEditTime());
         updatePayCommonProject.set(PayCommonProject::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName());
+        updatePayCommonProject.exists(" select 1 from pay_company_management_temporary where " +
+                "pay_common_project.charge_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
         payCommonProjectService.update(updatePayCommonProject);
         // 更新工作组
         LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
         updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId());
-        updatePayWorkingGroupSubItem.ge(PayWorkingGroupSubItem::getCreateTime,payCompanyManagement.getEditTime());
+        //updatePayWorkingGroupSubItem.ge(PayWorkingGroupSubItem::getCreateTime,payCompanyManagement.getEditTime());
+        updatePayWorkingGroupSubItem.exists(" select 1 from pay_company_management_temporary where " +
+                "pay_working_group_subitem.charge_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
         updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName());
         payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
         // 更新会员
         LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
         updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId());
-        updatePayMemberProjectSubitem.ge(PayMemberProjectSubitem::getCreateTime,payCompanyManagement.getEditTime());
+        //updatePayMemberProjectSubitem.ge(PayMemberProjectSubitem::getCreateTime,payCompanyManagement.getEditTime());
+        updatePayMemberProjectSubitem.exists(" select 1 from pay_company_management_temporary where " +
+                "pay_member_project_subitem.company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'");
         updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName());
         memberProjectSubitemService.update(updatePayMemberProjectSubitem);
         // 更新合同
         LambdaUpdateWrapper<PayIncomeContract> updatePayIncomeContract = new LambdaUpdateWrapper<>();
         updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,payCompanyManagement.getId());
-        updatePayIncomeContract.ge(PayIncomeContract::getCreateTime,payCompanyManagement.getEditTime());
+        //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.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);
     }