From 93c606b6227b1465af43041d1aaad041df3caea6 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Mon, 18 Oct 2021 09:59:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/PayWorkingGroupDistributionRecordMapper.xml | 2 +- .../jero/project/mapper/xml/PayWorkingGroupMapper.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml index 16060376..3ec7a409 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml @@ -41,7 +41,7 @@ ail.fileName like concat('%',concat(#{fileName},'%')) - order by ail.uploadTime desc + group by ail.fileId order by ail.uploadTime desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index a3ffbda0..04a3c97d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -575,7 +575,7 @@ #{item} - where pwgs.id in #{item} + pwgs.id in #{item} AND pwg.working_group_project LIKE @@ -630,7 +630,7 @@ FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - where pcp.id in #{item} + pcp.id in #{item} pcp.principal_id in @@ -692,7 +692,7 @@ FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id) left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - where pmps.id in #{item} + pmps.id in #{item} pmp.director_id in @@ -753,7 +753,7 @@ FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id) left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - where pms.id in #{item} + pms.id in #{item} pm.director_id in @@ -814,7 +814,7 @@ FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id) left JOIN sys_user su on(tmps.liaison_man_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - where tmps.id in #{item} + tmps.id in #{item} tmps.id=99999999999999999999999 From 450342c7df0e499dbf8743f7b6846584857c0afe Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 18 Oct 2021 10:21:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91?= =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE=E8=BF=94=E5=9B=9E=E5=8F=AF=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E4=BF=A1=E6=81=AFmeetingSignUpType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingController.java | 27 ++++++++++++++----- .../com/jero/meeting/entity/PayMeeting.java | 6 +++++ 2 files changed, 27 insertions(+), 6 deletions(-) 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 ca56bb8b..07a9d1fa 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 @@ -26,11 +26,13 @@ import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingHotelContacts; +import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; 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.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; @@ -83,6 +85,8 @@ public class PayMeetingController extends JeroController a.eq("pms.company_contact_id", id) + a -> a.eq("pms.company_contact_id", contactId) .or() - .eq("pms.post_contact_id", id) + .eq("pms.post_contact_id", contactId) .or() - .eq("pmrr.contact_id", id) + .eq("pmrr.contact_id", contactId) ); } @@ -210,6 +215,16 @@ public class PayMeetingController extends JeroController wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingSituation::getMeetingId,meeting.getId()); + wrapper.eq(PayMeetingSituation::getCompanyContactId,contactId); + int count = payMeetingSituationService.count(wrapper); + if (count > 0){ + meeting.setMeetingSignUpType(2); + }else { + meeting.setMeetingSignUpType(1); + } } return Result.OK(pageList); 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 4f735081..0b30b4d2 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 @@ -282,4 +282,10 @@ public class PayMeeting implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM") @DateTimeFormat(pattern="yyyy-MM") private Date month; + + /** + * 会议可报名状态：1可报名/2已报名 + */ + @TableField(exist = false) + private Integer meetingSignUpType; }