更改指标参数

smarking/src/main/java/com/xhkjedu/smarking/controller/wholeparam/MspGradeparamController.java

@@ -1,6 +1,6 @@
 package com.xhkjedu.smarking.controller.wholeparam;
 
-import com.xhkjedu.smarking.model.wholeparam.MspGradeparam;
+import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
 import com.xhkjedu.smarking.service.wholeparam.MspGradeparamService;
 import com.xhkjedu.smarking.vo.wholeparam.GradeParams;
 import com.xhkjedu.utils.N_Utils;
@@ -14,12 +14,12 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * @Description：阅卷指标参数-等级类
+ * @Description：阅卷指标参数-报告参数
  * @Author: WN
  * @Date: 2024/12/2 16:46:46
  **/
 @RestController
-@RequestMapping("/gparam")
+@RequestMapping("/rparam")
 public class MspGradeparamController {
     @Resource
     private MspGradeparamService mspGradeparamService;
@@ -33,7 +33,7 @@ public class MspGradeparamController {
      **/
     @PostMapping("/save")
     public ResultVo save(@RequestBody GradeParams gradeparam) {
-        N_Utils.validation(new Object[]{gradeparam.getSchoolid(), "学校id", 1,gradeparam.getGpbelong(),"归属菜单",2});
+        N_Utils.validation(new Object[]{gradeparam.getSchoolid(), "学校id", 1,gradeparam.getRpbelong(),"归属菜单",2});
         if(gradeparam.getGradeid() == null){
             return new ResultVo(1, "年级不能为空");
         }
@@ -54,11 +54,11 @@ public class MspGradeparamController {
      **/
     @PostMapping("/detail")
     public ResultVo detail(@RequestBody GradeParams gradeparam) {
-        N_Utils.validation(new Object[]{gradeparam.getSchoolid(), "学校id", 1,gradeparam.getGpbelong(),"归属菜单",2});
+        N_Utils.validation(new Object[]{gradeparam.getSchoolid(), "学校id", 1,gradeparam.getRpbelong(),"归属菜单",2});
         if(gradeparam.getGradeid() == null){
             return new ResultVo(1, "年级不能为空");
         }
-        List<MspGradeparam> rtnParams = mspGradeparamService.getMspGradeparam(gradeparam);
+        List<MspReportparam> rtnParams = mspGradeparamService.getMspGradeparam(gradeparam);
         return new ResultVo(0, "保存成功",rtnParams);
     }
 

smarking/src/main/java/com/xhkjedu/smarking/mapper/wholeparam/MspGradeparamMapper.java

@@ -1,7 +1,7 @@
 package com.xhkjedu.smarking.mapper.wholeparam;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.smarking.model.wholeparam.MspGradeparam;
+import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
 import com.xhkjedu.smarking.vo.wholeparam.GradeParams;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,10 +12,10 @@ import java.util.List;
  * @Author: WN
  * @Date: 2024/12/2 16:14:48
  **/
-public interface MspGradeparamMapper extends TkMapper<MspGradeparam> {
+public interface MspGradeparamMapper extends TkMapper<MspReportparam> {
 
     //获取学校年级下指定模块参数
-    List<MspGradeparam> getGradeParamByGradeAndBelong(@Param("gp") GradeParams gp);
+    List<MspReportparam> getGradeParamByGradeAndBelong(@Param("gp") GradeParams gp);
     //删除
     int deleteGradeparam(@Param("gp")GradeParams gp);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/wholeparam/MspGradeparam.java → smarking/src/main/java/com/xhkjedu/smarking/model/wholeparam/MspReportparam.java

@@ -7,23 +7,23 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
- * @Description 阅卷指标参数-等级类参数表
+ * @Description 阅卷指标参数-报考参数表
  * @Author auto
  * @Date 2024-12-02
  */
 @Data
-@Table(name = "msp_gradeparam")
-public class MspGradeparam extends BaseBean {
+@Table(name = "msp_reportparam")
+public class MspReportparam extends BaseBean {
     @Id
     //等级类参数ID
-    private Integer gpid;
+    private Integer rpid;
     //年级 0通用
     private Integer gradeid;
     //归属：allrate班级对比表综合率  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现
     //  keystu重点学生信息
-    private String gpbelong;
+    private String rpbelong;
     //类型
-    private Integer gptype;
+    private Integer rptype;
     //等级值
     private Integer gradenum;
     //科目ID

smarking/src/main/java/com/xhkjedu/smarking/service/wholeparam/MspGradeparamService.java

@@ -1,7 +1,7 @@
 package com.xhkjedu.smarking.service.wholeparam;
 
 import com.xhkjedu.smarking.mapper.wholeparam.MspGradeparamMapper;
-import com.xhkjedu.smarking.model.wholeparam.MspGradeparam;
+import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
 import com.xhkjedu.smarking.vo.wholeparam.GradeParams;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * @Description：阅卷指标参数-等级类
+ * @Description：阅卷指标参数-报考参数表
  * @Author: WN
  * @Date: 2024/12/2 16:19:44
  **/
@@ -21,7 +21,7 @@ public class MspGradeparamService {
     private MspGradeparamMapper mspGradeparamMapper;
 
     /*
-     * @Description 保存等级参数
+     * @Description 保存参数
      * @Date 2024/12/2 16:46:10
      * @Author WN
      * @Param [mspGradeparam]
@@ -29,21 +29,21 @@ public class MspGradeparamService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void saveGradeparam(GradeParams gradeParams) {
-        List<MspGradeparam> originalParams = mspGradeparamMapper.getGradeParamByGradeAndBelong(gradeParams);
+        List<MspReportparam> originalParams = mspGradeparamMapper.getGradeParamByGradeAndBelong(gradeParams);
 
         if(originalParams!= null && originalParams.size() > 0) {
             mspGradeparamMapper.deleteGradeparam(gradeParams);
         }
 
         Integer timestamp = N_Utils.getSecondTimestamp();
-        List<MspGradeparam> params = gradeParams.getParams();
-        for(MspGradeparam param : params) {
-            param.setGpbelong(gradeParams.getGpbelong());
+        List<MspReportparam> params = gradeParams.getParams();
+        for(MspReportparam param : params) {
+            param.setRpbelong(gradeParams.getRpbelong());
             param.setGradeid(gradeParams.getGradeid());
             param.setHandleid(gradeParams.getHandleid());
             param.setSchoolid(gradeParams.getSchoolid());
             param.setHandletime(timestamp);
-            if(param.getGptype() == null) param.setGptype(0);
+            if(param.getRptype() == null) param.setRptype(0);
             if(param.getGradenum() == null) param.setGradenum(0);
         }
         mspGradeparamMapper.insertList(params);
@@ -51,13 +51,13 @@ public class MspGradeparamService {
     }
 
     /*
-     * @Description 保存等级参数
+     * @Description 获取参数
      * @Date 2024/12/2 16:46:15
      * @Author WN
      * @Param [mspGradeparam]
      * @Return com.xhkjedu.smarking.model.wholeparam.MspGradeparam
      **/
-    public List<MspGradeparam> getMspGradeparam(GradeParams mspGradeparam) {
+    public List<MspReportparam> getMspGradeparam(GradeParams mspGradeparam) {
         return mspGradeparamMapper.getGradeParamByGradeAndBelong(mspGradeparam);
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/wholeparam/GradeParams.java

@@ -1,6 +1,6 @@
 package com.xhkjedu.smarking.vo.wholeparam;
 
-import com.xhkjedu.smarking.model.wholeparam.MspGradeparam;
+import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
 import lombok.Data;
 
 import java.util.List;
@@ -10,7 +10,6 @@ import java.util.List;
  * @Author: WN
  * @Date: 2024/12/3 9:41:33
  **/
-
 @Data
 public class GradeParams {
 
@@ -18,12 +17,12 @@ public class GradeParams {
     private Integer gradeid;
     //归属：allrate班级对比表综合率  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现
     //  keystu重点学生信息
-    private String gpbelong;
+    private String rpbelong;
     //操作人ID
     private Integer handleid;
 
     //学校ID
     private Integer schoolid;
 
-    private List<MspGradeparam> params;//所有参数集合
+    private List<MspReportparam> params;//所有参数集合
 }

smarking/src/main/resources/mapper/wholeparam/MsGradeparamMapper.xml

@@ -3,12 +3,12 @@
 <mapper namespace="com.xhkjedu.smarking.mapper.wholeparam.MspGradeparamMapper">
 
     <!--获取学校年级下指定模块参数-->
-    <select id="getGradeParamByGradeAndBelong" resultType="com.xhkjedu.smarking.model.wholeparam.MspGradeparam">
-        select * from msp_gradeparam where schoolid = #{gp.schoolid} and gradeid=#{gp.gradeid} and gpbelong = #{gp.gpbelong}
+    <select id="getGradeParamByGradeAndBelong" resultType="com.xhkjedu.smarking.model.wholeparam.MspReportparam">
+        select * from msp_reportparam where schoolid = #{gp.schoolid} and gradeid=#{gp.gradeid} and rpbelong = #{gp.rpbelong}
     </select>
 
     <!--删除-->
     <delete id="deleteGradeparam">
-        delete from msp_gradeparam where schoolid = #{gp.schoolid} and gradeid=#{gp.gradeid} and gpbelong = #{gp.gpbelong}
+        delete from msp_reportparam where schoolid = #{gp.schoolid} and gradeid=#{gp.gradeid} and rpbelong = #{gp.rpbelong}
     </delete>
 </mapper>