diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java index a5296ec..f06ef6a 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java @@ -1,9 +1,14 @@ package com.ruoyi.flyingbook.controller; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.enums.LarkActiveStageEnum; import com.ruoyi.flyingbook.domain.LarkActive; +import com.ruoyi.flyingbook.domain.LarkUserActiveInviteRelatoin; +import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin; import com.ruoyi.flyingbook.domain.edi.ResponseVo; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveCountVo; import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveUserRelationRequest; import com.ruoyi.flyingbook.domain.larkactive.LarkActiveVo; import com.ruoyi.flyingbook.service.ILarkActiveService; import com.ruoyi.flyingbook.service.ILarkUserActiveInviteRelatoinService; @@ -14,6 +19,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RestController public class LarkActiveController extends BaseController { @@ -34,11 +41,11 @@ public class LarkActiveController extends BaseController { } /** - * 通过活动id查询 活动明细 todo yxy 判断当前用户是否完成 + * 通过活动id查询 活动明细 */ @PostMapping("/getAcitveById") public ResponseVo getAcitveById(@RequestBody LarkActiveRequest request) { - LarkActive larkActive = larkActiveService.selectLarkActiveById(request.getLarkActiveId()); + LarkActive larkActive = larkActiveService.getActiveInfo(request); return new ResponseVo(larkActive); } @@ -52,40 +59,60 @@ public class LarkActiveController extends BaseController { } /** - * 查询所有待审核的提交信息 todo yxy + * 查询所有待审核的提交信息 */ @PostMapping("/queryWaitReview") - public ResponseVo queryWaitReview() { - return new ResponseVo(); + public ResponseVo queryWaitReview(@RequestBody LarkActiveUserRelationRequest request) { + request.setActiveStage(LarkActiveStageEnum.SUBMIT.getCode()); + return larkUserActiveRelatoinService.queryPage(request); + } + + /** + * 查询所有待审核的提交信息 + */ + @PostMapping("/approve") + public void approve(@RequestBody LarkUserActiveRelatoin request) { + request.setActiveStage(LarkActiveStageEnum.ADJUST.getCode()); + larkUserActiveRelatoinService.updateLarkUserActiveRelatoin(request); } /** - * 查询已经完成所有活动的人的名称 todo yxy + * 查询已经完成所有活动的人的名称 */ @PostMapping("/queryCompleteActiveList") - public ResponseVo queryCompleteActiveList() { - return new ResponseVo(); + public ResponseVo queryCompleteActiveList(@RequestBody LarkActiveRequest request) { + List list = larkActiveService.queryCompleteActiveUserName(request.getCompanyName()); + return new ResponseVo(list); } /** - * 查询当前登陆人已经完成所有活动的名称 todo yxy + * 查询当前登陆人已经完成所有活动 */ @PostMapping("/queryMyCompleteActiveList") - public ResponseVo queryMyCompleteActiveList() { - return new ResponseVo(); + public ResponseVo queryMyCompleteActiveList(@RequestBody LarkActiveRequest request) { + List larkActives = larkActiveService.queryCompleteActiveByUserName(request); + return new ResponseVo(larkActives); } /** - * 查询邀请的top 10的人的信息 todo yxy + * 查询邀请的top 10的人的信息 */ @PostMapping("/queryInviteTopTen") - public ResponseVo queryInviteTopTen() { - return new ResponseVo(); + public ResponseVo queryInviteTopTen(LarkUserActiveInviteRelatoin request) { + List larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinService.queryTopTen(request); + return new ResponseVo(larkUserActiveInviteRelatoins); } - + /** + * 查询后台需要的数据 + */ + @PostMapping("/queryCount") + public ResponseVo queryCount(@RequestBody LarkUserActiveRelatoin request) { + LarkActiveCountVo larkActiveCountVo = larkUserActiveRelatoinService.queryCount(request); + return new ResponseVo(larkActiveCountVo); + } } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCountVo.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCountVo.java new file mode 100644 index 0000000..8a08691 --- /dev/null +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveCountVo.java @@ -0,0 +1,30 @@ +package com.ruoyi.flyingbook.domain.larkactive; + +import com.ruoyi.flyingbook.domain.LarkActive; +import lombok.Data; + +import java.util.List; + +/** + * 【请填写功能名称】对象 lark_active + * + * @author ruoyi + * @date 2023-08-16 + */ +@Data +public class LarkActiveCountVo { + + /** + * 总点击量 + */ + private Integer totalClickQty; + /** + * 总用户量 + */ + private Integer totalUserQty; + /** + * 各个模块的参与人数 + */ + private List activeUserQtyList; + +} diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java index 567d3b8..aa76aef 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java @@ -3,6 +3,8 @@ package com.ruoyi.flyingbook.domain.larkactive; import com.ruoyi.common.core.domain.RequestVo; import lombok.Data; +import java.util.List; + /** * @author yuxiangyong * @create 2023-08-16 16:58 @@ -13,6 +15,7 @@ public class LarkActiveRequest extends RequestVo { private String companyName; private Long larkActiveId; + private List larkActiveIdList; private String userName; /** diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java new file mode 100644 index 0000000..719e0f2 --- /dev/null +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java @@ -0,0 +1,29 @@ +package com.ruoyi.flyingbook.domain.larkactive; + +import com.ruoyi.common.core.domain.RequestVo; +import lombok.Data; + +/** + * @author yuxiangyong + * @create 2023-08-16 16:58 + */ +@Data +public class LarkActiveUserRelationRequest extends RequestVo { + + private String companyName; + + private Long larkActiveId; + private String userName; + + /** + * @see com.ruoyi.common.enums.FlagStatus + */ + private Long flag; + + /** + * 活动阶段 + * @see com.ruoyi.common.enums.LarkActiveStageEnum + */ + private String activeStage; + +} diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveVo.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveVo.java index 15a0d57..1173d9a 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveVo.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveVo.java @@ -17,4 +17,6 @@ public class LarkActiveVo extends LarkActive { */ private Boolean complete; + private Integer qty; + } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java index f8aa265..043ffe3 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java @@ -29,6 +29,7 @@ public interface LarkActiveMapper { public List selectLarkActiveList(LarkActive larkActive); public Integer count(LarkActive larkActive); public List queryPage(LarkActiveRequest request); + public List queryCompleteActive(LarkActiveRequest larkActive); /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java index 02a4d46..1dee077 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java @@ -27,6 +27,8 @@ public interface LarkUserActiveInviteRelatoinMapper { */ public List selectLarkUserActiveInviteRelatoinList(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveRelatoinMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveRelatoinMapper.java index fc4e8fd..13f5761 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveRelatoinMapper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveRelatoinMapper.java @@ -1,6 +1,10 @@ package com.ruoyi.flyingbook.mapper; import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveCountVo; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveUserRelationRequest; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveVo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,6 +30,12 @@ public interface LarkUserActiveRelatoinMapper { * @return 【请填写功能名称】集合 */ public List selectLarkUserActiveRelatoinList(LarkUserActiveRelatoin larkUserActiveRelatoin); + public List queryPage(LarkActiveUserRelationRequest larkUserActiveRelatoin); + public int count(LarkUserActiveRelatoin larkUserActiveRelatoin); + public List queryCompleteActiveUserName(@Param("count") Integer count,@Param("companyName") String companyName); + + public int queryUserCount(LarkUserActiveRelatoin larkUserActiveRelatoin); + public List queryUserCountGroupByActive(LarkUserActiveRelatoin larkUserActiveRelatoin); /** * 新增【请填写功能名称】 diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java index b4038df..9b897cf 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java @@ -33,6 +33,9 @@ public interface ILarkActiveService { public List selectLarkActiveList(LarkActive larkActive); ResponseVo queryPage(LarkActiveRequest request); + public List queryCompleteActiveUserName(String companyName); + public List queryCompleteActiveByUserName(LarkActiveRequest larkActive); + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java index 8f54559..f3cbc5e 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveInviteRelatoinService.java @@ -27,6 +27,8 @@ public interface ILarkUserActiveInviteRelatoinService { */ public List selectLarkUserActiveInviteRelatoinList(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java index 9b53e21..62a85f7 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkUserActiveRelatoinService.java @@ -1,6 +1,9 @@ package com.ruoyi.flyingbook.service; import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin; +import com.ruoyi.flyingbook.domain.edi.ResponseVo; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveCountVo; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveUserRelationRequest; import java.util.List; @@ -19,6 +22,8 @@ public interface ILarkUserActiveRelatoinService { */ public LarkUserActiveRelatoin selectLarkUserActiveRelatoinById(Long id); + public LarkActiveCountVo queryCount(LarkUserActiveRelatoin request); + /** * 查询【请填写功能名称】列表 * @@ -26,6 +31,7 @@ public interface ILarkUserActiveRelatoinService { * @return 【请填写功能名称】集合 */ public List selectLarkUserActiveRelatoinList(LarkUserActiveRelatoin larkUserActiveRelatoin); + public ResponseVo queryPage(LarkActiveUserRelationRequest request); /** * 新增【请填写功能名称】 diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java index abe3c3b..6185517 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.flyingbook.service.impl; import com.ruoyi.common.enums.FlagStatus; +import com.ruoyi.common.enums.LarkActiveStageEnum; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.flyingbook.domain.LarkActive; import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin; @@ -16,6 +17,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -91,6 +93,19 @@ public class LarkActiveServiceImpl implements ILarkActiveService { return new ResponseVo(request.getCurrentPage(),request.getPageSize(),null,count); } + @Override + public List queryCompleteActiveUserName(String companyName) { + LarkActive larkActive = new LarkActive(); + larkActive.setFlag(FlagStatus.OK.getCode()); + Integer count = larkActiveMapper.count(larkActive); + return larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count,companyName); + } + + @Override + public List queryCompleteActiveByUserName(LarkActiveRequest larkActive) { + return larkActiveMapper.queryCompleteActive(larkActive); + } + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java index 2e9d732..b77c641 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.flyingbook.service.impl; +import com.ruoyi.common.enums.FlagStatus; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.flyingbook.domain.LarkUserActiveInviteRelatoin; import com.ruoyi.flyingbook.mapper.LarkUserActiveInviteRelatoinMapper; @@ -42,6 +43,12 @@ public class LarkUserActiveInviteRelatoinServiceImpl implements ILarkUserActiveI return larkUserActiveInviteRelatoinMapper.selectLarkUserActiveInviteRelatoinList(larkUserActiveInviteRelatoin); } + @Override + public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin) { + larkUserActiveInviteRelatoin.setFlag(FlagStatus.OK.getCode()); + return larkUserActiveInviteRelatoinMapper.queryTopTen(larkUserActiveInviteRelatoin); + } + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java index 9671a9b..47862b2 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java @@ -1,13 +1,28 @@ package com.ruoyi.flyingbook.service.impl; +import com.ruoyi.common.enums.FlagStatus; +import com.ruoyi.common.enums.LarkActiveStageEnum; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.flyingbook.domain.LarkActive; import com.ruoyi.flyingbook.domain.LarkUserActiveRelatoin; +import com.ruoyi.flyingbook.domain.edi.ResponseVo; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveCountVo; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveUserRelationRequest; +import com.ruoyi.flyingbook.domain.larkactive.LarkActiveVo; +import com.ruoyi.flyingbook.mapper.LarkActiveMapper; import com.ruoyi.flyingbook.mapper.LarkUserActiveRelatoinMapper; import com.ruoyi.flyingbook.service.ILarkUserActiveRelatoinService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 【请填写功能名称】Service业务层处理 @@ -19,6 +34,8 @@ import java.util.List; public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoinService { @Autowired private LarkUserActiveRelatoinMapper larkUserActiveRelatoinMapper; + @Autowired + private LarkActiveMapper larkActiveMapper; /** * 查询【请填写功能名称】 @@ -31,6 +48,35 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi return larkUserActiveRelatoinMapper.selectLarkUserActiveRelatoinById(id); } + @Override + public LarkActiveCountVo queryCount(LarkUserActiveRelatoin request) { + LarkActiveCountVo larkActiveCountVo = new LarkActiveCountVo(); + LarkUserActiveRelatoin larkUserActiveRelatoin = new LarkUserActiveRelatoin(); + larkUserActiveRelatoin.setActiveStage(LarkActiveStageEnum.ADJUST.getCode()); + larkUserActiveRelatoin.setFlag(FlagStatus.OK.getCode()); + larkUserActiveRelatoin.setUserName(request.getUserName()); + int userCount = larkUserActiveRelatoinMapper.queryUserCount(larkUserActiveRelatoin); + larkActiveCountVo.setTotalUserQty(userCount); + List larkActiveCountVos = larkUserActiveRelatoinMapper.queryUserCountGroupByActive(larkUserActiveRelatoin); + if (CollectionUtils.isNotEmpty(larkActiveCountVos)){ + List activeIdList = larkActiveCountVos.stream().map(LarkActiveVo::getId).distinct().collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(activeIdList)){ + LarkActiveRequest query = new LarkActiveRequest(); + query.setFlag(FlagStatus.OK.getCode()); + query.setLarkActiveIdList(activeIdList); + Map activeMap = larkActiveMapper.queryCompleteActive(query).stream().collect(Collectors.toMap(LarkActive::getId, Function.identity(), (k1, k2) -> k1)); + for (LarkActiveVo activeCountVo : larkActiveCountVos) { + LarkActive larkActive = activeMap.get(activeCountVo.getId()); + if (larkActive != null){ + BeanUtils.copyProperties(larkActive,activeCountVo); + } + } + } + } + larkActiveCountVo.setActiveUserQtyList(larkActiveCountVos); + return larkActiveCountVo; + } + /** * 查询【请填写功能名称】列表 * @@ -42,6 +88,22 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi return larkUserActiveRelatoinMapper.selectLarkUserActiveRelatoinList(larkUserActiveRelatoin); } + @Override + public ResponseVo queryPage(LarkActiveUserRelationRequest request) { + if (request == null || StringUtils.isBlank(request.getCompanyName())){ + return new ResponseVo(request.getCurrentPage(),request.getPageSize()); + } + request.setFlag(FlagStatus.OK.getCode()); + LarkUserActiveRelatoin larkActive = new LarkUserActiveRelatoin(); + BeanUtils.copyProperties(request,larkActive); + Integer count = larkUserActiveRelatoinMapper.count(larkActive); + if (count > 0){ + List larkUserActiveRelatoins = larkUserActiveRelatoinMapper.queryPage(request); + return new ResponseVo(request.getCurrentPage(),request.getPageSize(),larkUserActiveRelatoins,count); + } + return new ResponseVo(request.getCurrentPage(),request.getPageSize(),null,count); + } + /** * 新增【请填写功能名称】 * diff --git a/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml index 56da2e4..7fe9cb5 100644 --- a/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml +++ b/ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select count(id) from lark_active and company_id = #{companyId} @@ -71,6 +71,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit #{offset},{pageSize} + + + + + + + + + + + - + + + + + - - + + insert into lark_user_active_relatoin company_id, @@ -54,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, flag, remark, - + #{companyId}, #{companyName}, @@ -67,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{flag}, #{remark}, - + @@ -89,11 +176,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from lark_user_active_relatoin where id = #{id} + delete + from lark_user_active_relatoin + where id = #{id} - delete from lark_user_active_relatoin where id in + delete from lark_user_active_relatoin where id in #{id}