3.4.1 bug修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -33,7 +33,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
             @Param("status") String status, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
             @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userName") String userName, @Param("dpr") DataPermissionRule dpr);
 
-    List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
+    List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("courseId") Long courseId, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
 
     IPage<ExamTaskDto> listTaskApply(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId,
             @Param("auditStatus") String auditStatus, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskService.java

@@ -10,7 +10,6 @@ import com.qmth.distributed.print.business.bean.params.ExamTaskSubmitPram;
 import com.qmth.distributed.print.business.bean.params.MakeupExamTaskTotalParam;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.bean.result.examTaskStudent.ExamTaskStudentObjectResult;
-import com.qmth.distributed.print.business.bean.result.statistics.ScanCalculateResult;
 import com.qmth.distributed.print.business.bean.result.statistics.ScanCountResult;
 import com.qmth.distributed.print.business.bean.result.statistics.PrintCountResult;
 import com.qmth.distributed.print.business.entity.ExamDetail;
@@ -43,7 +42,7 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     IPage<ExamTaskDto> list(Long semesterId, Long examId, Boolean enable, String status,Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
 
-    List<BlurryUserDto> listUser(String param);
+    List<BlurryUserDto> listUser(Long courseId, String param);
 
     ExamTask assignUser(ExamTask examTask);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -63,7 +63,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import javax.websocket.RemoteEndpoint;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -191,10 +190,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public List<BlurryUserDto> listUser(String param) {
+    public List<BlurryUserDto> listUser(Long courseId, String param) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        return this.baseMapper.listUser(schoolId, SystemConstant.translateSpecificSign(param), orgIds);
+        return this.baseMapper.listUser(schoolId, courseId, SystemConstant.translateSpecificSign(param), orgIds);
     }
 
     @Transactional

distributed-print-business/src/main/resources/mapper/ConditionMapper.xml

@@ -118,8 +118,9 @@
     </select>
     <select id="listCourseForAudit" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
-            bc.code code,
-            bc.name name
+            bc.id,
+            bc.code,
+            bc.name
         FROM
             basic_course bc
         <where>

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -168,14 +168,17 @@
         sys_user b ON a.user_id = b.id
         <where>
             b.enable = true
-            <if test="schoolId != null and schoolId != ''">
+            <if test="schoolId != null">
                 and b.school_id = #{schoolId}
             </if>
+            <if test="courseId != null">
+                and a.course_id = #{courseId}
+            </if>
             <if test="param != null and param != ''">
                 and b.real_name like concat('%', #{param}, '%')
             </if>
             <if test="orgIds != null and orgIds != '' and orgIds.size > 0">
-                AND a.org_id IN
+                AND b.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -496,6 +499,7 @@
         a.user_id userId,
         a.card_rule_id cardRuleId,
         c.real_name userName,
+        c.login_name loginName,
         a.start_time startTime,
         a.end_time endTime,
         a.create_id createId,

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -85,8 +85,9 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题老师模糊查询")
     @RequestMapping(value = "/user_query", method = RequestMethod.POST)
-    public Result userQuery(@RequestParam(value = "param", required = false) String param) {
-        return ResultUtil.ok(examTaskService.listUser(param));
+    public Result userQuery(@RequestParam(value = "courseId", required = false) Long courseId,
+                            @RequestParam(value = "param", required = false) String param) {
+        return ResultUtil.ok(examTaskService.listUser(courseId, param));
     }
 
     /**

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -325,7 +325,7 @@
                     and status = #{status}
                 </if>
                 <if test="subScore != null">
-                    and (marker_score_list like concat(#{subScore}, ',%') or marker_score_list like concat('%,', #{subScore}) or marker_score_list like concat('%,', #{subScore}, ',%'))
+                    and (marker_score_list like concat(CAST(#{subScore} as CHAR) + 0, ',%') or marker_score_list like concat('%,', CAST(#{subScore} as CHAR) + 0) or marker_score_list like concat('%,', CAST(#{subScore} as CHAR) + 0, ',%'))
                 </if>
              ) mt
                 LEFT JOIN