change před 4 roky
rodič
revize
ca84cc0a9e

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskAddBo.java

@@ -59,4 +59,9 @@ public class ActivityTaskAddBo {
     @Excel(name = "分数范围 适用与考试积分获得")
     @ApiModelProperty("分数范围 适用与考试积分获得")
     private List<ActivityTaskTimeAddBo> activityTaskTimeAddBo;
+
+    /** 最低分数 */
+    @Excel(name = "最低分数")
+    @ApiModelProperty("最低分数")
+    private Integer minNum;
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskEditBo.java

@@ -69,4 +69,9 @@ public class ActivityTaskEditBo {
     @Excel(name = "分数范围 适用与考试积分获得")
     @ApiModelProperty("分数范围 适用与考试积分获得")
     private List<ActivityTaskTimeEditBo> activityTaskTimeEditBoList;
+
+    /** 最低分数 */
+    @Excel(name = "最低分数")
+    @ApiModelProperty("最低分数")
+    private Integer minNum;
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskQueryBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -68,4 +69,8 @@ public class ActivityTaskQueryBo extends BaseEntity {
 	@ApiModelProperty("0 停用 1启用")
 	private Long userId;
 
+	/** 最低分数 */
+	@ApiModelProperty("最低分数")
+	private Integer minNum;
+
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGradePrivilegeCoures.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -31,4 +32,8 @@ private static final long serialVersionUID=1L;
     /** 关联课程id */
     private Long courseId;
 
+
+    /** 所属类型 */
+    private Integer status;
+
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTask.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -64,4 +65,7 @@ private static final long serialVersionUID=1L;
     /** 0 停用 1启用 */
     private Integer status;
 
+    /** 最低分数 */
+    private Integer minNum;
+
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeCouresMapper.java

@@ -17,5 +17,5 @@ public interface ActivityGradePrivilegeCouresMapper extends BaseMapper<ActivityG
      * @param setCourseId 课程绑定
      *
      */
-    void insertCouse(ActivityGradePrivilegeCoures setCourseId);
+    int insertCouse(ActivityGradePrivilegeCoures setCourseId);
 }

+ 23 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradeServiceImpl.java

@@ -120,6 +120,14 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         return voList;
     }
 
+    public static void main(String[] args) {
+        String str = "[1,2]";
+        String substring = str.substring(1, 2);
+        String substring1 = str.substring(3, 4);
+        System.out.println("截取最后一个字符串生成的新字符串为: " + substring);//abcdef
+        System.out.println("截取最后一个字符串生成的新字符串为: " + substring1);//abcdef
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ActivityGradeAddBo bo) {
@@ -134,9 +142,21 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
                 ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
                 activityGradePrivilege.setGradeId(add.getId());
                 activityGradePrivilegeService.save(activityGradePrivilege);
-                Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresMapper
-                        .insertCouse(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
-                                .setCourseId(Convert.toLong(c))));
+                Arrays.stream(p.getCourseIds()).forEach(c -> {
+                    ActivityGradePrivilegeCoures activityGradePrivilegeCoures = new ActivityGradePrivilegeCoures();
+                    activityGradePrivilegeCoures.setPrivilegeId(activityGradePrivilege.getId());
+                    String substring = c.substring(1, 2);
+                    if ("1".equals(substring)) {
+                        activityGradePrivilegeCoures.setStatus(1);
+                    }else {
+                        activityGradePrivilegeCoures.setStatus(2);
+                    }
+                        String substring1 = c.substring(3, 4);
+                        activityGradePrivilegeCoures.setCourseId(Convert.toLong(substring1));
+                    int i = activityGradePrivilegeCouresMapper.insertCouse(activityGradePrivilegeCoures);
+                    System.out.println(i);
+
+                });
             });
         }
         //添加特权绑定的

+ 7 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskVo.java

@@ -39,6 +39,13 @@ public class ActivityTaskVo {
 	@Excel(name = "积分上限")
 	@ApiModelProperty("积分上限")
 	private Integer endIntegral;
+
+
+
+	/** 最低分数 */
+	@Excel(name = "最低分数")
+	@ApiModelProperty("最低分数")
+	private Integer minNum;
 	/** 备注 */
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")

+ 5 - 3
zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityGradePrivilegeCouresMapper.xml

@@ -9,13 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId" column="course_id"/>
     </resultMap>
 
-    <insert id="insertCouse" parameterType="map">
+    <insert id="insertCouse" parameterType="map" >
         insert into activity_grade_privilege_coures (
             privilege_id,
-            course_id
+            course_id,
+            status
         )values(
                    #{privilegeId},
-                   #{courseId}
+                   #{courseId},
+                   #{status}
                )
     </insert>
 </mapper>