训练营分组ID自增

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampBonusLog.java

@@ -131,7 +131,7 @@ public class KxsCampBonusLog extends Model<KxsCampBonusLog> implements Serializa
      * 组 ID
      */
     @Schema(description = "组 ID")
-    private String groupId;
+    private Integer groupId;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampGroup.java

@@ -26,14 +26,12 @@ public class KxsCampGroup extends Model<KxsCampGroup> implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    
-    
     /**
-     * 主键ID
+     * 分组ID
      */
-    @Schema(description = "主键ID")
+    @Schema(description = "分组ID")
     @TableId(type = IdType.AUTO)
-    private Integer id;
+    private Integer groupId;
 
 
     /**
@@ -75,12 +73,6 @@ public class KxsCampGroup extends Model<KxsCampGroup> implements Serializable {
     private String groupName;
 
 
-    /**
-     * 分组ID
-     */
-    @Schema(description = "分组ID")
-    @NotBlank(message = "分组ID不能为空")
-    private String groupId;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampUser.java

@@ -156,7 +156,7 @@ public class KxsCampUser extends Model<KxsCampUser> implements Serializable {
      */
     @Schema(description = "分组ID")
     @ExcelProperty(value = "分组ID")
-    private String groupId;
+    private Integer groupId;
 
 
 }

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/camp/CampUserExcelVO.java

@@ -52,7 +52,7 @@ public class CampUserExcelVO implements Serializable {
 	 */
 	@NotBlank(message = "分组编号不能为空")
 	@ExcelProperty("分组编号")
-	private String groupId;
+	private Integer groupId;
 
 
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysCampController.java

@@ -222,14 +222,14 @@ public class SysCampController {
     /**
      * 训练营-分组-删除
      *
-     * @param id 主键ID结合
+     * @param groupId 主键ID结合
      * @return 训练营-分组-删除
      */
-    @DeleteMapping("/groupDelete/{id}")
+    @DeleteMapping("/groupDelete/{groupId}")
     //    @PreAuthorize("@pms.hasPermission('sys_camp_group_remove')")
-    public R groupDelete(@PathVariable("id") Integer id) {
+    public R groupDelete(@PathVariable("groupId") Integer groupId) {
 
-        return R.ok(kxsCampGroupService.removeByData(id));
+        return R.ok(kxsCampGroupService.removeByData(groupId));
     }
 
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsCampGroupService.java

@@ -22,9 +22,9 @@ public interface KxsCampGroupService extends IService<KxsCampGroup> {
     /**
      * 按数据删除
      *
-     * @param id 同上
+     * @param groupId 同上
      * @return {@link Boolean}
      */
-    Boolean removeByData(Integer id);
+    Boolean removeByData(Integer groupId);
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampGroupServiceImpl.java

@@ -48,14 +48,14 @@ public class KxsCampGroupServiceImpl extends ServiceImpl<KxsCampGroupMapper, Kxs
     }
 
     @Override
-    public Boolean removeByData(Integer id) {
+    public Boolean removeByData(Integer groupId) {
 
-        KxsCampGroup group = getById(id);
+        KxsCampGroup group = getById(groupId);
         long count = kxsCampUserMapper.selectCount(Wrappers.<KxsCampUser>lambdaQuery().eq(KxsCampUser::getGroupId, group.getGroupId()));
         if(count > 0){
             throw new GlobalCustomerException("该分组下存在成员，无法删除");
         }
-        return removeById(id);
+        return removeById(groupId);
     }
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampReportServiceImpl.java

@@ -13,6 +13,7 @@ import com.kxs.system.api.model.KxsCampBonusLog;
 import com.kxs.system.api.model.KxsCampReport;
 import com.kxs.system.api.model.KxsCampUser;
 import com.kxs.system.api.vo.admin.camp.ReportCampPageVO;
+import com.kxs.system.biz.constant.enums.CampStatusEnum;
 import com.kxs.system.biz.mapper.KxsCampBonusLogMapper;
 import com.kxs.system.biz.mapper.KxsCampMapper;
 import com.kxs.system.biz.mapper.KxsCampReportMapper;
@@ -85,14 +86,15 @@ public class KxsCampReportServiceImpl extends ServiceImpl<KxsCampReportMapper, K
             campReport.setStatus(param.getStatus());
             campReport.setRemark(param.getRemark());
         }
+        KxsCamp kxsCamp = kxsCampMapper.selectById(campReport.getCampId());
+        Optional.ofNullable(kxsCamp).orElseThrow(() -> new GlobalCustomerException("训练营不存在"));
         //审核通过
         if(param.getStatus() == 1) {
-            campReport.setStatus(param.getStatus());
-            //查询此用户数否参加训练营
-            KxsCamp kxsCamp = kxsCampMapper.selectUserCamp(campReport.getUserId().intValue());
-            if (kxsCamp == null) {
-                throw new GlobalCustomerException("用户未报名训练营");
+            if(!Objects.equals(kxsCamp.getStatus(), CampStatusEnum.STATUS_NORMAL.getType())){
+
+                throw new GlobalCustomerException("该报备已失效");
             }
+            campReport.setStatus(param.getStatus());
 
             KxsCampUser kxsCampUser = kxsCampUserMapper.selectOne(Wrappers.<KxsCampUser>lambdaQuery()
                     .eq(KxsCampUser::getCampId, kxsCamp.getId())