新增查询分类 和 得票数排名接口

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/votingactivity/VotingActivityJoinItemController.java

@@ -44,6 +44,9 @@ public class VotingActivityJoinItemController {
     @Resource
     private VotingActivityJoinItemService votingActivityJoinItemService;
 
+
+
+
     @PostMapping("/create")
     @Operation(summary = "创建投票活动参与被投票的")
 //    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-item:create')")
@@ -51,6 +54,12 @@ public class VotingActivityJoinItemController {
         return success(votingActivityJoinItemService.createVotingActivityJoinItem(createReqVO));
     }
 
+    @Operation(summary = "获取候选人类型")
+    @GetMapping("/categorys")
+    public CommonResult<List<String>> getVotingActivityJoinItemCategorys(@RequestParam("votingActivityId")Long votingActivityId) {
+        return success(votingActivityJoinItemService.getVotingActivityJoinItemCategorys(votingActivityId));
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新投票活动参与被投票的")
 //    @PreAuthorize("@ss.hasPermission('mde:voting-activity-join-item:update')")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/votingactivity/vo/VotingActivityJoinItemPageReqVO.java

@@ -15,6 +15,13 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 @ToString(callSuper = true)
 public class VotingActivityJoinItemPageReqVO extends PageParam {
 
+
+    /**
+     * 0.序号排序 也是默认
+     * 1.得票排序
+     */
+    private Integer sortType=0;
+
     @Schema(description = "活动id", example = "27263")
     private Long votingActivityId;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/votingactivity/AppVotingActivityJoinItemController.java

@@ -54,4 +54,7 @@ public class AppVotingActivityJoinItemController {
 
 
 
+
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/votingactivity/VotingActivityJoinItemMapper.java

@@ -30,7 +30,9 @@ public interface VotingActivityJoinItemMapper extends BaseMapperX<VotingActivity
                 .eqIfPresent(VotingActivityJoinItemDO::getNum, reqVO.getNum())
                 .betweenIfPresent(VotingActivityJoinItemDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(VotingActivityJoinItemDO::getHeadImg, reqVO.getHeadImg())
-                .orderByDesc(VotingActivityJoinItemDO::getVotingActivityJoinItemId));
+                .orderByDesc(0==reqVO.getSortType()?VotingActivityJoinItemDO::getVotingActivityJoinItemId:VotingActivityJoinItemDO::getVotingActivityJoinItemNum)
+
+        );
     }
 
     @Select("select ifnull(max(num),0) from mde_voting_activity_join_item where voting_activity_id =#{votingActivityId} ")
@@ -38,4 +40,7 @@ public interface VotingActivityJoinItemMapper extends BaseMapperX<VotingActivity
 
     @Update("update mde_voting_activity_join_item  set voting_activity_join_item_num =voting_activity_join_item_num+1   where voting_activity_join_item_id=#{votingActivityJoinItemId}")
     void votingAdd(Long votingActivityJoinItemId);
+
+    @Select("select voting_activity_join_item_category  from mde_voting_activity_join_item where   voting_activity_id=#{votingActivityId}  group by voting_activity_join_item_category")
+    List<String> getVotingActivityJoinItemCategorys(@Param("votingActivityId") Long votingActivityId);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/votingactivity/VotingActivityJoinItemService.java

@@ -53,4 +53,7 @@ public interface VotingActivityJoinItemService {
     PageResult<VotingActivityJoinItemDO> getVotingActivityJoinItemPage(VotingActivityJoinItemPageReqVO pageReqVO);
 
     void votingAdd(Long votingActivityJoinItemId);
-}
+
+    List<String> getVotingActivityJoinItemCategorys(Long votingActivityId);
+
+ }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/votingactivity/VotingActivityJoinItemServiceImpl.java

@@ -84,4 +84,11 @@ public class VotingActivityJoinItemServiceImpl implements VotingActivityJoinItem
             votingActivityJoinItemMapper.votingAdd(votingActivityJoinItemId);
         }
 
+        @Override
+        public List<String> getVotingActivityJoinItemCategorys(Long votingActivityId) {
+          return   votingActivityJoinItemMapper.getVotingActivityJoinItemCategorys(votingActivityId);
+        }
+
+
+
 }