he2802 1 年之前
父节点
当前提交
282ff62602

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -1684,6 +1684,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             exportVo.setStatus(vo.getReportStatus());
             exportVo.setScore(vo.getPerformance());
             exportVo.setRightRate(vo.getRightRate());
+            exportVo.setFromPlat(vo.getFromPlat());
             studyList.add(exportVo);
         }
         userPeriodExportVo.setRecordList(studyList);

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/system/service/impl/TopCostCategoryServiceImpl.java

@@ -102,7 +102,7 @@ public class TopCostCategoryServiceImpl extends ServiceImpl<TopCostCategoryMappe
         if(iTopCostTpItemService.count(new LambdaQueryWrapper<TopCostTpItem>()
                 .eq(TopCostTpItem::getItemCategory, entity.getCategoryId())
                 .ne(TopCostTpItem::getStatus, -1))>0){
-            throw new CustomException("该分类已被使用,无法编辑和删除");
+            throw new CustomException("该成本类别已被使用,无法编辑和删除");
         }
         if(Validator.isNotEmpty(entity.getStatus())&&entity.getStatus()==-1){
 

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserBankRecordAddBo.java

@@ -123,4 +123,6 @@ public class UserBankRecordAddBo {
     /** 做题模式 1章卷 2随机练习 */
     @ApiModelProperty("做题模式 1章卷 2随机练习 3模拟随机")
     private Long doMode;
+    @ApiModelProperty("来源平台 1小程序 2PC网站 3h5")
+    private Integer fromPlat;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserBankRecordEditBo.java

@@ -123,4 +123,6 @@ public class UserBankRecordEditBo {
     /** 模拟做题试卷ID */
     @ApiModelProperty("模拟做题试卷ID")
     private Long simulateExamId;
+    @ApiModelProperty("来源平台 1小程序 2PC网站 3h5")
+    private Integer fromPlat;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserBankRecord.java

@@ -100,4 +100,6 @@ private static final long serialVersionUID=1L;
     /** 模拟做题试卷ID */
     private Long simulateExamId;
 
+    private Integer fromPlat;
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserBankRecordVo.java

@@ -147,4 +147,6 @@ public class UserBankRecordVo {
 	@Excel(name = "模拟做题试卷ID")
 	@ApiModelProperty("模拟做题试卷ID")
 	private Long simulateExamId;
+	@ApiModelProperty("来源平台 1小程序 2PC网站 3h5")
+	private Integer fromPlat;
 }

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserBankRecordMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="rightRate" column="right_rate"/>
         <result property="doMode" column="do_mode"/>
         <result property="simulateExamId" column="simulate_exam_id"/>
+        <result property="fromPlat" column="from_plat"/>
     </resultMap>
 
 
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="rightRate" column="right_rate"/>
         <result property="doMode" column="do_mode"/>
         <result property="simulateExamId" column="simulate_exam_id"/>
+        <result property="fromPlat" column="from_plat"/>
     </resultMap>
 
     <select id="getUserBankList" parameterType="com.zhongzheng.modules.user.bo.UserBankRecordQueryBo" resultType="com.zhongzheng.modules.user.vo.UserBankRecordVo">