考试

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -704,9 +704,9 @@ public class BLessonController extends PaginationController<BLesson> {
 
     @ApiOperation(value = "641 用户管理 - 考试情况 ", notes = "用户管理 - 考试情况 ")
     @GetMapping(value = "/userManageExamByPagination")
-    public Result userManageExamByPagination(CurUser curUser, @Valid UserLessonDTO userLessonDTO, BindingResult bindingResult) {
+    public Result userManageExamByPagination(CurUser curUser, @Valid ExamQueryDto dto, BindingResult bindingResult) {
         //原型不完整---查询条件不明确
-        bLessonService.userManageExamByPagination(getPaginationUtility(), userLessonDTO);
+        bLessonService.userManageExamByPagination(getPaginationUtility(), dto);
         GridModel gridModel = getGridModelResponse();
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/business/blesson/dao/BLessonPersonRepository.java

@@ -408,8 +408,40 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
     List<StudentTrackingRspDTO> userManageLesson(@Param("param") UserLessonDTO userLessonDTO, @Param("trainTypeSelStr")String trainTypeSelStr);
 
 
-    @Select("")
-    List<StudentTrackingRspDTO> userManageExam();
+    @Select("<script>" +
+            " select b.p_name paperName, b.p_duration examTime,concat(b.p_pass_score ,'/',b.p_total_score) paperScore, " +
+            " a.e_status  paperStatus , (CASE WHEN a.e_score >= b.p_pass_score THEN '通过' ELSE '未通过' END) examResult ,a.e_score score, " +
+            " TIMESTAMPDIFF(MINUTE, a.e_starttime, a.e_endtime) timeCost," +
+            " a.e_starttime examStart, a.e_endtime examEnd,b.p_endtime PaperEndTime" +
+            " from tm_paper b  " +
+            " left join tm_examdata a  on a.e_pid = b.p_id  " +
+            " left join tm_paper_link_branch plb  on plb.ln_pid = b.p_id " +
+            " where plb.ln_buid= #{userId}" +
+            " and corp_id = #{corpId}" +
+            "<if test= \" paperName != null and paperName != ''\">and b.p_name like concat('%',#{paperName},'%') </if> " +
+            "<if test= \" examType != null and examType != '' and examType == '0'.toString()\"> and b.p_id not in(select e_pid from tm_examdata  where e_uid = #{userId})  and now() &gt; b.p_endtime  </if> " +
+            "<if test= \" examType != null and examType != '' and examType == '1'.toString()\"> and a.e_status = 2 or a.e_status = 1 </if> " +
+            "<if test= \" examType != null and examType != '' and examType == '2'.toString()\"> and b.p_id not in(select e_pid from tm_examdata  where e_uid = #{userId})  and now() &lt; b.p_endtime   </if> " +
+            "<if test= \" examType != null and examType != '' and examType == '3'.toString()\"> and a.e_status = 0  </if> " +
+            "<if test= \" examResult != null and examResult != '' and examResult == '0'.toString() \"> and  a.e_score &lt; b.p_pass_score </if> " +
+            "<if test= \" examResult != null and examResult != '' and examResult == '1'.toString() \"> and  a.e_score &gt;= b.p_pass_score </if> " +
+            "<if test= \" scoreStart != null and scoreStart != '' \"> and  a.e_score &gt;= #{scoreStart} </if> " +
+            "<if test= \" scoreEnd != null and scoreEnd != '' \"> and a.e_score &lt;= #{scoreEnd}  </if> " +
+            "<if test= \" consumeTimeStart != null and consumeTimeStart != '' \"> and TIMESTAMPDIFF(MINUTE, a.e_starttime, a.e_endtime) &gt;= #{consumeTimeStart} </if> " +
+            "<if test= \" consumeTimeEnd != null and consumeTimeEnd != '' \"> and TIMESTAMPDIFF(MINUTE, a.e_starttime, a.e_endtime) &lt;= #{consumeTimeEnd}</if> " +
+            "<if test= \" examTimeStart != null and examTimeStart != '' \"> and  a.e_starttime  &gt;= #{examTimeStart} </if> " +
+            "<if test= \" examTimeEnd != null and examTimeEnd != '' \"> and  a.e_starttime  &lt;= #{examTimeEnd} </if> " +
+            "<if test= \" handInTimeStart != null and handInTimeStart != '' \"> and a.e_endtime  &gt;= #{handInTimeStart} </if> " +
+            "<if test= \" handInTimeEnd != null and handInTimeEnd != '' \"> and a.e_endtime  &lt;= #{handInTimeStart} </if> " +
+            " ORDER BY corp_id " +
+            "<if test= \" scoreSort != null and scoreSort != '' and scoreSort == '0'.toString()\">, a.e_score asc </if> " +
+            "<if test= \" scoreSort != null and scoreSort != '' and scoreSort == '1'.toString()\">, a.e_score  desc </if> " +
+            "<if test= \" examTimeSort != null and examTimeSort != '' and examTimeSort == '0'.toString()\">,a.e_starttime asc  </if> " +
+            "<if test= \" examTimeSort != null and examTimeSort != '' and examTimeSort == '1'.toString()\">,a.e_starttime desc  </if> " +
+            "<if test= \" handInTimeSort != null and handInTimeSort != '' and handInTimeSort == '0'.toString()\">,a.e_endtime asc  </if> " +
+            "<if test= \" handInTimeSort != null and handInTimeSort != '' and handInTimeSort == '1'.toString()\">, a.e_endtime desc </if> " +
+            "</script>")
+    List<ExamDto> userManageExam(ExamQueryDto dto);
     
 
 }

src/main/java/org/rcisoft/business/blesson/dto/ExamDto.java

+package org.rcisoft.business.blesson.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ExamDto {
+    public String paperName;
+    public String examTime;
+    public String paperScore;
+    public String paperStatus;
+    public String examResult;
+    public String score;
+    public String timeCost;
+    public Date examStart;
+    public Date examEnd;
+    public Date PaperEndTime;
+
+}

src/main/java/org/rcisoft/business/blesson/dto/ExamQueryDto.java

@@ -3,16 +3,18 @@ package org.rcisoft.business.blesson.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class ExamQueryDto {
 
     @ApiModelProperty(value = "试卷名",required = true)
     private String paperName;
 
-    @ApiModelProperty(value = "考试状态",required = true)
+    @ApiModelProperty(value = "考试状态 0待参加 1已完成 2已失效 3进行中 ",required = true)
     private String examType;
 
-    @ApiModelProperty(value = "考试结果",required = true)
+    @ApiModelProperty(value = "考试结果 0通过 1未通过",required = true)
     private String examResult;
 
     @ApiModelProperty(value = "考试分数起始",required = true)
@@ -21,33 +23,36 @@ public class ExamQueryDto {
     @ApiModelProperty(value = "考试分数截止",required = true)
     private String scoreEnd;
 
-    @ApiModelProperty(value = "消耗时间起始",required = true)
+    @ApiModelProperty(value = "考试耗时起始",required = true)
     private String consumeTimeStart;
 
-    @ApiModelProperty(value = "消耗时间截止",required = true)
+    @ApiModelProperty(value = "考试耗时截止",required = true)
     private String consumeTimeEnd;
 
     @ApiModelProperty(value = "开考时间起始",required = true)
-    private String examTimeStart;
+    private Date examTimeStart;
 
     @ApiModelProperty(value = "开考时间截止",required = true)
-    private String examTimeEnd;
-
-//    @ApiModelProperty(value = "主键Id",required = true)
-//    private String businessId;
-//
-//    @ApiModelProperty(value = "主键Id",required = true)
-//    private String businessId;
-//
-//    @ApiModelProperty(value = "主键Id",required = true)
-//    private String businessId;
-//
-//    @ApiModelProperty(value = "主键Id",required = true)
-//    private String businessId;
-//
-//    @ApiModelProperty(value = "主键Id",required = true)
-//    private String businessId;
-//
-//    @ApiModelProperty(value = "主键Id",required = true)
-//    private String businessId;
+    private Date examTimeEnd;
+
+    @ApiModelProperty(value = "交卷时间起始",required = true)
+    private Date handInTimeStart;
+
+    @ApiModelProperty(value = "交卷时间截止",required = true)
+    private Date handInTimeEnd;
+
+    @ApiModelProperty(value = "试卷得分排序 0正序 1倒序",required = true)
+    private String scoreSort;
+
+    @ApiModelProperty(value = "开考时间排序 0正序 1倒序",required = true)
+    private String examTimeSort;
+
+    @ApiModelProperty(value = "交卷时间排序 0正序 1倒序",required = true)
+    private String handInTimeSort;
+
+    @ApiModelProperty(value = "企业id",required = true)
+    private String corpId;
+
+    @ApiModelProperty(value = "用户id",required = true)
+    private String userId;
 }

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -299,6 +299,6 @@ public interface BLessonService{
      */
     List<StudentTrackingRspDTO>  userManageLessonByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO);
 
-    List<StudentTrackingRspDTO>  userManageExamByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO);
+    List<ExamDto>  userManageExamByPagination(PageUtil pageUtil, ExamQueryDto dto);
 
 }

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -1302,8 +1302,27 @@ public class BLessonServiceImpl implements BLessonService {
     }
 
     @Override
-    public List<StudentTrackingRspDTO> userManageExamByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO) {
-        return bLessonPersonRepository.userManageExam();
+    public List<ExamDto> userManageExamByPagination(PageUtil pageUtil, ExamQueryDto dto) {
+        List<ExamDto> list = bLessonPersonRepository.userManageExam(dto);
+        if(list.size()>0){
+            for(ExamDto examDto : list){
+                //考试状态 0待参加 1已完成 2已失效 3进行中
+                if(examDto.getPaperStatus() == null && examDto.getPaperEndTime().after(new Date())){
+                    examDto.setPaperStatus("0");
+                    examDto.setExamResult(null);
+                }else if(examDto.getPaperStatus() == null && examDto.getPaperEndTime().before(new Date())) {
+                    examDto.setPaperStatus("2");
+                    examDto.setExamResult(null);
+                }else if("1".equals(examDto.getPaperStatus()) || "2".equals(examDto.getPaperStatus())){
+                    examDto.setPaperStatus("1");
+                }else if("0".equals(examDto.getPaperStatus())){
+                    examDto.setPaperStatus("3");
+                    examDto.setScore(null);
+                    examDto.setExamResult(null);
+                }
+            }
+        }
+        return list;
     }
 
     //遍历标签放入List中

src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java

@@ -23,8 +23,8 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
     @Select("<script>" +
             "select * from b_person_value where del_flag != 1 and flag = 1 " +
             "and person_id = #{businessId} " +
-            "<if test=\"startTime !=null and startTime != '' \"> and create_date &lt;= #{startTime} </if> "+
-            "<if test=\"endTime !=null and endTime != '' \"> and create_date &gt;= #{endTime} </if> "+
+            "<if test=\"startTime !=null and startTime != '' \"> and create_date &gt;= #{startTime} </if> "+
+            "<if test=\"endTime !=null and endTime != '' \"> and create_date &lt;= #{endTime} </if> "+
             "<if test=\"event !=null and event != '' \"> and event like concat('%',#{event},'%') </if> "+
 //            "<if test=\"type !=null and type != '' \"> and event like concat('%',#{event},'%') </if> "+
 

src/main/java/org/rcisoft/business/bpersonvalue/dto/PersonValueClientDto.java

@@ -3,6 +3,8 @@ package org.rcisoft.business.bpersonvalue.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class PersonValueClientDto {
 
@@ -10,10 +12,10 @@ public class PersonValueClientDto {
     public String businessId;
 
     @ApiModelProperty(value = "起始时间")
-    public String startTime;
+    public Date startTime;
 
     @ApiModelProperty(value = "结束时间")
-    public String endTime;
+    public Date endTime;
 
     @ApiModelProperty(value = "事件")
     public String event;

src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java

@@ -93,7 +93,8 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      * @return
      */
     @Select("<script>" +
-            "select bl.business_id  businessId,bl.lesson_name lessonName,su.name name,bl.value_consume valueConsume,bl.value_gain valueGain   " +
+            "select bl.business_id  businessId,bl.lesson_name lessonName,su.name name," +
+            "bl.value_consume valueConsume,bl.value_gain valueGain ,bl.value_update_date updateDate   " +
             "from b_lesson  bl    " +
             "left join s_user su on su.business_id = bl.lecturer_id  " +
             "where bl.del_flag !=1 and bl.flag = 1  " +
@@ -115,7 +116,7 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      * @param valueGain
      * @return
      */
-    @Update("update b_lesson set value_consume = #{valueConsume} ,value_gain = #{valueGain} where business_id = #{businessId}")
+    @Update("update b_lesson set value_consume = #{valueConsume} ,value_gain = #{valueGain} ,value_update_date = now() where business_id = #{businessId}")
     int updateLessonValue(@Param("businessId") String businessId,@Param("valueConsume") String valueConsume,@Param("valueGain") String valueGain);
 
     /**
@@ -124,7 +125,7 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      * @param userList
      * @return
      */
-    @Select("<script>select business_id, name , `value`  ," +
+    @Select("<script>select business_id businessId, name , `value`  ," +
             "(select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) valueGain " +
             " from s_user   " +
             " where 1=1   and del_flag !=1    and flag = 1  " +

src/main/java/org/rcisoft/business/breleasevalue/dto/LessonValueDto.java

@@ -2,6 +2,8 @@ package org.rcisoft.business.breleasevalue.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class LessonValueDto {
 
@@ -14,4 +16,6 @@ public class LessonValueDto {
     public  String valueConsume;
 
     public  String valueGain;
+
+    public Date updateDate;
 }