Merge remote-tracking branch 'origin/branch20240105' into branch20240105

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

@@ -1,6 +1,7 @@
 package com.jero.company.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -52,6 +53,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -742,55 +744,133 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
     * @Exception
     */
     private void updateBatchData(PayCompanyManagement payCompanyManagement){
-        // 更新临时数据
-        LambdaUpdateWrapper<PayCompanyManagementTemporary> updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>();
-        updatePayCompanyManagementTemporary.eq(PayCompanyManagementTemporary::getCompanyId,payCompanyManagement.getId());
-        updatePayCompanyManagementTemporary.ge(PayCompanyManagementTemporary::getEditTime,payCompanyManagement.getEditTime());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyName,payCompanyManagement.getCompanyName());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyAddress,payCompanyManagement.getCompanyAddress());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyPhone,payCompanyManagement.getCompanyPhone());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getPostalCode,payCompanyManagement.getPostalCode());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getBankAccountName,payCompanyManagement.getBankAccountName());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getOpeningBank,payCompanyManagement.getOpeningBank());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getDutyCode,payCompanyManagement.getDutyCode());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getStatus,PayCompanyManagementCommon.STATUS1);
-        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::getUpdateBy,payCompanyManagement.getUpdateBy());
-        updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateTime,payCompanyManagement.getUpdateTime());
-        payCompanyManagementTemporaryService.update(updatePayCompanyManagementTemporary);
+
         //更新人员
         LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
         updatePayContactsManagement.eq(PayContactsManagement::getCompanyId,payCompanyManagement.getId());
         updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payCompanyManagement.getCompanyName());
         payContactsManagementService.update(updatePayContactsManagement);
+        int thisYear = DateUtil.thisYear();
+        //需要更新的临时企业id
+        List<String> companyTemporaryIdList = new ArrayList<>();
         // 更新普通项目
-        LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
-        updatePayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId());
-        //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);
+        LambdaQueryWrapper<PayCommonProject> quaryPayCommonProject = new LambdaQueryWrapper<>();
+        quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId());
+
+        quaryPayCommonProject.eq(PayCommonProject::getYear,thisYear);
+        quaryPayCommonProject.and(
+                a -> {
+                   a.eq(PayCommonProject::getPaidAmount, BigDecimal.ZERO)
+                           .or()
+                           .isNull(PayCommonProject::getPaidAmount);
+                });
+        quaryPayCommonProject.and(
+                a -> {
+                    a.eq(PayCommonProject::getInvoiceAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayCommonProject::getInvoiceAmount);
+                });
+        quaryPayCommonProject.and(
+                a -> {
+                    a.eq(PayCommonProject::getConfirmAmount, BigDecimal.ZERO)
+                            .or()
+                            .isNull(PayCommonProject::getConfirmAmount);
+                });
+        List<PayCommonProject> list = payCommonProjectService.list(quaryPayCommonProject);
+        List<String> collect = list.stream().map(PayCommonProject::getChargeCompanyTemporaryId).collect(Collectors.toList());
+        companyTemporaryIdList.addAll(collect);
+        if (!collect.isEmpty()){
+            LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
+            updatePayCommonProject.in(PayCommonProject::getChargeCompanyTemporaryId,collect);
+            updatePayCommonProject.set(PayCommonProject::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName());
+            payCommonProjectService.update(updatePayCommonProject);
+        }
+
         // 更新工作组
-        LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
-        updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId());
-        //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);
+        QueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new QueryWrapper<>();
+        queryPayWorkingGroupSubItem.eq("pwg.year",thisYear);
+        queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId())
+            .and(
+                a -> {
+                    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<>();
-        updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId());
-        //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);
+        QueryWrapper<PayMemberProjectSubitem> queryPayMemberProjectSubitem = new QueryWrapper<>();
+        queryPayMemberProjectSubitem.eq("pmp.particular_year",thisYear);
+        queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId())
+        .and(
+                a -> {
+                    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()) {
+            LambdaUpdateWrapper<PayCompanyManagementTemporary> updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>();
+            updatePayCompanyManagementTemporary.in(PayCompanyManagementTemporary::getId,companyTemporaryIdList);
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyName,payCompanyManagement.getCompanyName());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyAddress,payCompanyManagement.getCompanyAddress());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getCompanyPhone,payCompanyManagement.getCompanyPhone());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getPostalCode,payCompanyManagement.getPostalCode());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getBankAccountName,payCompanyManagement.getBankAccountName());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getOpeningBank,payCompanyManagement.getOpeningBank());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getDutyCode,payCompanyManagement.getDutyCode());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getStatus,PayCompanyManagementCommon.STATUS1);
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getDataSource,payCompanyManagement.getDataSource());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getRemarks,payCompanyManagement.getRemarks());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getEditTime,payCompanyManagement.getEditTime());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateBy,payCompanyManagement.getUpdateBy());
+            updatePayCompanyManagementTemporary.set(PayCompanyManagementTemporary::getUpdateTime,payCompanyManagement.getUpdateTime());
+            payCompanyManagementTemporaryService.update(updatePayCompanyManagementTemporary);
+        }
+
         // 更新合同
         LambdaUpdateWrapper<PayIncomeContract> updatePayIncomeContract = new LambdaUpdateWrapper<>();
         updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,payCompanyManagement.getId());

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java

