add 企业端 企业联系人相关的资料网员项目

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java

@@ -85,7 +85,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
         payMemberProjectSubitem.setCompanyId(contactsManagement.getCompanyId());
         QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
         Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
-        IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.page(page, queryWrapper);
+        IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.queryPageListCompany(page, queryWrapper);
         return Result.OK(pageList);
     }
 

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;
 
 }

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<PayMemberProjectSubitem> {
 
+    IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<PayMemberProjectSubitem> queryWrapper);
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml

@@ -29,5 +29,12 @@
         <result column="in_account" property="inAccount" />
         <result column="make_invoice" property="makeInvoice" />
         <result column="mail" property="mail" />
+        <result column="project_name" property="projectName" />
     </resultMap>
+
+    <select id="queryPageListCompany" resultMap="MemberProjectSubitemResultMap">
+        select pmps.*,pmp.project_name from pay_member_project_subitem pmps
+        left join pay_member_project pmp on pmps.project_id = pmp.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

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<PayMemberProje
 	 * @return
 	 */
     List<PayMemberProjectSubitem> queryList();
+
+    IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper);
 }

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<PayMember
     public List<PayMemberProjectSubitem> queryList() {
         return list();
     }
+
+    @Override
+    public IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper) {
+        return baseMapper.queryPageListCompany(page,queryWrapper);
+    }
 }