From cec778f25bd233d4836d2951afed1c0bf64d7f23 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 17 Sep 2021 18:02:38 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E5=88=86=E6=A0=87?=
 =?UTF-8?q?=E5=A7=94=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/common/MeetingCommon.java  |  4 ++++
 .../controller/PayMeetingController.java        | 17 ++++++++---------
 .../com/jero/meeting/entity/PayMeeting.java     |  9 +++++++++
 .../service/impl/PayMeetingServiceImpl.java     | 13 +++++++++++++
 .../valid/group/CaseCommitteeMeeting.java       |  8 ++++++++
 .../java/com/jero/meeting/vo/PayMeetingVO.java  | 10 ++++++++++
 ...gExel.java => WorkingGroupMeetingExcel.java} |  2 +-
 7 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/valid/group/CaseCommitteeMeeting.java
 rename jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/{WorkingGroupMeetingExel.java => WorkingGroupMeetingExcel.java} (99%)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
index 786bc2bc..95936a6a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
@@ -18,6 +18,10 @@ public class MeetingCommon {
      * 国际研讨会
      */
     public final static String INTERNATIONAL_MEETING = "3";
+    /**
+     * 分标委会议
+     */
+    public final static String COMMITTEE_MEETING = "5";
     /**
      * 未提醒
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 52b0e2d8..524b35a4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -6,7 +6,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -31,7 +30,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.meeting.vo.PayMeetingVO;
 import com.jero.meeting.vo.PublishReminderVO;
 import com.jero.meeting.vo.UploadFileVO;
-import com.jero.meeting.vo.WorkingGroupMeetingExel;
+import com.jero.meeting.vo.WorkingGroupMeetingExcel;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.system.volid.group.UpdateGroup;
@@ -271,7 +270,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
     public ModelAndView exportWorkingGroupXls(HttpServletRequest request, PayMeeting payMeeting) {
         QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
         List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
-        List<WorkingGroupMeetingExel> exportList = new ArrayList<>();
+        List<WorkingGroupMeetingExcel> exportList = new ArrayList<>();
         // 过滤选中数据
         String selections = request.getParameter("selections");
         if (oConvertUtils.isNotEmpty(selections)) {
@@ -283,20 +282,20 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
             meeting.setDirectorName(user.getUsername());
             meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            WorkingGroupMeetingExel workingGroupMeetingExel = new WorkingGroupMeetingExel();
-            BeanUtils.copyProperties(meeting, workingGroupMeetingExel);
+            WorkingGroupMeetingExcel workingGroupMeetingExcel = new WorkingGroupMeetingExcel();
+            BeanUtils.copyProperties(meeting, workingGroupMeetingExcel);
             String meetingType = meeting.getMeetingType().toString();
             String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
-            workingGroupMeetingExel.setMeetingType(meetingType1);
+            workingGroupMeetingExcel.setMeetingType(meetingType1);
             //    工作组项目查询工作组项目名
              if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
                 String workingGroupId = meeting.getWorkingGroupId();
                 PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId);
-                workingGroupMeetingExel.setWorkingGroupName(workingGroup.getWorkingGroupProject());
+                workingGroupMeetingExcel.setWorkingGroupName(workingGroup.getWorkingGroupProject());
             }
-            exportList.add(workingGroupMeetingExel);
+            exportList.add(workingGroupMeetingExcel);
         }
-        return super.exportListXls(exportList, WorkingGroupMeetingExel.class, "会议管理");
+        return super.exportListXls(exportList, WorkingGroupMeetingExcel.class, "会议管理");
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index fc31be63..79536d11 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -88,6 +88,15 @@ public class PayMeeting implements Serializable {
     @ApiModelProperty(value = "工作组名称")
     private String workingGroupName;
 
+    /**分标委项目id*/
+    @ApiModelProperty(value = "主键")
+    private String caseCommitteeId;
+
+    /**分标委名称*/
+    @Excel(name = "分标委名称", width = 15)
+    @ApiModelProperty(value = "分标委名称")
+    private String caseCommitteeName;
+
 	/**开始时间*/
 	@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index b72de6f5..6003931c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -7,6 +7,8 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ValidUtil;
+import com.jero.data.entity.PayCaseCommittee;
+import com.jero.data.service.IPayCaseCommitteeService;
 import com.jero.meeting.common.MeetingCommon;
 import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.entity.PayMeetingHotelContacts;
@@ -15,6 +17,7 @@ import com.jero.meeting.mapper.PayMeetingMapper;
 import com.jero.meeting.service.IPayMeetingHotelContactsService;
 import com.jero.meeting.service.IPayMeetingService;
 import com.jero.meeting.service.IPayMeetingSituationService;
+import com.jero.meeting.valid.group.CaseCommitteeMeeting;
 import com.jero.meeting.valid.group.InternationalMeeting;
 import com.jero.meeting.valid.group.StandardMeeting;
 import com.jero.meeting.valid.group.WorkingGroupMeeting;
@@ -64,6 +67,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 	private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
 	@Resource
 	private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
+	@Resource
+	private IPayCaseCommitteeService payCaseCommitteeService;
 	/**
 	 * 新增会议
 	 */
@@ -214,6 +219,14 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 				}
 				codeList.add(cooperativeInvitationCode);
 				break;
