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

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",""),

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<PayMeetingMapper, PayMeet
 		sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode());
 		sendMessageDTO.setTemplateParam(map);
 		sendMessageDTO.setBusType("email");
-		sendMessageDTO.setBusId(payMeeting.getId());
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("id",payMeeting.getId());
+		sendMessageDTO.setBusId(jsonObject.toJSONString());
 		sendMessageService.SendMessageService(sendMessageDTO);
 	}
 
@@ -467,7 +470,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 				sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode());
 				sendMessageDTO.setTemplateParam(map);
 				sendMessageDTO.setBusType("C_OPEN_TYPE1");
-				sendMessageDTO.setBusId(meetingId);
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("id",meetingId);
+				sendMessageDTO.setBusId(jsonObject.toJSONString());
 				sendMessageService.SendMessageService(sendMessageDTO);
 
 			}

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -190,6 +190,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             sendMessageDTO.setBusType("M_OPEN_TYPE5");
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id",payMeetingSituation.getId());
+            jsonObject.put("meetingId",payMeeting.getId());
+            jsonObject.put("meetingName",payMeeting.getMeetingName());
             sendMessageDTO.setBusId(jsonObject.toJSONString());
             sendMessageService.SendMessageService(sendMessageDTO);
         }
@@ -657,7 +659,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG8.getCode());
                 sendMessageDTO.setTemplateParam(map);
                 sendMessageDTO.setBusType("M_OPEN_TYPE8");
-                sendMessageDTO.setBusId(id);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("id",id);
+                sendMessageDTO.setBusId(jsonObject.toJSONString());
                 sendMessageService.SendMessageService(sendMessageDTO);
             }
         }

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,7 +1,12 @@
 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
@@ -11,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 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);
+    }
 }