1.调整导入，统计列表查询数据

fs-admin/src/main/java/com/fs/course/controller/FsCourseQuestionBankController.java

@@ -59,6 +59,9 @@ public class FsCourseQuestionBankController extends BaseController
     public AjaxResult export(FsCourseQuestionBank fsCourseQuestionBank)
     {
         List<FsCourseQuestionBankImportDTO> list = fsCourseQuestionBankService.exportData(fsCourseQuestionBank);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        fsCourseQuestionBank.setUserId(userId);
         ExcelUtil<FsCourseQuestionBankImportDTO> util = new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
         return util.exportExcel(list, "题库数据");
     }
@@ -124,9 +127,8 @@ public class FsCourseQuestionBankController extends BaseController
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<FsCourseQuestionBankImportDTO> util = new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
         List<FsCourseQuestionBankImportDTO> list = util.importExcel(file.getInputStream());
-
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String message = fsCourseQuestionBankService.importData(list, loginUser.getUser().getNickName());
+        String message = fsCourseQuestionBankService.importData(list, loginUser.getUser().getNickName(),loginUser.getUser().getUserId());
         return AjaxResult.success(message);
     }
 

fs-service-system/src/main/java/com/fs/course/service/IFsCourseQuestionBankService.java

@@ -79,9 +79,10 @@ public interface IFsCourseQuestionBankService
      *
      * @param list     数据
      * @param nickName 昵称
+     * @param userId
      * @return String
      */
-    String importData(List<FsCourseQuestionBankImportDTO> list, String nickName);
+    String importData(List<FsCourseQuestionBankImportDTO> list, String nickName, Long userId);
 
     /**
      * 根据ID查询题目

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseQuestionBankServiceImpl.java

@@ -369,10 +369,11 @@ public class FsCourseQuestionBankServiceImpl implements IFsCourseQuestionBankSer
      *
      * @param list     数据
      * @param nickName 昵称
+     * @param userId
      * @return String
      */
     @Override
-    public String importData(List<FsCourseQuestionBankImportDTO> list, @Size String nickName) {
+    public String importData(List<FsCourseQuestionBankImportDTO> list, @Size String nickName, Long userId) {
         if (Objects.isNull(list) || list.isEmpty()) {
             throw new ServiceException("导入数据不能为空");
         }
@@ -391,7 +392,7 @@ public class FsCourseQuestionBankServiceImpl implements IFsCourseQuestionBankSer
                 }
 
                 // 构建题目对象
-                FsCourseQuestionBank questionBank = buildQuestionBank(importDTO, categoryData, nickName);
+                FsCourseQuestionBank questionBank = buildQuestionBank(importDTO, categoryData, nickName,userId);
                 importData.add(questionBank);
                 result.addSuccess(importDTO.getTitle());
 
@@ -499,11 +500,12 @@ public class FsCourseQuestionBankServiceImpl implements IFsCourseQuestionBankSer
      */
     private FsCourseQuestionBank buildQuestionBank(FsCourseQuestionBankImportDTO importDTO,
                                                    Map<String, FsUserCourseCategory> categoryData,
-                                                   String nickName) {
+                                                   String nickName, Long userId) {
         FsCourseQuestionBank questionBank = new FsCourseQuestionBank();
 
         // 基础信息
         questionBank.setTitle(importDTO.getTitle());
+        questionBank.setUserId(userId);
         questionBank.setType(getQuestionTypeCode(importDTO.getType()));
         questionBank.setSort(importDTO.getSort());
         questionBank.setStatus(parseStatus(importDTO.getStatus()));

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -161,11 +161,9 @@ public interface FsStoreOrderMapper
             " AND date_format(o.delivery_send_time,'%y%m%d') >= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d') " +
             " AND date_format(o.delivery_send_time,'%y%m%d') <= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d') " +
             "</if>" +
-
-            "<if test = 'maps.paid != null and maps.paid==1   '> " +
-            "  AND o.pay_time is not null " +
+            "<if test = 'maps.paid != null    '> " +
+            "and o.paid =#{maps.paid} " +
             "</if>" +
-
             "<if test = 'maps.payTimeList != null    '> " +
             " AND date_format(o.pay_time,'%y%m%d') &gt;= date_format(#{maps.payTimeList[0]},'%y%m%d') " +
             " AND date_format(o.pay_time,'%y%m%d') &lt;= date_format(#{maps.payTimeList[1]},'%y%m%d') " +

fs-service-system/src/main/resources/mapper/course/FsCourseQuestionBankMapper.xml

@@ -83,7 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         answer,
         create_by,
         question_type,
-        question_sub_type
+        question_sub_type,
+        user_id
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -97,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.answer, jdbcType=CLOB},
             #{item.createBy, jdbcType=VARCHAR},
             #{item.questionType, jdbcType=VARCHAR},
-            #{item.questionSubType, jdbcType=VARCHAR}
+            #{item.questionSubType, jdbcType=VARCHAR},
+            #{item.userId, jdbcType=BIGINT}
             )
         </foreach>
     </insert>

fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

@@ -524,8 +524,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsStoreOrderByPayPriceCount" resultType="java.math.BigDecimal">
         select  sum(pay_price) from fs_store_order
         <where>
-            <if test="paid != null and paid==1"> and pay_time is not null</if>
-            <if test="paid != null and paid==0"> and pay_time is null</if>
+            <if test="paid != null"> and paid = #{paid}</if>
             <if test="startTime != null and startTime != ''">AND date_format(create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')</if>
             <if test="endTime != null and endTime != ''">AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')</if>
         </where>