@@ -389,7 +389,7 @@ public class PayMemberProjectSubitem implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期", width = 15,orderNum = "5")
+    @Excel(name = "预计到账日期", width = 15,orderNum = "9")
     private String estimatedArrivalDate;
 
     /**预计到账开始日期*/

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/entity/PayWorkingGroupSubItem.java

@@ -125,6 +125,14 @@ public class PayWorkingGroupSubItem implements Serializable {
     @DecimalMax(value = "9999999999.99",message = "待确收金额（元）格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal receivableAmount;
+
+    /**预计到账日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "预计到账日期")
+    @Excel(name = "预计到账日期",width = 15,format = "yyyy-MM-dd")
+    private String estimatedArrivalDate;
+
 	/**实收金额（元）*/
     @ApiModelProperty(value = "实收金额（元）")
     @DecimalMax(value = "9999999999.99",message = "实收金额（元）格式错误")
@@ -165,13 +173,6 @@ public class PayWorkingGroupSubItem implements Serializable {
     @ApiModelProperty(value = "收费通知文件id")
     private java.lang.String chargeNoticeId;
 
-    /**预计到账日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期",width = 15,format = "yyyy-MM-dd")
-    private String estimatedArrivalDate;
-
 	/**打包（1：是，0：否）*/
     @ApiModelProperty(value = "打包（1：是，0：否）")
     private java.lang.Integer pack;

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/PayCommonProjectMapper.xml

@@ -11,7 +11,7 @@
             su.realname as principal_name,
             pcp.charge_company_id,
             pcp.charge_company_temporary_id,
-            pcp.charge_company_temporary_name,
+            if(pcp.charge_company_temporary_name = pcm.company_name, pcp.charge_company_temporary_name, concat(pcp.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as charge_company_temporary_name,
             pcp.charge_use,
             pcp.contacts_id,
             pcp.contacts_temporary_id,
@@ -46,12 +46,14 @@
         FROM pay_common_project pcp
         left join sys_user su on pcp.principal_id = su.id
 		LEFT JOIN pay_payment_record ppr ON ppr.project_id = pcp.id
+        left join pay_company_management_temporary pcmt on pcp.charge_company_temporary_id = pcmt.id
+        left join pay_company_management pcm on pcmt.company_id = pcm.id
 		<where>
             <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
                 AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%'))
             </if>
             <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
-                AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+                AND pcm.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
             </if>
             <if test="payCommonProject.contactsTemporaryName != null and payCommonProject.contactsTemporaryName != ''">
                 AND pcp.contacts_temporary_name like concat('%',concat(#{payCommonProject.contactsTemporaryName},'%'))

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

@@ -8,7 +8,8 @@
             pwgs.working_group_id AS workingGroupId,
             pwgs.charge_company_id AS chargeCompanyId,
             pwgs.charge_company_temporary_id AS chargeCompanyTemporaryId,
-            pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
+<!--            pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,-->
+        if(pwgs.charge_company_temporary_name = pcm.company_name, pwgs.charge_company_temporary_name, concat(pwgs.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as chargeCompanyTemporaryName,
             pwgs.contacts_id_one AS contactsIdOne,
             pwgs.contacts_temporary_id_one AS contactsTemporaryIdOne,
             pwgs.contacts_temporary_name_one AS contactsTemporaryNameOne,
@@ -48,10 +49,12 @@
             pwgs.estimated_arrival_date
         FROM pay_working_group_subitem pwgs
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id
+        left join pay_company_management_temporary pcmt on pwgs.charge_company_temporary_id = pcmt.id
+        left join pay_company_management pcm on pcmt.company_id = pcm.id
         <where>
             pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
             <if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">
-                AND pwgs.charge_company_temporary_name LIKE
+                AND pcm.company_name LIKE
                 concat('%',concat(#{payWorkingGroupSubItem.chargeCompanyTemporaryName},'%'))
             </if>
             <if test="paymentDate != null and paymentDate != ''">
@@ -353,4 +356,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;
@@ -1063,6 +1064,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

jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java

@@ -53,6 +53,14 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
     @ApiModelProperty(value = "实收金额（元）")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal paidAmount;
+
+    /**预计到账日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "预计到账日期")
+    @Excel(name = "预计到账日期",width = 15)
+    private String estimatedArrivalDate;
+
     /**
      * 合同编号
      */
@@ -66,13 +74,6 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
     @ApiModelProperty(value = "收费通知号")
     private String chargeNoticeNo;
 
-    /**预计到账日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期",width = 15)
-    private String estimatedArrivalDate;
-
     /**
      * 打包
      */

jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java

@@ -84,7 +84,7 @@ public class OSSFileController {
 	 */
 	@ResponseBody
 	@GetMapping("/queryById")
-	public Result<OSSFile> queryById(@RequestParam(name = "id") String id) {
+	public Result<OSSFile> queryById(@RequestParam(name = "id",required = false) String id) {
 		Result<OSSFile> result = new Result<>();
 		OSSFile file = ossFileService.getById(id);
 		if (file == null) {