企业管理-员工信息

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/BasePromotionService.java

@@ -13,5 +13,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @date 16:40 2024/8/13
 **/
 public interface BasePromotionService extends IService<BasePromotion> {
+
+    /**
+     * 推广记录表 分布查询
+     * @author 小李
+     * @date 12:24 2024/8/14
+     * @param pageReqVO 查询对象
+     * @param page 分页规则
+    **/
     IPage<BasePromotionRespVO> queryListPage(BasePromotionReqVO pageReqVO, Page<BasePromotion> page);
+
+    /**
+     * 新增推广记录
+     * @author 小李
+     * @date 12:26 2024/8/14
+     * @param promotionRespVO 新增对象
+    **/
+    Boolean createPromotion(BasePromotionRespVO promotionRespVO);
 }

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/BasePromotionServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.custom.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.module.custom.entity.BasePromotion;
 import cn.iocoder.yudao.module.custom.mapper.BasePromotionMapper;
 import cn.iocoder.yudao.module.custom.service.BasePromotionService;
@@ -29,4 +30,17 @@ public class BasePromotionServiceImpl extends ServiceImpl<BasePromotionMapper, B
     public IPage<BasePromotionRespVO> queryListPage(BasePromotionReqVO pageReqVO, Page<BasePromotion> page) {
         return baseMapper.queryListPage(pageReqVO, page);
     }
+
+    /**
+     * 新增推广记录
+     * @author 小李
+     * @date 12:26 2024/8/14
+     * @param promotionRespVO 新增对象
+     **/
+    @Override
+    public Boolean createPromotion(BasePromotionRespVO promotionRespVO){
+        BasePromotion basePromotion = new BasePromotion();
+        BeanUtil.copyProperties(promotionRespVO, basePromotion);
+        return baseMapper.insert(basePromotion) > 0;
+    }
 }

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/BasePromotionReqVO.java

@@ -20,4 +20,7 @@ public class BasePromotionReqVO extends BasePromotion {
     @Schema(description = "被推广人注册日期查询范围")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date[] registerTimeArray;
+
+    /** 推广人类型 */
+    private String userType;
 }

dl-module-base/src/main/resources/mapper/custom/BasePromotionMapper.xml

@@ -14,6 +14,7 @@
 
         <association property="oldUser" javaType="cn.iocoder.yudao.module.system.api.user.dto.UserDTO">
             <result property="mobile" column="os_mobile"/>
+            <result property="userType" column="os_user_type"/>
         </association>
 
         <association property="newUser" javaType="cn.iocoder.yudao.module.system.api.user.dto.UserDTO">
@@ -29,6 +30,7 @@
         bp.old_user_name as bp_old_user_name,
         bp.new_user_name as bp_new_user_name,
         os.mobile as os_mobile,
+        os.user_type as os_user_type,
         ns.mobile as ns_mobile
         from base_promotion bp
         INNER JOIN system_users os on bp.old_user_id = os.id
@@ -49,5 +51,9 @@
         <if test="map.registerTimeArray != null and map.registerTimeArray.length > 0">
             and (bp.register_time between #{map.registerTimeArray[0]} and #{map.registerTimeArray[1]})
         </if>
+        <if test="map.userType != null and map.userType != ''">
+            and (os.user_type = #{map.userType})
+        </if>
+        order by bp.create_time desc
     </select>
 </mapper>

dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.common.BaseConstants;
 import cn.iocoder.yudao.common.CommonErrorCodeConstants;
 import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.module.company.entity.Company;
 import cn.iocoder.yudao.module.company.service.CompanyService;
 import cn.iocoder.yudao.module.label.entity.BusiLabel;
 import cn.iocoder.yudao.module.label.entity.Label;
@@ -61,18 +60,12 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
     @Resource
     private LabelService labelService;
 
-    @Resource
-    private CompanyService companyService;
-
     @Resource
     private BusiLabelService busiLabelService;
 
     @Resource
     private UniqueCodeService uniqueCodeService;
 
-    @Resource
-    private DataPermissionRule dataPermissionRule;
-
     @Resource
     private DeptApi deptApi;