Browse Source

fix 试卷题目

he2802 4 years ago
parent
commit
52ad64fa8e

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -124,7 +124,7 @@ public class QuestionController extends BaseController {
     @GetMapping("/business/list")
     public TableDataInfo<QuestionBusiness> businessList(QuestionBusinessQueryBo bo) {
         startPage();
-        List<QuestionBusiness> list = iQuestionBusinessService.getListById(bo.getQuestionId());
+        List<QuestionBusiness> list = iQuestionBusinessService.getListById(bo.getMajorId());
         return getDataTable(list);
     }
 }

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBusinessAddBo.java

@@ -31,6 +31,6 @@ public class QuestionBusinessAddBo {
     @ApiModelProperty("科目id")
     private Long subjectId;
     /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long questionId;
+    @ApiModelProperty("业务类型 1为题目业务 2试卷业务 3章业务 4模块业务")
+    private Integer type;
 }

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBusinessEditBo.java

@@ -39,7 +39,7 @@ public class QuestionBusinessEditBo {
     private Long subjectId;
 
     /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long questionId;
+    @ApiModelProperty("业务类型 1为题目业务 2试卷业务 3章业务 4模块业务")
+    private Integer type;
 
 }

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBusinessQueryBo.java

@@ -50,5 +50,8 @@ public class QuestionBusinessQueryBo extends BaseEntity {
 	private Long subjectId;
 	/** $column.columnComment */
 	@ApiModelProperty("$column.columnComment")
-	private Long questionId;
+	private Long majorId;
+
+	@ApiModelProperty("业务类型 1为题目业务 2试卷业务 3章业务 4模块业务")
+	private Integer type;
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionBusinessServiceImpl.java

@@ -52,7 +52,7 @@ public class QuestionBusinessServiceImpl extends ServiceImpl<QuestionBusinessMap
         lqw.eq(bo.getBusinessId() != null, QuestionBusiness::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getProjectId() != null, QuestionBusiness::getProjectId, bo.getProjectId());
         lqw.eq(bo.getSubjectId() != null, QuestionBusiness::getSubjectId, bo.getSubjectId());
-        lqw.eq(bo.getQuestionId() != null, QuestionBusiness::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getMajorId() != null, QuestionBusiness::getMajorId, bo.getMajorId());
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 2
zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionBusinessMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subjectName" column="subject_name"/>
     </resultMap>
 
-    <select id="getListById" parameterType="Long" resultMap="QuestionBusiness">
+    <select id="getListById" parameterType="com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo" resultMap="QuestionBusiness">
         SELECT
             qb.*,
             cet.education_name,
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_business cb ON qb.business_id = cb.id
                 LEFT JOIN course_subject cs ON qb.subject_id = cs.id
         WHERE
-            type = 1 and qb.majorId =#{id}
+            type = #{type} and qb.majorId =#{id}
     </select>
 
 </mapper>