活动管理接口

commons/src/main/java/com/jzg/commons/entity/po/SysActivity.java

@@ -0,0 +1,87 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.util.idgen.IdGenerate;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/2/5 14:17
+ */
+
+@TableName("sys_activity")
+@Schema(description = "抽奖活动表")
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class SysActivity implements Serializable {
+    @TableId(value = "id")
+    @Schema(description = "主键")
+    private String id;
+    @TableField(value = "act_name")
+    @Schema(description = "活动名称")
+    private String actName;
+
+    @TableField(value = "act_method")
+    @Schema(description = "活动方式 1 九宫格 2 大转盘")
+    private String actMethod;
+
+    @TableField(value = "act_start_time")
+    @Schema(description = "活动开始时间")
+    private String actStartTime;
+
+    @TableField(value = "act_end_time")
+    @Schema(description = "活动结束时间")
+    private String actEndTime;
+
+    @Schema(description = "活动创建时间")
+    @TableField(value = "create_time")
+    private String createTime;
+
+    @TableField(value = "create_by")
+    @Schema(description = "活动创建人")
+    private String createBy;
+
+    @TableField(value = "act_dept")
+    @Schema(description = "活动所属机构")
+    private String actDept;
+
+    @TableField(value = "act_status")
+    @Schema(description = "活动状态 1 未开始 2 进行中 3已结束")
+    private String actStatus;
+
+    @TableField(value = "is_delete")
+    @Schema(description = "是否删除 1 是 0 否")
+    private String isDelete;
+
+    @TableField(value = "is_end")
+    @Schema(description = "是否结束 1 是 0 否")
+    private String isEnd;
+
+    @TableField(exist = false)
+    @Schema(description = "奖项列表")
+    private List<SysActivityAward> awardList;
+
+
+    public SysActivity(String userId) {
+        this.id = IdGenerate.nextId();
+        this.createBy = userId;
+        this.createTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.isDelete = "0";
+        this.isEnd = "0";
+    }
+
+}

commons/src/main/java/com/jzg/commons/entity/po/SysActivityAward.java

