Merge branch 'refs/heads/develop_zqc' into develop_rayson

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

@@ -32,8 +32,8 @@ import static com.citu.framework.apilog.core.enums.OperateTypeEnum.*;
 
 /**
  * @eo.api-type http
- * @eo.groupName 新门墩儿.投票活动.后台
- * @eo.path /admin-api/menduner/system/mde/voting-activity
+ * @eo.groupName 新门墩儿.投票活动.后台.候选者
+ * @eo.path /admin-api/menduner/system/mde/voting-activity-join-item
  */
 @Tag(name = "管理后台 - 投票活动参与被投票的")
 @RestController

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

@@ -50,7 +50,12 @@ public class VotingActivityJoinItemRespVO {
     private String headImg;
 
     @Schema(description = "上一名的票数")
-    @ExcelProperty("头像")
+    @ExcelProperty("上一名的票数")
     private Integer parentNum;
 
+    @Schema(description = "和上一名票数的差距")
+    //和上一名票数的差距
+    @ExcelProperty("和上一名票数的差距")
+    private Integer parentVotingActivityJoinItemNumSubtract;
+
 }

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

@@ -75,6 +75,7 @@ public class VotingActivityJoinItemServiceImpl implements VotingActivityJoinItem
             VotingActivityJoinItemDO votingActivityJoinItemDO = votingActivityJoinItemMapper.selectById(id);
             VotingActivityJoinItemDetailVO bean = BeanUtils.toBean(votingActivityJoinItemDO, VotingActivityJoinItemDetailVO.class);
             Integer parentNum = votingActivityJoinItemMapper.getParentNum(votingActivityJoinItemDO.getVotingActivityId(), bean.getVotingActivityJoinItemNum());
+            parentNum = null==parentNum?0:parentNum;
             bean.setParentVotingActivityJoinItemNumSubtract(bean.getVotingActivityJoinItemNum()-parentNum);
             return bean;
         }