From b03620dce02eb1d98ac22aad27ea4a3c1d99a476 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 4 Jan 2022 18:02:40 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingController.java | 57 ++++------------ .../meeting/entity/PayMeetingContacts.java | 56 ++++++++++++++++ .../mapper/PayMeetingContactsMapper.java | 17 +++++ .../mapper/xml/PayMeetingContactsMapper.xml | 11 +++ .../service/IPayMeetingContactsService.java | 44 ++++++++++++ .../impl/PayMeetingContactsServiceImpl.java | 67 +++++++++++++++++++ .../service/impl/PayMeetingServiceImpl.java | 43 +++++++++--- .../com/jero/meeting/vo/PayMeetingVO.java | 4 ++ 8 files changed, 247 insertions(+), 52 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingContacts.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingContactsMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingContactsMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingContactsService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingContactsServiceImpl.java 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 68c6396e..098ec9d8 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 @@ -9,12 +9,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; -import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; @@ -27,10 +25,11 @@ import com.jero.data.service.IPayCaseCommitteeService; import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; -import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.entity.PayMeetingContacts; import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.service.IPayMeetingContactsService; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -57,7 +56,6 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.env.Environment; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -86,8 +84,6 @@ public class PayMeetingController extends JeroController delete(@RequestParam(name = "id") String id) { - // payMeetingService.deleteById(id); - // return Result.OK("删除成功!"); - //}*/ - - - ///** - // * 批量删除 - // */ - //@RequiresPermissions("meeting:batchDel") - //@AutoLog(value = "会议管理-批量删除") - //@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除") - //@GetMapping(value = "/deleteBatch") - //public Result deleteBatch(@RequestParam(name = "ids") String ids) { - // this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); - // return Result.OK("批量删除成功!"); - //} - /** * 通过id查询 */ @ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询") @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id") String id) { + public Result queryById(@RequestParam(name = "id") String id) { Date now = new Date(); PayMeeting meeting = payMeetingService.queryByIdAndTime(id,now); if (meeting == null) { - return Result.error("未找到对应数据"); + throw new JeroBootException("未找到对应数据"); } //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -287,17 +257,20 @@ public class PayMeetingController extends JeroController()); //会议查询酒店联系人列表 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); payMeetingVO.setHotelContactsList(payMeetingHotelContactsList); + //查询会议联系人 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayMeetingContacts::getMeetingId, meeting.getId()); + List meetingContactsList = meetingContactsService.list(queryWrapper); + payMeetingVO.setMeetingContactsList(meetingContactsList); //标协会议类型 //String tbMeetingType = meeting.getTbMeetingType().toString(); //String type = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType); @@ -440,10 +413,7 @@ public class PayMeetingController extends JeroController addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) { - //String publicKey = request.getParameter("publicKey"); - //String token = request.getParameter("token"); - //authenticationUtils.check(token, publicKey); + public Result addStandards(@RequestBody PayMeeting payMeeting) { payMeetingService.addStandards(payMeeting); return Result.OK("合并开票成功!"); } @@ -452,7 +422,7 @@ public class PayMeetingController extends JeroController addStandardsFile(@RequestBody List ossFileList, HttpServletRequest request) { + public Result addStandardsFile(@RequestBody List ossFileList) { for (OSSFile ossFile : ossFileList) { iossFileService.saveOrUpdate(ossFile); } @@ -463,7 +433,6 @@ public class PayMeetingController extends JeroController { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingContactsMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingContactsMapper.xml new file mode 100644 index 00000000..989d5da6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingContactsMapper.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingContactsService.java new file mode 100644 index 00000000..6c6dbba9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingContactsService.java @@ -0,0 +1,44 @@ +package com.jero.meeting.service; + +import com.jero.meeting.entity.PayMeetingContacts; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 会议关联联系人表 + * @Author: jero-boot + * @Date: 2022-01-04 + * @Version: V1.0 + */ +public interface IPayMeetingContactsService extends IService { + + /** + * 保存 + */ + void add(PayMeetingContacts payMeetingContacts); + + /** + * 更新 + */ + void editById(PayMeetingContacts payMeetingContacts); + + /** + * 通过id删除 + */ + void deleteById(String id); + + /** + * 批量删除 + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + */ + PayMeetingContacts queryById(String id); + + /** + * 列表查询 + */ + List queryList(); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingContactsServiceImpl.java new file mode 100644 index 00000000..9458ee89 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingContactsServiceImpl.java @@ -0,0 +1,67 @@ +package com.jero.meeting.service.impl; + +import com.jero.meeting.entity.PayMeetingContacts; +import com.jero.meeting.mapper.PayMeetingContactsMapper; +import com.jero.meeting.service.IPayMeetingContactsService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 会议关联联系人表 + * @Author: jero-boot + * @Date: 2022-01-04 + * @Version: V1.0 + */ +@Service +public class PayMeetingContactsServiceImpl extends ServiceImpl implements IPayMeetingContactsService { + + /** + * 保存 + */ + @Override + public void add(PayMeetingContacts payMeetingContacts) { + save(payMeetingContacts); + } + + /** + * 更新 + */ + @Override + public void editById(PayMeetingContacts payMeetingContacts) { + saveOrUpdate(payMeetingContacts); + } + + /** + * 通过id删除 + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + */ + @Override + public PayMeetingContacts queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + */ + @Override + public List queryList() { + return list(); + } +} 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 2041e30c..ed8a7a4c 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 @@ -34,15 +34,9 @@ import com.jero.data.service.IPayCaseCouncilService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; -import com.jero.meeting.entity.PayMeeting; -import com.jero.meeting.entity.PayMeetingHotelContacts; -import com.jero.meeting.entity.PayMeetingRemindRecord; -import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.entity.*; import com.jero.meeting.mapper.PayMeetingMapper; -import com.jero.meeting.service.IPayMeetingHotelContactsService; -import com.jero.meeting.service.IPayMeetingRemindRecordService; -import com.jero.meeting.service.IPayMeetingService; -import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.meeting.service.*; import com.jero.meeting.valid.group.CaseCommitteeMeeting; import com.jero.meeting.valid.group.InternationalMeeting; import com.jero.meeting.valid.group.StandardMeeting; @@ -126,6 +120,8 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingContactsList = payMeetingVO.getMeetingContactsList(); + for (PayMeetingContacts payMeetingContacts : meetingContactsList) { + String meetingContactsId = payMeetingContacts.getMeetingContactsId(); + LoginUser loginUser = sysBaseAPI.getUserById(meetingContactsId); + if (loginUser == null) { + throw new JeroBootException("会议联系人不存在"); + } else { + payMeetingContacts.setMeetingContactsName(loginUser.getUsername()); + payMeetingContacts.setMeetingContactsPhone(loginUser.getPhone()); + } + } + if (!CollectionUtils.isEmpty(meetingContactsList)) { + //先删除原先的会议联系人，在添加新的 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayMeetingContacts::getMeetingId, meetingId); + meetingContactsService.remove(queryWrapper); + meetingContactsList.forEach(meetingContacts -> + meetingContacts.setMeetingId(meetingId) + ); + meetingContactsService.saveBatch(meetingContactsList); + } + } + @NotNull private PayMeeting getPayMeeting(PayMeetingVO payMeetingVO, List hotelContactsList) { PayMeeting payMeeting = new PayMeeting(); 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 ed0807af..c9927abb 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import com.jero.common.util.PasswordUtil; +import com.jero.meeting.entity.PayMeetingContacts; import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.valid.group.*; import com.jero.modules.system.volid.group.UpdateGroup; @@ -286,4 +287,7 @@ public class PayMeetingVO implements Serializable { @TableField(exist = false) @Dict(dicCode = "meeting_status") private Integer meetingStatus; + + @ApiModelProperty(value = "会议联系人") + private List meetingContactsList; }