+			case MeetingCommon.COMMITTEE_MEETING:
+				ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class);
+				String caseCommitteeId = payMeetingVO.getCaseCommitteeId();
+				PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(caseCommitteeId);
+				if (payCaseCommittee == null){
+					throw new JeroBootException("分标委项目不存在");
+				}
+				break;
 			default:
 		}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/valid/group/CaseCommitteeMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/valid/group/CaseCommitteeMeeting.java
new file mode 100644
index 00000000..96c6956f
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/valid/group/CaseCommitteeMeeting.java
@@ -0,0 +1,8 @@
+package com.jero.meeting.valid.group;
+
+/**
+ * @author liJiaRao
+ * @date 2021-09-17 17:15
+ */
+public @interface CaseCommitteeMeeting {
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index 64972f0a..4a24e288 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -1,8 +1,11 @@
 package com.jero.meeting.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.util.PasswordUtil;
 import com.jero.meeting.entity.PayMeetingHotelContacts;
+import com.jero.meeting.valid.group.CaseCommitteeMeeting;
 import com.jero.meeting.valid.group.InternationalMeeting;
 import com.jero.meeting.valid.group.StandardMeeting;
 import com.jero.meeting.valid.group.WorkingGroupMeeting;
@@ -59,6 +62,11 @@ public class PayMeetingVO implements Serializable {
     @NotBlank(message = "工作组项目名称不能为空", groups = WorkingGroupMeeting.class)
     private String workingGroupId;
 
+    /**分标委项目id*/
+    @ApiModelProperty(value = "主键")
+    @NotBlank(message = "分标委项目名称不能为空", groups = CaseCommitteeMeeting.class)
+    private String caseCommitteeId;
+
 	/**工作组项目名称*/
     @Excel(name = "工作组项目名称", width = 15)
     @ApiModelProperty(value = "工作组项目名称")
@@ -175,6 +183,7 @@ public class PayMeetingVO implements Serializable {
     @ApiModelProperty(value = "会议费用")
     @NotNull(message = "会议费用不能为空")
     @DecimalMax(value = "9999999999.99",message = "会议费用格式错误")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal meetingCosts;
 
 	/**会议费用（标协会员）*/
@@ -182,6 +191,7 @@ public class PayMeetingVO implements Serializable {
     @ApiModelProperty(value = "会议费用（标协会员）")
     @NotNull(message = "会议费用（标协会员）不能为空",groups = StandardMeeting.class)
     @DecimalMax(value = "9999999999.99",message = "会议费用（标协会员）格式错误",groups = StandardMeeting.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal meetingCostsVip;
 
 	/**会议负责人id*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExcel.java
similarity index 99%
rename from jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
rename to jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExcel.java
index 457abe92..f0ab713d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExcel.java
@@ -13,7 +13,7 @@ import javax.validation.constraints.*;
  * @date 2021-09-07 18:29
  */
 @Data
-public class WorkingGroupMeetingExel {
+public class WorkingGroupMeetingExcel {
     private static final long serialVersionUID = 1L;
 
     /**会议名称*/