修改

linkwe-common/src/main/java/com/linkwechat/common/enums/DataSourceType.java

@@ -15,5 +15,10 @@ public enum DataSourceType
     /**
      * 从库
      */
-    SLAVE
+    SLAVE,
+
+    /**
+     * 本地生活库
+     */
+    bdshdb,
 }

linkwe-service/src/main/java/com/linkwechat/domain/WeApplicationFormRecord.java

@@ -0,0 +1,54 @@
+package com.linkwechat.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author quchen
+ * @date 2025/9/20 15:40
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WeApplicationFormRecord {
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**活动Id*/
+    @ApiModelProperty(value = "活动Id")
+    private String actId;
+    /**活动名称*/
+    @ApiModelProperty(value = "活动名称")
+    private String actName;
+    /**报名用户id*/
+    @ApiModelProperty(value = "报名用户id")
+    private String userId;
+    /**报名用户名称*/
+    @ApiModelProperty(value = "报名用户名称")
+    private String userNickName;
+    /**报创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "报创建时间")
+    private Date createTime;
+    /**报名表单key*/
+    @ApiModelProperty(value = "报名表单key")
+    private String formKey;
+    /**报名表单名称*/
+    @ApiModelProperty(value = "报名表单名称")
+    private String formName;
+    /**报名表单的值*/
+    @ApiModelProperty(value = "报名表单的值")
+    private String formVal;
+
+    @ApiModelProperty(value = "报名用户手机号")
+    private String userPhone;
+}

linkwe-service/src/main/java/com/linkwechat/mapper/WeActivityMapper.java

@@ -16,9 +16,9 @@ import java.util.List;
 public interface WeActivityMapper extends BaseMapper<WeActivity> {
     List<WeActivityListVo> queryActivityList(WeActivityListQuery query);
 
-    List<FormRecordVo> selectFormRecordByActId(String actId);
-
-    List<WinRecordVo> selectWinRecordByActId(@Param("actId")String actId, @Param("prizeType") String prizeType);
+//    List<FormRecordVo> selectFormRecordByActId(String actId);
+//
+//    List<WinRecordVo> selectWinRecordByActId(@Param("actId")String actId, @Param("prizeType") String prizeType);
 
     WeActivityVo getActivity(String actId);
 

linkwe-service/src/main/java/com/linkwechat/mapper/WeApplicationFormRecordMapper.java

@@ -0,0 +1,21 @@
+package com.linkwechat.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.linkwechat.common.annotation.DataSource;
+import com.linkwechat.common.enums.DataSourceType;
+import com.linkwechat.domain.WeApplicationFormRecord;
+import com.linkwechat.domain.activity.vo.FormRecordVo;
+import com.linkwechat.domain.activity.vo.WinRecordVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface WeApplicationFormRecordMapper extends BaseMapper<WeApplicationFormRecord> {
+    @DataSource(DataSourceType.bdshdb)
+    List<FormRecordVo> selectFormRecordByActId(String actId);
+
+    @DataSource(DataSourceType.bdshdb)
+    List<WinRecordVo> selectWinRecordByActId(@Param("actId")String actId, @Param("prizeType") String prizeType);
+}

linkwe-service/src/main/java/com/linkwechat/service/impl/IWeSopBaseServiceImpl.java

@@ -86,29 +86,6 @@ public class IWeSopBaseServiceImpl extends ServiceImpl<WeSopBaseMapper, WeSopBas
 
     @Override
     public List<WeSopListsVo> listSop(WeSopQueryListVo weSopQueryListVo) {
-//        LambdaQueryWrapper<WeSopBase> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-//        if (weSopQueryListVo.getSopName() != null){
-//            lambdaQueryWrapper.like(WeSopBase::getSopName, weSopQueryListVo.getSopName());
-//        }
-//        if (weSopQueryListVo.getSopStatus() != null){
-//            lambdaQueryWrapper.eq(WeSopBase::getSopName, weSopQueryListVo.getSopStatus());
-//        }
-//        return weSopBaseService.list(lambdaQueryWrapper);
         return baseMapper.selectSopList(weSopQueryListVo);
     }
-
-//    public List<WeSopListsVo> list(WeSopQueryListVo weSopQueryListVo) {
-//        LambdaQueryWrapper<WeSopBase> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-//        if (weSopQueryListVo.getSopName() != null){
-//            lambdaQueryWrapper.like(WeSopBase::getSopName, weSopQueryListVo.getSopName());
-//        }
-//        if (weSopQueryListVo.getSopStatus() != null){
-//            lambdaQueryWrapper.eq(WeSopBase::getSopName, weSopQueryListVo.getSopStatus());
-//        }
-//        baseMapper
-//        return weSopBaseService.list(lambdaQueryWrapper);
-//    }
-
-
-
 }

linkwe-service/src/main/java/com/linkwechat/service/impl/WeActivityServiceImpl.java

@@ -14,6 +14,7 @@ import com.linkwechat.domain.activity.vo.WeActivityVo;
 import com.linkwechat.domain.activity.vo.WinRecordVo;
 import com.linkwechat.domain.prize.query.WePrizeAddQuery;
 import com.linkwechat.mapper.WeActivityMapper;
