系统题目添加，给默认值

web/src/main/java/com/ibeetl/jlw/entity/GeneralQuestionSetting.java

@@ -113,5 +113,12 @@ public class GeneralQuestionSetting extends BaseEntity{
     //用户ID
 
     private Long userId ;
-	
+
+    public Long getGeneralQuestionSettingId() {
+        return generalQuestionSettingId;
+    }
+
+    public void setGeneralQuestionSettingId(Long generalQuestionSettingId) {
+        this.generalQuestionSettingId = generalQuestionSettingId;
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/GeneralResourcesQuestionSnapshot.java

@@ -101,4 +101,12 @@ public class GeneralResourcesQuestionSnapshot extends BaseEntity{
     public void hideAnswer() {
         setQuestionAnswer(null);
     }
+
+    public Long getGeneralResourcesQuestionSnapshotId() {
+        return generalResourcesQuestionSnapshotId;
+    }
+
+    public void setGeneralResourcesQuestionSnapshotId(Long generalResourcesQuestionSnapshotId) {
+        this.generalResourcesQuestionSnapshotId = generalResourcesQuestionSnapshotId;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java

@@ -546,7 +546,8 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
      * 任务一；添加题目配置主表
      * 任务二：添加题目快照表
      *
-     * @param settingQuery
+     * @param settingQuery      题目配置信息
+     * @param courseInfoIdPair  新旧课程ID片段
      * @return
      */
     public void addSettingBySystemCourse(@Validated(ValidateConfig.ADD.class) GeneralQuestionSettingQuery settingQuery, Map<Long, Long> courseInfoIdPair ) {

web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java

@@ -106,7 +106,7 @@ public class GeneralQuestionSettingController{
      * @return
      */
     @PostMapping(API + "/addQuestionByType.do")
-    public JsonResult addQuestionByType(@Validated(ValidateConfig.ADD.class) @RequestBody GeneralQuestionSettingQuery generalQuestionSettingQuery,
+    public JsonResult addQuestionByTypeDo(@Validated(ValidateConfig.ADD.class) @RequestBody GeneralQuestionSettingQuery generalQuestionSettingQuery,
                                         BindingResult result, @SCoreUser CoreUser coreUser) {
         if (result.hasErrors()) {
             return JsonResult.failMessage(result);
@@ -492,4 +492,27 @@ public class GeneralQuestionSettingController{
             }
         }
 
+    /**
+     * 教师端-根据类型添加作业（支持章节练习、考试、作业等）
+     * 考证辅导
+     *
+     * @param generalQuestionSettingQuery
+     * @param result
+     * @param coreUser
+     * @return
+     */
+    @PostMapping(MODEL + "/addQuestionByType.json")
+    @Function("generalQuestionSetting.edit")
+    public JsonResult addQuestionByType(@Validated(ValidateConfig.ADD.class) @RequestBody GeneralQuestionSettingQuery generalQuestionSettingQuery,
+                                        BindingResult result, @SCoreUser CoreUser coreUser) {
+        if (result.hasErrors()) {
+            return JsonResult.failMessage(result);
+        }
+
+        generalQuestionSettingQuery.setUserId(coreUser.getId());
+        generalQuestionSettingQuery.setOrgId(coreUser.getOrgId());
+        generalQuestionSettingService.addSettingBySystemCourse(generalQuestionSettingQuery, Collections.emptyMap());
+        return JsonResult.success();
+    }
+
 }

web/src/main/java/com/ibeetl/jlw/web/query/GeneralQuestionSettingQuery.java

@@ -106,20 +106,22 @@ public class GeneralQuestionSettingQuery extends PageParam {
         pojo.setBussinessId(this.getBussinessId());
         pojo.setBussinessType(this.getBussinessType());
         pojo.setGeneralQuestionSettingSchoolClassIds(this.getGeneralQuestionSettingSchoolClassIds());
-        pojo.setGeneralQuestionSettingDoCount(this.getGeneralQuestionSettingDoCount());
-        pojo.setGeneralQuestionSettingQuestionNoOrder(this.getGeneralQuestionSettingQuestionNoOrder());
-        pojo.setGeneralQuestionSettingOptionNoOrder(this.getGeneralQuestionSettingOptionNoOrder());
-        pojo.setGeneralQuestionSettingEndShowQa(this.getGeneralQuestionSettingEndShowQa());
-        pojo.setGeneralQuestionSettingEndShowTrueFalse(this.getGeneralQuestionSettingEndShowTrueFalse());
         pojo.setGeneralQuestionSettingName(this.getGeneralQuestionSettingName());
         pojo.setGeneralQuestionStartTime(this.getGeneralQuestionStartTime());
         pojo.setGeneralQuestionEndTime(this.getGeneralQuestionEndTime());
         pojo.setGeneralQuestionSettingType(this.getGeneralQuestionSettingType());
         pojo.setGeneralQuestionSettingRequire(this.getGeneralQuestionSettingRequire());
         pojo.setGeneralQuestionSettingFile(this.getGeneralQuestionSettingFile());
+
+        // 不传值就给默认值
+        pojo.setGeneralQuestionSettingDoCount(defaultIfNull(this.getGeneralQuestionSettingDoCount(), 1000));
+        pojo.setGeneralQuestionSettingQuestionNoOrder(defaultIfNull(this.getGeneralQuestionSettingQuestionNoOrder(), 1));
+        pojo.setGeneralQuestionSettingOptionNoOrder(defaultIfNull(this.getGeneralQuestionSettingOptionNoOrder(), 1));
+        pojo.setGeneralQuestionSettingEndShowQa(defaultIfNull(this.getGeneralQuestionSettingEndShowQa(), 1));
+        pojo.setGeneralQuestionSettingEndShowTrueFalse(defaultIfNull(this.getGeneralQuestionSettingEndShowTrueFalse(), 1));
         pojo.setGeneralQuestionSettingPushStatus(defaultIfNull(this.getGeneralQuestionSettingPushStatus(), UN_PUSH));
         pojo.setGeneralQuestionSettingStatus(defaultIfNull(this.getGeneralQuestionSettingStatus(), 1));
-        pojo.setGeneralQuestionSettingAddTime(this.getGeneralQuestionSettingAddTime());
+        pojo.setGeneralQuestionSettingAddTime(defaultIfNull(this.getGeneralQuestionSettingAddTime(), new Date()));
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
         return pojo;

web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md

@@ -759,9 +759,8 @@ getQuestionBySettingOptionDTO
 
   select
   @if(!isEmpty(singleScore)){
-  '' as general_resources_question_snapshot_id,
   '' as general_question_setting_id,
-  '' as business_course_info_type,
+  'SYSTEM_QUESTION' as business_course_info_type,
   t.course_info_id as business_course_info_id,
   t.question_type,
   t.question_stem,

web/src/main/resources/sql/jlw/resourcesQuestion.md

@@ -103,6 +103,84 @@ getByIds
 getValuesByQuery
 ===
 
+* 根据不为空的参数进行查询
+
+    select t.*
+    from resources_question t
+    where 1=1  
+      @if(!isEmpty(resourcesQuestionIds)){
+        and find_in_set(t.resources_question_id,#resourcesQuestionIds#)
+      @}
+      @if(!isEmpty(resourcesQuestionId)){
+        and t.resources_question_id =#resourcesQuestionId#
+      @}
+      @if(!isEmpty(courseInfoIds)){
+        and find_in_set(t.course_info_id,#courseInfoIds#)
+      @}
+      @if(!isEmpty(courseInfoId)){
+        and t.course_info_id =#courseInfoId#
+      @}
+      @if(!isEmpty(questionType)){
+        and t.question_type =#questionType#
+      @}
+      @if(!isEmpty(questionStatus)){
+        and t.question_status =#questionStatus#
+      @}
+      @if(!isEmpty(questionScore)){
+        and t.question_score =#questionScore#
+      @}
+      @if(!isEmpty(questionStem)){
+        and t.question_stem = #questionStem#
+      @}
+      @if(!isEmpty(questionOptionA)){
+        and t.question_option_a =#questionOptionA#
+      @}
+      @if(!isEmpty(questionOptionB)){
+        and t.question_option_b =#questionOptionB#
+      @}
+      @if(!isEmpty(questionOptionC)){
+        and t.question_option_c =#questionOptionC#
+      @}
+      @if(!isEmpty(questionOptionD)){
+        and t.question_option_d =#questionOptionD#
+      @}
+      @if(!isEmpty(questionOptionE)){
+        and t.question_option_e =#questionOptionE#
+      @}
+      @if(!isEmpty(questionAnswer)){
+        and t.question_answer =#questionAnswer#
+      @}
+      @if(!isEmpty(questionAnalysis)){
+        and t.question_analysis =#questionAnalysis#
+      @}
+      @if(!isEmpty(orgId)){
+        and t.org_id =#orgId#
+      @}
+      @if(!isEmpty(userId)){
+        and t.user_id =#userId#
+      @}
+      @if(!isEmpty(resourcesApplicationId)){
+        and t.course_info_id IN (SELECT course_info_id FROM course_info WHERE course_info_parent_id IN (SELECT course_info_id FROM resources_application_course WHERE resources_application_id = #resourcesApplicationId#))
+      @}
+      @if(!isEmpty(wrongQuestionFromStudentId)){
+        and t.resources_question_id IN (SELECT resources_question_id FROM wrong_question WHERE student_id = #wrongQuestionFromStudentId# AND resources_question_id > 0)
+      @}
+      @if(!isEmpty(singleChoiceNum)){
+        ORDER BY RAND()
+        limit #singleChoiceNum#
+      @}
+      @if(!isEmpty(multipleChoiceNum)){
+        ORDER BY RAND()
+        limit #multipleChoiceNum#
+      @}
+      @if(!isEmpty(judgeNum)){
+        ORDER BY RAND()
+        limit #judgeNum#
+      @}
+
+getValuesByQueryNotWithPermission
+===
+
 * 根据不为空的参数进行查询
 
     select t.*