功能优化

paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/TaskStudentResult.java

@@ -0,0 +1,132 @@
+package com.qmth.paper.library.business.bean.result;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * 数据检查
+ */
+public class TaskStudentResult implements Serializable {
+
+    @ApiModelProperty(value = "扫描任务详情ID(任务id+考生id)")
+    private String paperScanTaskDetailId;
+
+    @ApiModelProperty(value = "学期")
+    private String semesterName;
+
+    @ApiModelProperty(value = "档案名称")
+    private String paperArchivesName;
+
+    @ApiModelProperty(value = "扫描任务")
+    private String paperScanTaskName;
+
+    @ApiModelProperty(value = "课程")
+    private String courseName;
+
+    @ApiModelProperty(value = "任课老师")
+    private String teacherName;
+
+    @ApiModelProperty(value = "教学班")
+    private String teachClazzName;
+
+    @ApiModelProperty(value = "姓名")
+    private String studentName;
+
+    @ApiModelProperty(value = "学号")
+    private String studentCode;
+
+    @ApiModelProperty(value = "专业")
+    private String majorName;
+
+    @ApiModelProperty(value = "班级")
+    private String clazzName;
+
+    public String getPaperScanTaskDetailId() {
+        return paperScanTaskDetailId;
+    }
+
+    public void setPaperScanTaskDetailId(String paperScanTaskDetailId) {
+        this.paperScanTaskDetailId = paperScanTaskDetailId;
+    }
+
+    public String getSemesterName() {
+        return semesterName;
+    }
+
+    public void setSemesterName(String semesterName) {
+        this.semesterName = semesterName;
+    }
+
+    public String getPaperArchivesName() {
+        return paperArchivesName;
+    }
+
+    public void setPaperArchivesName(String paperArchivesName) {
+        this.paperArchivesName = paperArchivesName;
+    }
+
+    public String getPaperScanTaskName() {
+        return paperScanTaskName;
+    }
+
+    public void setPaperScanTaskName(String paperScanTaskName) {
+        this.paperScanTaskName = paperScanTaskName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeachClazzName() {
+        return teachClazzName;
+    }
+
+    public void setTeachClazzName(String teachClazzName) {
+        this.teachClazzName = teachClazzName;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public String getClazzName() {
+        return clazzName;
+    }
+
+    public void setClazzName(String clazzName) {
+        this.clazzName = clazzName;
+    }
+}

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperLibraryMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.paper.library.business.bean.result.PaperLibraryResult;
+import com.qmth.paper.library.business.bean.result.TaskStudentResult;
 import com.qmth.paper.library.business.entity.PaperLibrary;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,4 +28,6 @@ public interface PaperLibraryMapper extends BaseMapper<PaperLibrary> {
     List<PaperLibrary> listUnBindData(@Param("schoolId") Long schoolId);
 
     List<PaperLibrary> selectBatchData(@Param("schoolId") Long schoolId, @Param("userId") Long userId);
+
+    List<TaskStudentResult> listByStudentCode(@Param("schoolId") Long schoolId, @Param("studentCode") String studentCode);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperLibraryService.java

@@ -3,6 +3,7 @@ package com.qmth.paper.library.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.paper.library.business.bean.result.PaperLibraryResult;
+import com.qmth.paper.library.business.bean.result.TaskStudentResult;
 import com.qmth.paper.library.business.entity.PaperLibrary;
 
 import java.util.List;
@@ -27,4 +28,6 @@ public interface PaperLibraryService extends IService<PaperLibrary> {
     int countBindData(Long paperScanTaskId);
 
     List<PaperLibraryResult> toBindPaper();
+
+    List<TaskStudentResult> listByStudentCode(String studentCode);
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperLibraryServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.paper.library.business.bean.result.PaperLibraryResult;
+import com.qmth.paper.library.business.bean.result.TaskStudentResult;
 import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
 import com.qmth.paper.library.business.mapper.PaperLibraryMapper;
@@ -144,6 +145,15 @@ public class PaperLibraryServiceImpl extends ServiceImpl<PaperLibraryMapper, Pap
         return paperLibraryResultList;
     }
 
+    @Override
+    public List<TaskStudentResult> listByStudentCode(String studentCode) {
+        if(StringUtils.isBlank(studentCode)){
+            throw ExceptionResultEnum.ERROR.exception("请输入考号");
+        }
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return this.baseMapper.listByStudentCode(schoolId, studentCode);
+    }
+
     private List<PaperLibrary> createBindData(Long userId, Long schoolId) {
         try {
             lockService.waitlock(LockType.BIND_PAPER_TASK, schoolId);

paper-library-business/src/main/resources/mapper/PaperLibraryMapper.xml

@@ -112,4 +112,36 @@
             limit 10
         </where>
     </select>
+    <select id="listByStudentCode" resultType="com.qmth.paper.library.business.bean.result.TaskStudentResult">
+        SELECT
+            pstd.id paperScanTaskDetailId,
+            pa.archives_name paperArchivesName,
+            b.name semesterName,
+            pst.scan_task_name paperScanTaskName,
+            pst.course_name courseName,
+            pst.teacher_name teacherName,
+            pst.teach_clazz_name teachClazzName,
+            bs.student_name studentName,
+            bs.student_code studentCode,
+            bs.major_name majorName,
+            bs.clazz_name clazzName
+        FROM
+            paper_archives pa
+                LEFT JOIN
+            basic_semester b ON pa.semester_id = b.id
+                LEFT JOIN
+            paper_scan_task pst ON pa.id = pst.paper_archives_id
+                LEFT JOIN
+            paper_scan_task_detail pstd ON pst.id = pstd.paper_scan_task_id
+                LEFT JOIN
+            basic_student bs ON pstd.student_id = bs.id
+        <where>
+            <if test="schoolId != null">
+                and pa.school_id = #{schoolId}
+            </if>
+            <if test="studentCode != null and studentCode != ''">
+                and bs.studentCode like  concat(#{studentCode}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/dto/OrgDto.java

@@ -31,40 +31,6 @@ public class OrgDto {
     @ApiModelProperty(value = "机构下系统用户")
     private List<SysUserResult> sysUserList;
 
-    @ApiModelProperty(value = "校区id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long campusId;
-
-    @ApiModelProperty(value = "校区名称")
-    private String campusName;
-
-    @ApiModelProperty(value = "校区编码")
-    private String campusCode;
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public Long getCampusId() {
-        return campusId;
-    }
-
-    public void setCampusId(Long campusId) {
-        this.campusId = campusId;
-    }
-
     public Long getId() {
         return id;
     }

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/BasicCampusParams.java

@@ -1,66 +0,0 @@
-package com.qmth.paper.library.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 基础校区参数（保存用）
- * @Author: CaoZixuan
- * @Date: 2021-08-03
- */
-public class BasicCampusParams {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "校区id")
-    private Long id;
-
-    @ApiModelProperty(value = "校区名称")
-    @NotNull(message = "请输入校区名称")
-    @Length(min = 1,message = "请输入校区名称")
-    private String campusName;
-
-    @ApiModelProperty(value = "校区编号")
-    @NotNull(message = "请输入校区编码")
-    @Length(min = 1,message = "请输入校区编码")
-    private String campusCode;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷室id")
-    private Long printHouseId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/result/BasicCampusResult.java

@@ -1,93 +0,0 @@
-package com.qmth.paper.library.common.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 校区查询结果
- * @Author: CaoZixuan
- * @Date: 2021-08-03
- */
-public class BasicCampusResult {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "校区id")
-    private Long id;
-
-    @ApiModelProperty(value = "校区名称")
-    private String campusName;
-
-    @ApiModelProperty(value = "校区编码")
-    private String campusCode;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷室id")
-    private Long printHouseId;
-
-    @ApiModelProperty(value = "印刷室")
-    private String printHouseName;
-
-    @ApiModelProperty(value = "创建时间")
-    private Long createTime;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    public String getPrintHouseName() {
-        return printHouseName;
-    }
-
-    public void setPrintHouseName(String printHouseName) {
-        this.printHouseName = printHouseName;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/BasicCampus.java

@@ -1,96 +0,0 @@
-package com.qmth.paper.library.common.entity;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 基础校区表
- * </p>
- *
- * @author wangliang
- * @since 2021-08-02
- */
-@ApiModel(value = "BasicCampus对象", description = "基础校区表")
-public class BasicCampus extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "校区名称")
-    private String campusName;
-
-    @ApiModelProperty(value = "校区编码")
-    private String campusCode;
-
-    @ApiModelProperty(value = "印刷室id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long printHouseId;
-
-    @ApiModelProperty(value = "是否可用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long orgId;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public Long getPrintHouseId() {
-        return printHouseId;
-    }
-
-    public void setPrintHouseId(Long printHouseId) {
-        this.printHouseId = printHouseId;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/service/SysUserService.java

@@ -1,6 +1,8 @@
 package com.qmth.paper.library.common.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.paper.library.common.bean.dto.UserDto;
 import com.qmth.paper.library.common.bean.params.ApproveUserResult;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
 import com.qmth.paper.library.common.bean.result.LoginResult;
@@ -23,6 +25,20 @@ import java.util.List;
  */
 public interface SysUserService extends IService<SysUser> {
 
+    /**
+     * 知学知考系统 - 查询用户列表
+     *
+     * @param userInfo   用户信息（账号/姓名/手机号）
+     * @param orgId      机构id
+     * @param roleId     角色id
+     * @param enable     启用禁用状态
+     * @param pageNumber 分页页数
+     * @param pageSize   分页容量
+     * @return 用户集合
+     */
+    IPage<UserDto> listForPrintSystem(String userInfo, Long orgId, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
+
+
     /**
      * 根据用户id查询当前用户的特殊权限
      *
@@ -60,8 +76,6 @@ public interface SysUserService extends IService<SysUser> {
 
     List<SysUser> listByOrgId(Long id);
 
-    boolean saveCustomer(UserSaveParams userSaveParams);
-
     /**
      * 临时-不鉴权保存用户 （默认创建用户角色为该学校管理员）
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysPrivilegeServiceImpl.java

@@ -97,8 +97,8 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
         Long schoolId = SystemConstant.getHeadOrUserSchoolId();
         List<TSchoolPrivilege> tSchoolPrivilegeList = tSchoolPrivilegeService.findBySchoolId(schoolId);
         Set<Long> customPrivilegeIds = null;
-        if (Objects.nonNull(tSchoolPrivilegeList) && tSchoolPrivilegeList.size() > 0) {
-            customPrivilegeIds = tSchoolPrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
+        if (Objects.nonNull(tSchoolPrivilegeList) && !tSchoolPrivilegeList.isEmpty()) {
+            customPrivilegeIds = tSchoolPrivilegeList.stream().map(TSchoolPrivilege::getPrivilegeId).collect(Collectors.toSet());
         }
         QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
         sysPrivilegeQueryWrapper.lambda()
@@ -111,7 +111,7 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
 //            sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getSchoolId, schoolId);
 //        }
         List<SysPrivilege> sysPrivilegeList = this.list(sysPrivilegeQueryWrapper);
-        if (Objects.nonNull(customPrivilegeIds) && customPrivilegeIds.size() > 0) {
+        if (Objects.nonNull(customPrivilegeIds) && !customPrivilegeIds.isEmpty()) {
             sysPrivilegeQueryWrapper = new QueryWrapper<>();
             sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, customPrivilegeIds);
             List<SysPrivilege> sysPrivileges = this.list(sysPrivilegeQueryWrapper);

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysUserServiceImpl.java

@@ -2,10 +2,13 @@ package com.qmth.paper.library.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.paper.library.common.bean.auth.AuthBean;
+import com.qmth.paper.library.common.bean.dto.UserDto;
 import com.qmth.paper.library.common.bean.dto.VerifyCodeCheckDto;
 import com.qmth.paper.library.common.bean.params.ApproveUserResult;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
@@ -85,6 +88,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Resource
     SysRoleGroupMemberService sysRoleGroupMemberService;
 
+    @Override
+    public IPage<UserDto> listForPrintSystem(String userInfo, Long orgId, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+
+        Page<UserDto> page = new Page<>(pageNumber, pageSize);
+        IPage<UserDto> userDtoIPage = this.baseMapper.listForPrintSystem(page, schoolId, SystemConstant.translateSpecificSign(userInfo), orgId, roleId, enable);
+        if (userDtoIPage.getRecords().size() > 0) {
+            userDtoIPage.getRecords().forEach(m -> {
+                //角色
+                List<SysRole> roles = sysRoleService.listRolesByUserId(Long.valueOf(m.getId()));
+                m.setRoles(roles);
+            });
+        }
+        return userDtoIPage;
+    }
+
     @Override
     public SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId, Long schoolId) {
 
@@ -318,13 +337,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return this.list(queryWrapper);
     }
 
-    @Transactional
-    @Override
-    public boolean saveCustomer(UserSaveParams userSaveParams) {
-        Long upUserId = saveUserCommon(userSaveParams, null);
-        return SystemConstant.longNotNull(upUserId);
-    }
-
     /**
      * 保存用户公用
      *

paper-library-common/src/main/resources/mapper/SysOrgMapper.xml

@@ -40,15 +40,9 @@
             so.name,
             so.`type` type,
             so.parent_id as parentId,
-            so.enable,
-            bc.id as campusId,
-            bc.campus_name as campusName,
-            bc.campus_code as campusCode
+            so.enable
         from
             sys_org so
-        left join basic_campus bc on
-            bc.print_house_id = so.id
-            and so.`type` = 'PRINTING_HOUSE'
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and so.school_id = #{schoolId}

paper-library-common/src/main/resources/mapper/SysUserMapper.xml

@@ -46,15 +46,11 @@
             a.remark,
             a.org_id orgId,
             a.code code,
-            c.marker_status as markerStatus,
-            c.marker_leader_status as markerLeaderStatus,
             b.name orgName
         FROM
             sys_user a
                 left join
             sys_org b on a.org_id = b.id
-                LEFT JOIN
-            cloud_user_push_status c on a.school_id = c.school_id and a.id = c.user_id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}

paper-library/src/main/java/com/qmth/paper/library/api/PaperLibraryController.java

@@ -27,7 +27,7 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "数据检查Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/paper_library")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/library")
 @Validated
 @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class PaperLibraryController {
@@ -68,7 +68,7 @@ public class PaperLibraryController {
 
     @ApiOperation(value = "查询考生图片集合")
     @PostMapping("/list_student_picture")
-    @ApiResponses({@ApiResponse(code = 200, message = "确定成功", response = Result.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result listStudentPicture(@ApiParam(value = "扫描任务详情ID（任务+考生）") @RequestParam Long paperScanTaskDetailId) {
         return ResultUtil.ok(paperLibraryService.listStudentPicture(paperScanTaskDetailId));
     }
@@ -88,4 +88,10 @@ public class PaperLibraryController {
         return ResultUtil.ok(paperLibraryService.toBindPaper());
     }
 
+    @ApiOperation(value = "根据学号查询所有任务下考生信息")
+    @PostMapping("/list_by_student_code")
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result listByStudentCode(@ApiParam(value = "考号") @RequestParam String studentCode) {
+        return ResultUtil.ok(paperLibraryService.listByStudentCode(studentCode));
+    }
 }

paper-library/src/main/java/com/qmth/paper/library/api/SysUserController.java

@@ -3,20 +3,17 @@ package com.qmth.paper.library.api;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.paper.library.business.service.PaperLibraryCommonService;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.service.SysUserService;
 import com.qmth.paper.library.common.util.Result;
 import com.qmth.paper.library.common.util.ResultUtil;
-import com.qmth.paper.library.common.util.ServletUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -43,10 +40,8 @@ import java.security.NoSuchAlgorithmException;
 public class SysUserController {
     private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
 
-    @Autowired
-    private SysUserService sysUserService;
     @Resource
-    private PaperLibraryCommonService paperLibraryCommonService;
+    private SysUserService sysUserService;
 
     /**
      * 用户列表查询
@@ -57,113 +52,59 @@ public class SysUserController {
      * @param enable
      * @param pageNumber
      * @param pageSize
-     * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    @PostMapping("/list")
     public Result list(@RequestParam(value = "userInfo", required = false) String userInfo,
                        @RequestParam(value = "orgId", required = false) String orgId,
                        @RequestParam(value = "roleId", required = false) String roleId,
                        @RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok();
-    }
-
-    /**
-     * 查询
-     *
-     * @param realName
-     * @param enable
-     * @return
-     */
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list_customer", method = RequestMethod.POST)
-    public Result listCustomer(@RequestParam(value = "realName", required = false) String realName,
-                               @RequestParam(value = "enable", required = false) Boolean enable,
-                               @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                               @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok();
-    }
-
-    /**
-     * 根据科目查询命题老师
-     *
-     * @param courseCode
-     * @param param
-     * @return
-     */
-    @ApiOperation(value = "根据科目查询命题老师")
-    @RequestMapping(value = "/user_list", method = RequestMethod.POST)
-    public Result userQuery(@RequestParam(value = "courseCode", required = false) String courseCode,
-                            @RequestParam(value = "param", required = false) String param) {
-        return ResultUtil.ok();
+        return ResultUtil.ok(sysUserService.listForPrintSystem(userInfo, SystemConstant.convertIdToLong(orgId), roleId, enable, pageNumber, pageSize));
     }
 
     /**
      * 新增/修改
      *
      * @param userSaveParams
-     * @return
      */
     @ApiOperation(value = "新增/修改")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @PostMapping("/save")
     public Result save(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) throws IllegalAccessException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long upUserId = sysUserService.saveUser(userSaveParams);
-        return ResultUtil.ok();
-    }
-
-    /**
-     * 新增客服
-     *
-     * @param userSaveParams
-     * @return
-     */
-    @ApiOperation(value = "新增客服")
-    @RequestMapping(value = "/save_customer", method = RequestMethod.POST)
-    public Result saveCustomer(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        return ResultUtil.ok(sysUserService.saveCustomer(userSaveParams));
+        return ResultUtil.ok(sysUserService.saveUser(userSaveParams));
     }
 
     /**
      * 启用/禁用
      *
      * @param user
-     * @return
      */
     @ApiOperation(value = "启用/禁用")
-    @RequestMapping(value = "/enable", method = RequestMethod.POST)
+    @PostMapping("/enable")
     public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException, IllegalAccessException {
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok();
+        return ResultUtil.ok(sysUserService.enable(user));
     }
 
     /**
      * 重置密码
      *
      * @param user
-     * @return
      */
     @ApiOperation(value = "重置密码")
-    @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
+    @PostMapping("/reset_password")
     public Result resetPassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.resetPassword(user.getId()));
     }
 
     /**
      * 修改密码
-     *
-     * @return
      */
     @ApiOperation(value = "修改密码")
-    @RequestMapping(value = "/update_password", method = RequestMethod.POST)
+    @PostMapping("/update_password")
     @Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
     public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
         return ResultUtil.ok(sysUserService.updatePassword(user));
@@ -173,10 +114,9 @@ public class SysUserController {
      * 绑定角色
      *
      * @param sysUser
-     * @return
      */
     @ApiOperation(value = "绑定角色")
-    @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
+    @PostMapping("/bind_roles")
     public Result bindRoles(@RequestBody SysUser sysUser) {
         return ResultUtil.ok(sysUserService.bindRoles(sysUser));
     }