@@ -0,0 +1,70 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jzg.commons.util.idgen.IdGenerate;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author quchen
+ * @date 2025/2/5 16:33
+ */
+
+@Data
+@TableName("sys_activity_award")
+@Schema(description = "抽奖活动奖品表")
+public class SysActivityAward implements Serializable {
+    @TableId(value = "id")
+    @Schema(description = "主键")
+    private String id;
+
+    @TableField(value = "award_name")
+    @Schema(description = "奖品名称")
+    private String awardName;
+
+    @TableField(value = "award_type")
+    @Schema(description = "奖品类型 1 现金 2 增值服务")
+    private String awardType;
+
+    @TableField(value = "award_desc")
+    @Schema(description = "奖品描述")
+    private String awardDesc;
+
+    @TableField(value = "award_img")
+    @Schema(description = "奖品图片id")
+    private String awardImg;
+
+    @TableField(value = "award_num")
+    @Schema(description = "奖品序号")
+    private String awardNum;
+
+    @TableField(value = "activity_id")
+    @Schema(description = "活动id")
+    private String activityId;
+
+    @TableField(value = "award_cash_type")
+    private String awardCashType;
+
+    @TableField(value = "award_fixed_amount")
+    private BigDecimal awardFixedAmount;
+
+    @TableField(value = "award_min_amount")
+    private BigDecimal awardMinAmount;
+
+    @TableField(value = "award_max_amount")
+    private BigDecimal awardMaxAmount;
+
+    @TableField(exist = false)
+    private String imageUrl;
+
+
+
+    public SysActivityAward(){
+        this.id = IdGenerate.nextId();
+    }
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysActivityAwardVo.java

@@ -0,0 +1,60 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/2/6 11:04
+ */
+
+@Data
+public class SysActivityAwardVo {
+
+    @Schema(description = "奖品列表")
+    private List<AwardList> awardList;
+
+    @Schema(description = "活动id")
+    private String activityId;
+
+    @Data
+    @NoArgsConstructor
+    public static class AwardList implements Serializable {
+        @Schema(description = "奖品id")
+        private String awardId;
+
+        @Schema(description = "奖品名称")
+        private String awardName;
+
+        @Schema(description = "奖品类型 1 现金 2 增值服务")
+        private String awardType;
+
+        @Schema(description = "奖品描述")
+        private String awardDesc;
+
+        @Schema(description = "奖品图片id")
+        private String awardImg;
+
+        @Schema(description = "奖品序号")
+        private String awardNum;
+
+        @Schema(description = "现金类型 1 固定金额 2 区间金额")
+        private String awardCashType;
+
+        @Schema(description = "固定现金额")
+        private BigDecimal awardFixedAmount;
+
+        @Schema(description = "最小现金额")
+        private BigDecimal awardMinAmount;
+
+        @Schema(description = "最大现金额")
+        private BigDecimal awardMaxAmount;
+
+    }
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysActivityVo.java

@@ -0,0 +1,69 @@
+package com.jzg.commons.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/2/5 14:47
+ */
+
+@Data
+public class SysActivityVo extends PageRequest {
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "活动名称")
+    private String actName;
+
+    @Schema(description = "活动方式 1 九宫格 2 大转盘")
+    private String actMethod;
+
+    @Schema(description = "活动状态")
+    private String actStatus;
+
+    @Schema(description = "活动开始时间")
+    private String actStartTime;
+
+    @Schema(description = "活动结束时间")
+    private String actEndTime;
+
+    @Schema(description = "活动所属机构")
+    private String actDept;
+    @Schema(description = "活动下的部门id")
+    private List<String> deptIds;
+
+    @Schema(description = "奖项id")
+    private String awardId;
+
+    @Schema(description = "奖项名称")
+    private String awardName;
+
+    @Schema(description = "奖项类型 1 现金 2 增值服务")
+    private String awardType;
+
+    @Schema(description = "奖项图片id")
+    private String awardImg;
+
+    @Schema(description = "现金类型 1 固定金额 2 区间金额")
+    private String awardCashType;
+
+    @Schema(description = "固定现金额")
+    private String awardFixedAmount;
+
+    @Schema(description = "最小现金额")
+    private String awardMinAmount;
+
+    @Schema(description = "最大现金额")
+    private String awardMaxAmount;
+
+    @Schema(description = "是否删除 1 是 0 否")
+    private String isDelete;
+
+}

gateway/src/main/resources/application.yml

@@ -21,6 +21,6 @@ spring:
         - id: tenant_route
           uri: http://localhost:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**
 
 

tenant/organization/src/main/java/com/jzg/organization/controller/ActivityController.java

@@ -0,0 +1,83 @@
+package com.jzg.organization.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.SysActivity;
+import com.jzg.commons.entity.vo.SysActivityAwardVo;
+import com.jzg.commons.entity.vo.SysActivityVo;
+import com.jzg.commons.request.RequestSingleParam;
+import com.jzg.organization.service.SysActivityService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.Objects;
+
+/**
+ * @author quchen
+ * @date 2025/2/6 8:45
+ */
+
+@RestController
+@RequestMapping("/activity")
+public class ActivityController {
+    @Resource
+    private SysActivityService sysActivityService;
+
+    @Operation(summary = "新增抽奖活动接口", description = "新增抽奖活动接口")
+    @PostMapping(value = "/addActivity")
+    public HttpResult addActivity(@RequestBody SysActivityVo sysActivityVo) {
+        return sysActivityService.addActivity(sysActivityVo);
+    }
+
+    @Operation(summary = "修改抽奖活动接口", description = "修改抽奖活动接口")
+    @PostMapping(value = "/updateActivity")
+    public HttpResult updateActivity(@RequestBody SysActivityVo sysActivityVo) {
+        return sysActivityService.updateActivity(sysActivityVo);
+    }
+
+    @Operation(summary = "新增抽奖活动奖项接口", description = "新增抽奖活动奖项接口")
+    @PostMapping(value = "/addActivityAward")
+    public HttpResult addActivityAward(@RequestBody SysActivityAwardVo sysActivityAwardVo) {
+        return sysActivityService.addActivityAward(sysActivityAwardVo);
+    }
+
+    @Operation(summary = "查询活动列表接口", description = "查询活动列表接口")
+    @PostMapping(value = "/getActivityList")
+    public HttpResult getActivityList(@RequestBody SysActivityVo sysActivityVo) {
+        Page page = sysActivityVo.getPage();
+        return HttpResult.ok(sysActivityService.getActivityList(page,sysActivityVo));
+    }
+
+    @Operation(summary = "查询活动详情接口", description = "查询活动详情接口")
+    @PostMapping(value = "/getActivity")
+    public HttpResult getActivity(@RequestBody SysActivityVo sysActivityVo) {
+        return sysActivityService.getActivity(sysActivityVo);
+    }
+
+    @Operation(summary = "删除活动接口", description = "删除活动接口")
+    @PostMapping(value = "/deleteActivity")
+    public HttpResult deleteActivity(@RequestSingleParam(value = "id") String id) {
+        return sysActivityService.deleteActivity(id);
+    }
+
+    @Operation(summary = "结束活动接口", description = "结束活动接口")
+    @PostMapping(value = "/endActivity")
+    public HttpResult endActivity(@RequestSingleParam(value = "id") String id) {
+        SysActivity sysActivity = sysActivityService.getById(id);
+        if (Objects.isNull(sysActivity)) {
+            return HttpResult.error("活动不存在");
+        }
+        if (!sysActivity.getActStatus().equals("2")) {
+            return HttpResult.error("当前活动状态不可手动结束");
+        }
+        sysActivity.setActStatus("3");
+        sysActivity.setIsEnd("1");
+        sysActivityService.updateById(sysActivity);
+        return HttpResult.ok("活动结束成功");
+    }
+
+
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysActivityAwardMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysActivityAward;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysActivityAwardMapper extends BaseMapper<SysActivityAward> {
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysActivityMapper.java

@@ -0,0 +1,13 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.po.SysActivity;
+import com.jzg.commons.entity.vo.SysActivityVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface SysActivityMapper extends BaseMapper<SysActivity> {
+    Page<SysActivity> getSysActivityList(Page page, @Param("sysActivityVo") SysActivityVo sysActivityVo);
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysActivityAwardService.java

@@ -0,0 +1,9 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.SysActivityAward;
+
+
+
+public interface SysActivityAwardService extends IService<SysActivityAward> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysActivityService.java

@@ -0,0 +1,23 @@
+package com.jzg.organization.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.SysActivity;
+import com.jzg.commons.entity.vo.SysActivityAwardVo;
+import com.jzg.commons.entity.vo.SysActivityVo;
+
+public interface SysActivityService extends IService<SysActivity> {
+    HttpResult addActivity(SysActivityVo sysActivityVo);
+
+    HttpResult updateActivity(SysActivityVo sysActivityVo);
+
+    HttpResult addActivityAward(SysActivityAwardVo sysActivityAwardVo);
+
+    HttpResult deleteActivity(String id);
+
+    HttpResult getActivity(SysActivityVo sysActivityVo);
+
+    Page<SysActivity> getActivityList(Page page,SysActivityVo sysActivityVo);
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysActivityAwardServiceImpl.java

@@ -0,0 +1,16 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysActivityAward;
+import com.jzg.organization.mapper.SysActivityAwardMapper;
+import com.jzg.organization.service.SysActivityAwardService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author quchen
+ * @date 2025/2/6 16:29
+ */
+
+@Service
+public class SysActivityAwardServiceImpl extends ServiceImpl<SysActivityAwardMapper, SysActivityAward> implements SysActivityAwardService {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysActivityServiceImpl.java

@@ -0,0 +1,196 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.vo.SysActivityAwardVo;
+import com.jzg.commons.entity.vo.SysActivityVo;
+import com.jzg.commons.util.MinioUtils;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.organization.mapper.SysActivityAwardMapper;
+import com.jzg.organization.mapper.SysActivityMapper;
+import com.jzg.organization.mapper.SysUploadFilesMapper;
+import com.jzg.organization.service.SysActivityAwardService;
+import com.jzg.organization.service.SysActivityService;
+import com.jzg.organization.service.SysDeptService;
+import jakarta.annotation.Resource;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author quchen
+ * @date 2025/2/6 9:01
+ */
+
+@Service
+public class SysActivityServiceImpl extends ServiceImpl<SysActivityMapper, SysActivity> implements SysActivityService {
+    @Resource
+    private SysDeptService sysDeptService;
+
+    @Resource
+    private SysActivityService sysActivityService;
+
+    @Resource
+    private SysActivityAwardService sysActivityAwardService;
+
+    @Resource
+    private SysActivityAwardMapper sysActivityAwardMapper;
+
+    @Resource
+    private SysUploadFilesMapper sysUploadFilesMapper;
+    @Qualifier("baseController")
+    @Autowired
+    private BaseController controller;
+
+    @Override
+    public HttpResult addActivity(SysActivityVo sysActivityVo) {
+        SysDept sysDept = sysDeptService.getById(sysActivityVo.getActDept());
+        if (Objects.isNull(sysDept) || sysDept.getIsDelete().equals(1)) {
+            throw new RuntimeException("机构不存在");
+        }
+        String userId = controller.getUserName();
+        SysActivity sysActivity = new SysActivity(userId);
+        BeanUtils.copyProperties(sysActivityVo, sysActivity);
+        LocalDate now = LocalDate.now();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        LocalDate startTime = LocalDate.parse(sysActivityVo.getActStartTime(), formatter);
+        LocalDate endTime = LocalDate.parse(sysActivityVo.getActEndTime(), formatter);
+        // 检查当前时间是否早于生效日期
+        if (now.isBefore(startTime)) {
+            sysActivity.setActStatus("1");
+        }
+        else if (now.isAfter(startTime) && now.isBefore(endTime)) {
+            sysActivity.setActStatus("2");
+        }
+        else if (now.isEqual(startTime)) {
+            sysActivity.setActStatus("2");
+        }
+        else if (now.isAfter(endTime)) {
+            sysActivity.setActStatus("3");
+        }
+        else if (now.isEqual(endTime)) {
+            sysActivity.setActStatus("3");
+        }
+        sysActivityService.save(sysActivity);
+        return HttpResult.ok("添加活动成功", sysActivity.getId());
+    }
+
+    @Transactional
+    @Override
+    public HttpResult updateActivity(SysActivityVo sysActivityVo) {
+        SysActivity sysActivity = sysActivityService.getById(sysActivityVo.getId());
+        if (Objects.isNull(sysActivity)) {
+            throw new RuntimeException("活动不存在");
+        }
+        if (sysActivity.getActStatus().equals("3")) {
+            throw new RuntimeException("活动已结束");
+        }
+        SysDept sysDept = sysDeptService.getById(sysActivityVo.getActDept());
+        if (Objects.isNull(sysDept) || sysDept.getIsDelete().equals(1)) {
+            throw new RuntimeException("机构不存在");
+        }
+        BeanUtils.copyProperties(sysActivityVo, sysActivity);
+        LocalDate now = LocalDate.now();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        LocalDate startTime = LocalDate.parse(sysActivityVo.getActStartTime(), formatter);
+        LocalDate endTime = LocalDate.parse(sysActivityVo.getActEndTime(), formatter);
+        // 检查当前时间是否早于生效日期
+        if (now.isBefore(startTime)) {
+            sysActivity.setActStatus("1");
+        }
+        else if (now.isAfter(startTime) && now.isBefore(endTime)) {
+            sysActivity.setActStatus("2");
+        }
+        else if (now.isEqual(startTime)) {
+            sysActivity.setActStatus("2");
+        }
+        else if (now.isAfter(endTime)) {
+            sysActivity.setActStatus("3");
+        }
+        else if (now.isEqual(endTime)) {
+            sysActivity.setActStatus("3");
+        }
+        sysActivityService.updateById(sysActivity);
+        return HttpResult.ok("修改活动成功");
+    }
+
+    @Override
+    public HttpResult addActivityAward(SysActivityAwardVo sysActivityAwardVo) {
+        List<SysActivityAward> sysActivityAwardList = new ArrayList<>();
+        for (SysActivityAwardVo.AwardList awardList : sysActivityAwardVo.getAwardList()) {
+            SysActivity sysActivity = sysActivityService.getById(sysActivityAwardVo.getActivityId());
+            if (Objects.isNull(sysActivity)) {
+                throw new RuntimeException("活动不存在");
+            }
+            if (sysActivity.getActStatus().equals("3")) {
+                throw new RuntimeException("活动已结束");
+            }
+            if (!StringUtils.isEmpty(awardList.getAwardId())) {
+                SysActivityAward sysActivityAward = sysActivityAwardService.getById(awardList.getAwardId());
+                if (Objects.isNull(sysActivityAward)) {
+                    throw new RuntimeException("奖品不存在");
+                }
+                BeanUtils.copyProperties(awardList, sysActivityAward);
+                sysActivityAwardService.updateById(sysActivityAward);
+            } else{
+                SysActivityAward sysActivityAward = new SysActivityAward();
+                BeanUtils.copyProperties(awardList, sysActivityAward);
+                sysActivityAward.setActivityId(sysActivityAwardVo.getActivityId());
+                sysActivityAwardList.add(sysActivityAward);
+            }
+        }
+        sysActivityAwardService.saveBatch(sysActivityAwardList);
+        return HttpResult.ok("添加奖品成功");
+    }
+
+    @Override
+    public HttpResult deleteActivity(String id) {
+        SysActivity sysActivity = sysActivityService.getById(id);
+        if (Objects.isNull(sysActivity)) {
+            throw new RuntimeException("活动不存在");
+        }
+        sysActivity.setIsDelete("1");
+        sysActivityService.updateById(sysActivity);
+        return HttpResult.ok("删除活动成功");
+    }
+
+    @Override
+    public HttpResult getActivity(SysActivityVo sysActivityVo) {
+        SysActivity sysActivity = sysActivityService.getById(sysActivityVo.getId());
+        if (Objects.isNull(sysActivity)) {
+            throw new RuntimeException("活动不存在");
+        }
+        List<SysActivityAward> awardList = sysActivityAwardMapper.selectList
+                (new LambdaQueryWrapper<SysActivityAward>().eq(SysActivityAward::getActivityId, sysActivityVo.getId()));
+        for (SysActivityAward award : awardList) { // 奖品图片
+            SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(award.getAwardImg());
+            if (!Objects.isNull(sysUploadFiles)) {
+                award.setImageUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
+            }
+        }
+        sysActivity.setAwardList(awardList);
+
+        return HttpResult.ok(sysActivity);
+    }
+
+    @Override
+    public Page<SysActivity> getActivityList(Page page,SysActivityVo sysActivityVo) {
+        return baseMapper.getSysActivityList(page,sysActivityVo);
+    }
+}

tenant/organization/src/main/resources/application.yml

@@ -45,6 +45,8 @@ tenant:
     - sys_organization_user_link
     - sys_upload_files
     - sys_config
+    - sys_activity
+    - sys_activity_award
   ignoreLoginNames:
 
 data-scope:

tenant/organization/src/main/resources/mapper/SysActivityMapper.xml

@@ -0,0 +1,21 @@
+<?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.jzg.organization.mapper.SysActivityMapper">
+    <select id="getSysActivityList" resultType="com.jzg.commons.entity.po.SysActivity">
+        select
+            *,
+            sd.name as actDept
+        from
+            sys_activity sa
+        left join sys_dept sd on sa.act_dept = sd.id
+        where
+            1=1
+          and sa.is_delete = '0'
+        <if test="sysActivityVo.actName != null and sysActivityVo.actName != ''">
+            and sa.act_name like concat('%',#{sysActivityVo.actName},'%')
+        </if>
+        <if test="sysActivityVo.actStatus != null and sysActivityVo.actStatus != ''">
+            and sa.act_status = #{sysActivityVo.actStatus}
+        </if>
+    </select>
+</mapper>