+import com.linkwechat.mapper.WeApplicationFormRecordMapper;
 import com.linkwechat.service.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,9 @@ public class WeActivityServiceImpl extends ServiceImpl<WeActivityMapper, WeActiv
     @Resource
     private IWeActivityFieldService weActivityFieldService;
 
+    @Resource
+    private WeApplicationFormRecordMapper weApplicationFormRecordMapper;
+
 
     @Override
     @Transactional
@@ -222,11 +226,11 @@ public class WeActivityServiceImpl extends ServiceImpl<WeActivityMapper, WeActiv
     }
 
     public List<FormRecordVo> selectFormRecordByActId(String actId) {
-        return this.baseMapper.selectFormRecordByActId(actId);
+        return weApplicationFormRecordMapper.selectFormRecordByActId(actId);
     }
 
     public List<WinRecordVo> selectWinRecordByActId(String actId , String prizeType) {
-        return this.baseMapper.selectWinRecordByActId(actId, prizeType);
+        return weApplicationFormRecordMapper.selectWinRecordByActId(actId, prizeType);
     }
 
 

linkwe-service/src/main/resources/mapper/wecom/WeActivityMapper.xml

@@ -18,36 +18,36 @@
                     column="act_id"/>
     </resultMap>
 
-    <select id="selectFormRecordByActId" resultType="com.linkwechat.domain.activity.vo.FormRecordVo">
-        select
-        wafr.act_id as actId,
-        wafr.user_id as userId,
-        MAX(wafr.user_nick_name) as userNickName,
-        GROUP_CONCAT(CONCAT(wafr.form_name, ':', wafr.form_val) SEPARATOR ',') as userInfo
-        from
-        `jeecg-boot`.we_application_form_record wafr
-        where
-        1=1
-        and wafr.act_id = #{actId}
-        group by wafr.act_id, wafr.user_id
-    </select>
+<!--    <select id="selectFormRecordByActId" resultType="com.linkwechat.domain.activity.vo.FormRecordVo">-->
+<!--        select-->
+<!--        wafr.act_id as actId,-->
+<!--        wafr.user_id as userId,-->
+<!--        MAX(wafr.user_nick_name) as userNickName,-->
+<!--        GROUP_CONCAT(CONCAT(wafr.form_name, ':', wafr.form_val) SEPARATOR ',') as userInfo-->
+<!--        from-->
+<!--        we_application_form_record wafr-->
+<!--        where-->
+<!--        1=1-->
+<!--        and wafr.act_id = #{actId}-->
+<!--        group by wafr.act_id, wafr.user_id-->
+<!--    </select>-->
 
-    <select id="selectWinRecordByActId" resultType="com.linkwechat.domain.activity.vo.WinRecordVo">
-        select
-            wpr.id as id,
-            wpr.act_id as actId,
-            wpr.user_id as userId,
-            wpr.user_phone as userPhone,
-            wpr.user_name as userNickName
-        from
-            `jeecg-boot`.we_prize_record wpr
-        where
-            1=1
-        and wpr.act_id = #{actId}
-        <if test="prizeType != null and prizeType != ''">
-            and wpr.prize_type != 5
-        </if>
-    </select>
+<!--    <select id="selectWinRecordByActId" resultType="com.linkwechat.domain.activity.vo.WinRecordVo">-->
+<!--        select-->
+<!--            wpr.id as id,-->
+<!--            wpr.act_id as actId,-->
+<!--            wpr.user_id as userId,-->
+<!--            wpr.user_phone as userPhone,-->
+<!--            wpr.user_name as userNickName-->
+<!--        from-->
+<!--            `jeecg-boot`.we_prize_record wpr-->
+<!--        where-->
+<!--            1=1-->
+<!--        and wpr.act_id = #{actId}-->
+<!--        <if test="prizeType != null and prizeType != ''">-->
+<!--            and wpr.prize_type != 5-->
+<!--        </if>-->
+<!--    </select>-->
 
     <select id="selectPrizesByActId" resultType="com.linkwechat.domain.WePrize">
         select

linkwe-service/src/main/resources/mapper/wecom/WeApplicationFormRecordMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.linkwechat.mapper.WeApplicationFormRecordMapper">
+    <select id="selectFormRecordByActId" resultType="com.linkwechat.domain.activity.vo.FormRecordVo">
+        select
+            wafr.act_id as actId,
+            wafr.user_id as userId,
+            MAX(wafr.user_nick_name) as userNickName,
+            GROUP_CONCAT(CONCAT(wafr.form_name, ':', wafr.form_val) SEPARATOR ',') as userInfo
+        from
+            we_application_form_record wafr
+        where
+            1=1
+          and wafr.act_id = #{actId}
+        group by wafr.act_id, wafr.user_id
+    </select>
+
+    <select id="selectWinRecordByActId" resultType="com.linkwechat.domain.activity.vo.WinRecordVo">
+        select
+        wpr.id as id,
+        wpr.act_id as actId,
+        wpr.user_id as userId,
+        wpr.user_phone as userPhone,
+        wpr.user_name as userNickName
+        from
+        we_prize_record wpr
+        where
+        1=1
+        and wpr.act_id = #{actId}
+        <if test="prizeType != null and prizeType != ''">
+            and wpr.prize_type != 5
+        </if>
+    </select>
+</mapper>