会议添加预计到账日期

2023-12-27 16:15:30 +08:00
parent 900d6d9ec3
commit c57e671122
4 changed files with 40 additions and 31 deletions
@@ -10,4 +10,7 @@ ALTER TABLE `pay_common_project` ADD COLUMN `estimated_arrival_date` date COMMEN
 ALTER TABLE `pay_member_project_subitem` ADD COLUMN `estimated_arrival_date` date COMMENT '预估到账日期';

 -- pay_working_group_subitem表新增estimated_arrival_date(预估到账日期)字段
-ALTER TABLE `pay_working_group_subitem` ADD COLUMN `estimated_arrival_date` date COMMENT '预估到账日期';
+ALTER TABLE `pay_working_group_subitem` ADD COLUMN `estimated_arrival_date` date COMMENT '预估到账日期';
+
+-- pay_meeting_situation 添加预计到账日期
+ALTER TABLE `pay_meeting_situation` ADD COLUMN `estimated_arrival_date` datetime COMMENT '预计到账日期';
@@ -1,23 +1,26 @@
 package com.jero.meeting.entity;

-import java.io.Serializable;
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import com.jero.company.vo.UpdateInvoicePram;
 import com.jero.meeting.valid.group.CommonPeople;
 import com.jero.meeting.valid.group.Guest;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;

 import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;

 /**
 * @Description: 会议报名信息
@@ -569,4 +572,10 @@ public class PayMeetingSituation implements Serializable {
    @ApiModelProperty(value = "发票项目")
    private Integer invoiceProject;

+    /**预计到账日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "预计到账日期")
+    private Date estimatedArrivalDate;
+
 }
@@ -10,6 +10,7 @@ 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;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
@@ -66,20 +67,16 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;

+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;

-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
 /**
 * @Description: 会议管理
 * @Author: jero-boot
@@ -314,6 +311,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
        //进行校验，赋值操作
        PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList);
        saveOrUpdate(payMeeting);
+        // 同步预计到账日期
+        LambdaUpdateWrapper<PayMeetingSituation> upPayMeetingSituation = new LambdaUpdateWrapper<>();
+        upPayMeetingSituation.eq(PayMeetingSituation::getMeetingId,payMeeting.getId());
+        upPayMeetingSituation.set(PayMeetingSituation::getEstimatedArrivalDate,payMeeting.getStartTime());
+        payMeetingSituationService.update(upPayMeetingSituation);
+
        delWithStandardForUpdate(payMeeting);
        //如果酒店联系人列表不为空，就更新
        if (!CollectionUtils.isEmpty(hotelContactsList)) {
@@ -1,6 +1,4 @@
 package com.jero.meeting.service.impl;
-import java.util.Date;
-
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -12,6 +10,7 @@ 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;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.constant.CommonConstant;
@@ -20,9 +19,9 @@ import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
-import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
@@ -82,19 +81,15 @@ import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;

-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.transaction.annotation.Transactional;
-
 /**
 * @Description: 会议报名信息
 * @Author: jero-boot
@@ -186,7 +181,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
        //处理校验参会人信息
        PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
-
+        payMeetingSituation1.setEstimatedArrivalDate(payMeeting1.getStartTime());
        saveMeetingSituation(payMeetingSituation1);

        // 收入合同创建项目发送消息到项目负责人
@@ -228,7 +223,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
        //handlePack(payMeetingSituation1);
        //如果关联合同就不发消息
        if (!Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
-            signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);    
+            signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
        }
        //Wasic国际研讨会报名成功短信消息
        sendWasicMessage(payMeeting,payMeetingSituation1);
@@ -1077,7 +1072,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                sendMessageService.SendMessageService(sendMessageDTO);
            }
        }
-
        saveOrUpdate(payMeetingSituation1);
        //判断凭证是否修改
        String paymentRecord = oldObject.getPaymentRecord();