checkVOS = ids.stream()
+ .map(id -> {
+ CheckVO checkVO1 = new CheckVO();
+ checkVO1.setCheckResult(checkVO.getCheckResult());
+ checkVO1.setCheckRemark(checkVO.getCheckRemark());
+ checkVO1.setId(id);
+ return checkVO1;
+ })
+ .collect(Collectors.toList());
+ checkVOS.forEach(payMeetingSituationService::checkRegister);
+ return Result.OK("审核成功!");
+ }
+
/**
* 合并开票
*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java
new file mode 100644
index 00000000..eafc7e53
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java
@@ -0,0 +1,75 @@
+package com.jero.meeting.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+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;
+
+/**
+ *
+ * 会议酒店推荐表
+ *
+ *
+ * @author sz
+ * @since 2024-07-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pay_meeting_hotel_recommend")
+@ApiModel(value="PayMeetingHotelRecommend对象", description="会议酒店推荐表")
+public class PayMeetingHotelRecommend implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "推荐人")
+ private String recommendPeople;
+
+ @ApiModelProperty(value = "酒店名称")
+ private String hotelName;
+
+ @ApiModelProperty(value = "所在省份")
+ private String hotelProvince;
+
+ @ApiModelProperty(value = "所在城市")
+ private String hotelCity;
+
+ @ApiModelProperty(value = "是否举办过标准院会议 1-是 0-否")
+ @Dict(dicCode = "yn")
+ private Integer isHold;
+
+ @ApiModelProperty(value = "曾举办的会议类型")
+// @Dict(dicCode = "meeting_type")
+ private String meetingType;
+
+ @ApiModelProperty(value = "酒店联系方式")
+ private String contact;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 0da48f48..e4b99893 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -586,4 +586,9 @@ public class PayMeetingSituation implements Serializable {
@ApiModelProperty(value = "预计到账日期")
private Date estimatedArrivalDate;
+ /**预计到账日期*/
+ @ApiModelProperty(value = "预计到账日期")
+ @TableField(exist = false)
+ private String estimatedArrivalDateStr;
+
}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingHotelRecommendMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingHotelRecommendMapper.java
new file mode 100644
index 00000000..113dc665
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingHotelRecommendMapper.java
@@ -0,0 +1,20 @@
+package com.jero.meeting.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.meeting.entity.PayMeetingHotelRecommend;
+import org.apache.ibatis.annotations.Update;
+
+/**
+ *
+ * 会议酒店推荐表 Mapper 接口
+ *
+ *
+ * @author sz
+ * @since 2024-07-10
+ */
+public interface PayMeetingHotelRecommendMapper extends BaseMapper {
+
+ @Update("TRUNCATE TABLE pay_meeting_hotel_recommend")
+ void truncateTable();
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
index 0ff0c727..1746586c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
@@ -35,7 +35,7 @@ public interface PayMeetingMapper extends BaseMapper {
IPage workGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
- IPage draftGroupPage(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+ IPage draftGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
index c4ac1763..3dafee03 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
@@ -38,4 +38,19 @@ public interface PayMeetingSituationMapper extends BaseMapper getMeetingPackStatistics(@Param(Constants.WRAPPER) QueryWrapper query);
MeetingPackStatistics getMeetingPackStatisticsCount(@Param(Constants.WRAPPER) QueryWrapper query);
+
+ /**
+ * 根据年份获取参会人
+ * @param year 年份
+ */
+ List listByYear(@Param("year")String year);
+
+ /**
+ * 根据年份获取参会人
+ *
+ * @param yearList 年份
+ * @param companyManagementId
+ */
+ List listByYearNotIn(@Param("yearList") List yearList, @Param("companyManagementId") String companyManagementId);
+
}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingHotelRecommendMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingHotelRecommendMapper.xml
new file mode 100644
index 00000000..8f8cb61c
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingHotelRecommendMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
index cdd5a5b0..c010b4d8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
@@ -1,6 +1,53 @@
+
+ id,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ meeting_id,
+ company_id,
+ company_name,
+ company_contact_id,
+ company_contact_name,
+ post,
+ phone,
+ email,
+ `identity`,
+ guest_type,
+ speech_topic,
+ speech_ppt,
+ photo,
+ profile,
+ have_meals,
+ hui_people,
+ check_in_hotel,
+ in_hotel_time,
+ out_hotel_time,
+ room_layout,
+ arrival_time,
+ destination,
+ arrival_shift,
+ delivery_station,
+ departure_time,
+ departure_station,
+ departure_shift,
+ remark,
+ check_in,
+ pick_up,
+ post_contact_id,
+ post_contact_address,
+ pay_mode,
+ need_invoice,
+ payment_record,
+ `status`,
+ pack,
+ in_account,
+ make_invoice,
+ mail
+
@@ -202,4 +249,29 @@
from v_meeting_pack_statistical
${ew.customSqlSegment}
+
+
+
+
+
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingHotelRecommendService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingHotelRecommendService.java
new file mode 100644
index 00000000..d715beb6
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingHotelRecommendService.java
@@ -0,0 +1,32 @@
+package com.jero.meeting.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.meeting.entity.PayMeetingHotelRecommend;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ *
+ * 会议酒店推荐表 服务类
+ *
+ *
+ * @author sz
+ * @since 2024-07-10
+ */
+public interface IPayMeetingHotelRecommendService extends IService {
+
+ /**
+ * 分页列表查询
+ * @param meetingHotelRecommend
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ IPage queryHotelRecommendS(PayMeetingHotelRecommend meetingHotelRecommend, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+ void addExcel(List