From aec6be8cfad5d7d401e6b6dad5d2f305f034a6a2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 9 Oct 2021 14:37:16 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF=20=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/common/enums/MessageUrlEnums.java | 2 +- .../jero/meeting/service/impl/PayMeetingServiceImpl.java | 9 +++++++-- .../service/impl/PayMeetingSituationServiceImpl.java | 6 +++++- .../controller/PayMemberProjectSubitemController.java | 2 +- .../com/jero/member/entity/PayMemberProjectSubitem.java | 5 +++++ .../member/mapper/PayMemberProjectSubitemMapper.java | 8 +++++++- .../member/mapper/xml/PayMemberProjectSubitemMapper.xml | 7 +++++++ .../member/service/IPayMemberProjectSubitemService.java | 5 +++++ .../impl/PayPayMemberProjectSubitemServiceImpl.java | 8 ++++++++ 9 files changed, 46 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index de7bb040..c900b491 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -22,7 +22,7 @@ public enum MessageUrlEnums { M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"), M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"), // todo 待定企业端 - C_OPEN_TYPE1("C_OPEN_TYPE1","url",""), + C_OPEN_TYPE1("C_OPEN_TYPE1","href","http://localhost:3000/signUpEntrance?id"), C_OPEN_TYPE2("C_OPEN_TYPE2","component",""), C_OPEN_TYPE3("C_OPEN_TYPE3","component",""), C_OPEN_TYPE4("C_OPEN_TYPE4","component",""), 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 cf7705db..390c5a1c 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 @@ -1,6 +1,7 @@ package com.jero.meeting.service.impl; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -155,7 +156,9 @@ public class PayMeetingServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = memberProjectSubitemService.page(page, queryWrapper); + IPage pageList = memberProjectSubitemService.queryPageListCompany(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index f0097d6c..ad830b78 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -253,5 +253,10 @@ public class PayMemberProjectSubitem implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "收入合同处新增标识 flag = 1") private String flag; + /** + * 项目名称 + */ + @TableField(exist = false) + private String projectName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java index 33f22910..a24092ad 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java @@ -1,14 +1,20 @@ package com.jero.member.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.member.entity.PayMemberProjectSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 会员项目_subitem * @Author: jero-boot - * @Date: 2021-08-26 + * @Date: 2021-08-26 * @Version: V1.0 */ public interface PayMemberProjectSubitemMapper extends BaseMapper { + IPage queryPageListCompany(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index 5463e5d3..4b7781a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -29,5 +29,12 @@ + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index 3160cafc..af90036b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -1,5 +1,8 @@ package com.jero.member.service; +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.member.entity.PayMemberProjectSubitem; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -64,4 +67,6 @@ public interface IPayMemberProjectSubitemService extends IService queryList(); + + IPage queryPageListCompany(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index e14b5de6..f7cbe544 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -1,7 +1,10 @@ package com.jero.member.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.jero.common.common.ProjectCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ContractCreateProjectSendMessageService; @@ -426,4 +429,9 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public IPage queryPageListCompany(Page page, QueryWrapper queryWrapper) { + return baseMapper.queryPageListCompany(page,queryWrapper); + } }