答题记录修改

fs-admin/src/main/java/com/fs/FSAdminApplication.java

@@ -1,5 +1,6 @@
 package com.fs;
 
+import com.fs.core.security.SecurityUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -28,6 +29,6 @@ public class FSAdminApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(FSAdminApplication.class, args);
-        System.out.println("Admin启动成功 \n" );
+        System.out.println("Admin启动成功 \n" + SecurityUtils.encryptPassword("123456"));
     }
 }

fs-company/src/main/java/com/fs/course/controller/FsCourseAnswerLogsController.java

@@ -68,7 +68,7 @@ public class FsCourseAnswerLogsController extends BaseController
             param.setPhone(param.getPhoneMk());
         }
 
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
+        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
         return getDataTable(list);
     }
     /**
@@ -83,7 +83,7 @@ public class FsCourseAnswerLogsController extends BaseController
         if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
             param.setPhone(param.getPhoneMk());
         }
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
+        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
         ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
         return util.exportExcel(list, "答题日志数据");
     }
@@ -102,7 +102,7 @@ public class FsCourseAnswerLogsController extends BaseController
         if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
             param.setPhone(param.getPhoneMk());
         }
-        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
+        List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVONew(param);
         ExcelUtil<FsCourseAnswerLogsListVO> util = new ExcelUtil<FsCourseAnswerLogsListVO>(FsCourseAnswerLogsListVO.class);
         return util.exportExcel(list, "答题日志数据");
     }

fs-service-system/src/main/java/com/fs/course/param/FsCourseAnswerLogsParam.java

@@ -54,10 +54,8 @@ public class FsCourseAnswerLogsParam  extends BaseEntity  {
 
     private String project;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date eTime;
+    private String eTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sTime;
+    private String sTime;
 
 }

fs-service-system/src/main/java/com/fs/course/vo/FsCourseAnswerLogsListVO.java

@@ -3,6 +3,8 @@ package com.fs.course.vo;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class FsCourseAnswerLogsListVO {
 
@@ -85,4 +87,7 @@ public class FsCourseAnswerLogsListVO {
      * 项目名称
      */
     private String projectName;
+
+    private Date sTime;
+    private Date eTime;
 }

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

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND cal.company_user_id = #{companyUserId}
             </if>
             <if test="companyId != null">
-                AND company_id = #{companyId}
+                AND cal.company_id = #{companyId}
             </if>
             <if test="isRight != null">
                 AND is_right = #{isRight}
@@ -59,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="project != null">
                 AND uc.project = #{project}
             </if>
+            <if test="sTime != null and eTime != null">
+                AND cal.create_time BETWEEN #{sTime} AND #{eTime}
+            </if>
         </where>
     </select>