印刷计划管理 考务管理 bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/PrintPlanParams.java

@@ -23,9 +23,7 @@ public class PrintPlanParams {
     private Long id;
 
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id",required = true)
-    @NotNull(message = "请输入学校id")
-    @Range(min = 1L,message = "请输入学校id")
+    @ApiModelProperty(value = "学校id")
     private Long schoolId;
 
     @ApiModelProperty(value = "印刷计划名称",required = true)
@@ -47,7 +45,7 @@ public class PrintPlanParams {
 
     @ApiModelProperty(value = "*打印内容：{“PAPER”, \"CARD\"}",required = true)
     @NotNull(message = "请输入打印内容")
-    private List<String> printContentList;
+    private List<String> printContent;
 
     @ApiModelProperty(value = "备份方式：PLACE-按考点，ROOM-按考场",required = true)
     @NotNull(message = "请输入备份方式")
@@ -110,12 +108,12 @@ public class PrintPlanParams {
         this.examEndTime = examEndTime;
     }
 
-    public List<String> getPrintContentList() {
-        return printContentList;
+    public List<String> getPrintContent() {
+        return printContent;
     }
 
-    public void setPrintContentList(List<String> printContentList) {
-        this.printContentList = printContentList;
+    public void setPrintContent(List<String> printContent) {
+        this.printContent = printContent;
     }
 
     public BackupMethodEnum getBackupMethod() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ExaminationDetailResult.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -8,9 +10,12 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2021-04-08
  */
 public class ExaminationDetailResult {
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考务数据-学生明细主键")
     private Long id;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "印刷计划主键")
     private Long printPlanId;
 
@@ -41,6 +46,7 @@ public class ExaminationDetailResult {
     @ApiModelProperty(value = "座位号")
     private String siteNumber;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人主键")
     private Long createId;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ExaminationResult.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -8,9 +10,12 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2021-04-07
  */
 public class ExaminationResult {
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "examDetailId")
     private Long id;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学校id")
     private Long schoolId;
 
@@ -44,6 +49,7 @@ public class ExaminationResult {
     @ApiModelProperty(value = "科次")
     private int totalSubjects;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人id")
     private Long createId;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/PrintPlanBrief.java

@@ -1,5 +1,8 @@
 package com.qmth.distributed.print.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -9,15 +12,20 @@ import io.swagger.annotations.ApiModelProperty;
  */
 public class PrintPlanBrief {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "印刷计划id")
     private Long id;
 
     @ApiModelProperty(value = "印刷计划名称")
     private String name;
 
-    public PrintPlanBrief(Long id, String name) {
+    @ApiModelProperty(value = "印刷计划状态")
+    private PrintPlanStatusEnum status;
+
+    public PrintPlanBrief(Long id, String name, PrintPlanStatusEnum status) {
         this.id = id;
         this.name = name;
+        this.status = status;
     }
 
     public PrintPlanBrief() {
@@ -38,4 +46,12 @@ public class PrintPlanBrief {
     public void setName(String name) {
         this.name = name;
     }
+
+    public PrintPlanStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(PrintPlanStatusEnum status) {
+        this.status = status;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/PrintPlanResult.java

@@ -1,6 +1,8 @@
 package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.BackupMethodEnum;
 import com.qmth.distributed.print.business.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
@@ -16,6 +18,7 @@ import java.util.Map;
  */
 public class PrintPlanResult {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "印刷计划id")
     private Long id;
 
@@ -66,6 +69,7 @@ public class PrintPlanResult {
     @ApiModelProperty(value = "普通印品JSON临时接收属性")
     private String ordinaryContentTemp;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人id")
     private Long createId;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/SummarizedDataResult.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -8,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2021-04-08
  */
 public class SummarizedDataResult {
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学校id")
     private Long schoolId;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TemplatePrintInfoResult.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,18 +12,22 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2021-04-05
  */
 public class TemplatePrintInfoResult {
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "关联表id")
     private Long templateOrgId;
 
     @ApiModelProperty(value = "关联表印品类型")
     private TemplateTypeEnum templateOrgType;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "机构id")
     private Long orgId;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "模板id")
     private Long templateId;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学校id")
     private Long schoolId;
 

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

@@ -7,7 +7,6 @@ import com.qmth.distributed.print.business.entity.SysOrg;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -23,7 +23,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
 
     IPage<ExaminationResult> findBriefPage(@Param("page") Page<ExaminationResult> page,
                                            @Param("schoolId") Long schoolId,
-                                           @Param("printPlanName") String printPlanName,
+                                           @Param("printPlanId") Long printPlanId,
                                            @Param("courseCode") String courseCode,
                                            @Param("paperNumber") String paperNumber,
                                            @Param("examPlace") String examPlace,

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

@@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Param;
 public interface ExamPrintPlanMapper extends BaseMapper<ExamPrintPlan> {
     IPage<PrintPlanResult> findPrintPlanPage(@Param("iPage") Page<PrintPlanResult> iPage,
                                              @Param("schoolId") Long schoolId,
-                                             @Param("name") String name,
+                                             @Param("printPlanId") Long printPlanId,
                                              @Param("status") PrintPlanStatusEnum status,
                                              @Param("startTime") Long startTime,
                                              @Param("endTime") Long endTime);

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

@@ -63,7 +63,7 @@ public interface ExamDetailService extends IService<ExamDetail> {
     /**
      * 查询考务数据-简略
      * @param schoolId 学校id
-     * @param printPlanName 印刷计划名称
+     * @param printPlanId 印刷计划id
      * @param courseCode 课程代码
      * @param paperNumber 试卷编号
      * @param examPlace 考点
@@ -73,13 +73,13 @@ public interface ExamDetailService extends IService<ExamDetail> {
      * @param pageSize 分页数量
      * @return 查询结果
      */
-    IPage<ExaminationResult> findExaminationBriefPage(Long schoolId,String printPlanName,String courseCode,String paperNumber,
+    IPage<ExaminationResult> findExaminationBriefPage(Long schoolId,Long printPlanId,String courseCode,String paperNumber,
                                                       String examPlace,String examRoom,String packageCode,int pageNumber,int pageSize);
 
     /**
      * 查询考务数据-汇总数据查询
      * @param schoolId 学校id
-     * @param printPlanName 印刷计划名称
+     * @param printPlanId 印刷计划id
      * @param courseCode 课程代码
      * @param paperNumber 试卷编号
      * @param examPlace 考点
@@ -87,7 +87,7 @@ public interface ExamDetailService extends IService<ExamDetail> {
      * @param packageCode 卷袋编号
      * @return 查询结果
      */
-    SummarizedDataResult findSummarizedData(Long schoolId,String printPlanName,String courseCode,String paperNumber,
+    SummarizedDataResult findSummarizedData(Long schoolId,Long printPlanId,String courseCode,String paperNumber,
                                             String examPlace,String examRoom,String packageCode);
 
 
@@ -108,16 +108,14 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     /**
      * 查询印刷计划下考点数据源
-     * @param printPlaneId 印刷计划id
      * @return 考点集合
      */
-    List<String> findExamPlaceDatasource(Long printPlaneId);
+    List<String> findExamPlaceDatasource();
 
     /**
      * 查询印刷计划下考场数据源
-     * @param printPlaneId 印刷计划id
      * @return 考场集合
      */
-    List<String> findExamRoomDatasource(Long printPlaneId);
+    List<String> findExamRoomDatasource();
 
 }

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

@@ -25,36 +25,38 @@ import java.util.Map;
 public interface ExamPrintPlanService extends IService<ExamPrintPlan> {
     /**
      * 印刷计划分页查询
-     * @param schoolId 学校id
-     * @param name 印刷计划名称
-     * @param status 印刷计划状态
-     * @param startTime 印刷计划创建时间开始
-     * @param endTime 印刷计划创建时间结束
+     *
+     * @param schoolId   学校id
+     * @param printPlanId  印刷计划名称
+     * @param status     印刷计划状态
+     * @param startTime  印刷计划创建时间开始
+     * @param endTime    印刷计划创建时间结束
      * @param pageNumber 分页页数
-     * @param pageSize 分页容量
+     * @param pageSize   分页容量
      * @return 分页查询结果
      */
-    IPage<PrintPlanResult> printPlanPage(Long schoolId, String name, PrintPlanStatusEnum status, Long startTime, Long endTime, int pageNumber, int pageSize);
+    IPage<PrintPlanResult> printPlanPage(Long schoolId, Long printPlanId, PrintPlanStatusEnum status, Long startTime, Long endTime, int pageNumber, int pageSize);
 
     /**
      * 印刷计划模糊名称
-     * @param param 印刷计划名称
+     *
      * @return 印刷计划id和名称
      */
-    List<PrintPlanBrief> printPlanBriefQuery(String param);
-
+    List<PrintPlanBrief> printPlanBriefQuery();
 
 
     /**
      * 查询登录用户所属机构下变量印品和普通印品模板数据源
+     *
      * @param schoolId 学校id
-     * @param userId 登录用户id
+     * @param userId   登录用户id
      * @return 模板数据源
      */
-    Map<String,Object> printPlanTemplateDatasource(Long schoolId,Long userId);
+    Map<String, Object> printPlanTemplateDatasource(Long schoolId, Long userId);
 
     /**
      * 保存印刷计划
+     *
      * @param printPlanParams 印刷计划参数
      * @return 是否成功
      */
@@ -62,6 +64,7 @@ public interface ExamPrintPlanService extends IService<ExamPrintPlan> {
 
     /**
      * 删除印刷计划
+     *
      * @param deleteParams 删除参数
      * @return 是否成功
      */

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

@@ -186,8 +186,8 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public IPage<ExaminationResult> findExaminationBriefPage(Long schoolId, String printPlanName, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode, int pageNumber, int pageSize) {
-        IPage<ExaminationResult> page = examDetailMapper.findBriefPage(new Page<>(pageNumber,pageSize),schoolId,printPlanName,courseCode,paperNumber,examPlace,examRoom,packageCode);
+    public IPage<ExaminationResult> findExaminationBriefPage(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode, int pageNumber, int pageSize) {
+        IPage<ExaminationResult> page = examDetailMapper.findBriefPage(new Page<>(pageNumber,pageSize),schoolId,printPlanId,courseCode,paperNumber,examPlace,examRoom,packageCode);
         List<ExaminationResult> list = page.getRecords();
         for (ExaminationResult examinationResult : list) {
             String examDetailCourseIds = examinationResult.getExamDetailCourseIds();
@@ -217,8 +217,8 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public SummarizedDataResult findSummarizedData(Long schoolId, String printPlanName, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode) {
-        IPage<ExaminationResult> page = this.findExaminationBriefPage(schoolId, printPlanName, courseCode, paperNumber, examPlace, examRoom, packageCode, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE);
+    public SummarizedDataResult findSummarizedData(Long schoolId, Long printPlanId, String courseCode, String paperNumber, String examPlace, String examRoom, String packageCode) {
+        IPage<ExaminationResult> page = this.findExaminationBriefPage(schoolId, printPlanId, courseCode, paperNumber, examPlace, examRoom, packageCode, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE);
         List<ExaminationResult> list = page.getRecords();
         int totalSubjects = 0;
         int packageCount = 0;
@@ -243,15 +243,15 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<String> findExamPlaceDatasource(Long printPlaneId) {
-        List<ExamDetail> examDetail = this.list(new QueryWrapper<ExamDetail>().lambda().eq(ExamDetail::getPrintPlanId,printPlaneId));
+    public List<String> findExamPlaceDatasource() {
+        List<ExamDetail> examDetail = this.list();
         return examDetail.stream().map(ExamDetail::getExamPlace).distinct().collect(Collectors.toList());
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<String> findExamRoomDatasource(Long printPlaneId) {
-        List<ExamDetail> examDetail = this.list(new QueryWrapper<ExamDetail>().lambda().eq(ExamDetail::getPrintPlanId,printPlaneId));
+    public List<String> findExamRoomDatasource() {
+        List<ExamDetail> examDetail = this.list();
         return examDetail.stream().map(ExamDetail::getExamRoom).distinct().collect(Collectors.toList());
     }
 }

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

@@ -60,8 +60,8 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public IPage<PrintPlanResult> printPlanPage(Long schoolId, String name, PrintPlanStatusEnum status, Long startTime, Long endTime, int pageNumber, int pageSize) {
-        IPage<PrintPlanResult> page = examPrintPlanMapper.findPrintPlanPage(new Page<>(pageNumber, pageSize), schoolId, name, status, startTime, endTime);
+    public IPage<PrintPlanResult> printPlanPage(Long schoolId, Long printPlanId, PrintPlanStatusEnum status, Long startTime, Long endTime, int pageNumber, int pageSize) {
+        IPage<PrintPlanResult> page = examPrintPlanMapper.findPrintPlanPage(new Page<>(pageNumber, pageSize), schoolId, printPlanId, status, startTime, endTime);
         List<PrintPlanResult> list = page.getRecords();
         for (PrintPlanResult printPlanResult : list) {
             List<Map> variableContent = JSONObject.parseArray(printPlanResult.getVariableContentTemp(), Map.class);
@@ -79,13 +79,14 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<PrintPlanBrief> printPlanBriefQuery(String param) {
+    public List<PrintPlanBrief> printPlanBriefQuery() {
         List<PrintPlanBrief> printPlanBriefList = new ArrayList<>();
-        List<ExamPrintPlan> examPrintPlanList = this.list(new QueryWrapper<ExamPrintPlan>().lambda().like(ExamPrintPlan::getName, param));
+        List<ExamPrintPlan> examPrintPlanList = this.list();
         for (ExamPrintPlan examPrintPlan : examPrintPlanList) {
             Long id = examPrintPlan.getId();
             String name = examPrintPlan.getName();
-            printPlanBriefList.add(new PrintPlanBrief(id, name));
+            PrintPlanStatusEnum status = examPrintPlan.getStatus();
+            printPlanBriefList.add(new PrintPlanBrief(id, name ,status));
         }
         return printPlanBriefList;
     }
@@ -129,7 +130,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             List<Map<String,Object>> templateList = new ArrayList<>();
             for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
                 Map<String, Object> printMap = new HashMap<>();
-                printMap.put("id", templatePrintInfoResult.getTemplateId());
+                printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
                 printMap.put("name", templatePrintInfoResult.getTemplateName());
                 templateList.add(printMap);
             }
@@ -151,7 +152,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             List<Map<String,Object>> templateList = new ArrayList<>();
             for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
                 Map<String, Object> printMap = new HashMap<>();
-                printMap.put("id", templatePrintInfoResult.getTemplateId());
+                printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
                 printMap.put("name", templatePrintInfoResult.getTemplateName());
                 templateList.add(printMap);
             }
@@ -179,7 +180,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             throw ExceptionResultEnum.ERROR.exception("输入的学校id不满足条件 schoolId = " + schoolId);
         }
 
-        List<String> printContentList = printPlanParams.getPrintContentList();
+        List<String> printContentList = printPlanParams.getPrintContent();
         if (printContentList.contains("PAPER") && !printContentList.contains("CARD")) {
             throw ExceptionResultEnum.ERROR.exception("如果试卷题卡印品选择了试卷，题卡必须被选择");
         }

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

@@ -54,17 +54,17 @@
             <if test="schoolId != null and schoolId > 0">
                 AND det.school_id = #{schoolId}
             </if>
-            <if test="printPlanName != null and printPlanName.length > 0">
-                AND det.print_plan_name LIKE CONCAT('%',#{printPlanName},'%')
+            <if test="printPlanId != null and printPlanId > 0">
+                AND det.print_plan_id = #{printPlanId}
             </if>
             <if test="examPlace != null and examPlace.length > 0">
-                AND det.exam_place LIKE CONCAT('%',#{examPlace},'%')
+                AND det.exam_place = #{examPlace}
             </if>
             <if test="examRoom != null and examRoom.length > 0">
-                AND det.exam_room LIKE CONCAT('%',#{examRoom},'%')
+                AND det.exam_room = #{examRoom}
             </if>
             <if test="packageCode != null and packageCode.length > 0">
-                AND det.package_code LIKE CONCAT('%',#{packageCode},'%')
+                AND det.package_code = #{packageCode}
             </if>
         </where>
         GROUP BY det.id

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

@@ -58,8 +58,8 @@
             <if test="schoolId != null and schoolId > 0">
                 and school_id = #{schoolId}
             </if>
-            <if test="name != null and name.length > 0">
-                and name LIKE CONCAT('%',#{name},'%')
+            <if test="printPlanId != null and printPlanId > 0">
+                and id = #{printPlanId}
             </if>
             <if test="status != null">
                 and status = #{status}

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

@@ -51,7 +51,6 @@ public class ExamDetailController {
     @RequestMapping(value = "/data_import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     public Result examinationImportAysnc(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-                                         @ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
                                          @ApiParam(value = "印刷计划id", required = true) @RequestParam String printPlanId) throws Exception {
         Map<String, Object> map = tbTaskService.saveTask(SystemConstant.convertIdToLong(printPlanId), file, TaskTypeEnum.EXAMINATION_IMPORT);
         asyncExaminationImportTemplateService.importTask(map);
@@ -62,8 +61,7 @@ public class ExamDetailController {
     @ApiOperation(value = "考务数据导入-查询")
     @RequestMapping(value = "/data_list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findExaminationBrief(@ApiParam(value = "学校主键", required = true) @RequestParam String schoolId,
-                                       @ApiParam(value = "印刷计划名称") @RequestParam(required = false) String printPlanName,
+    public Result findExaminationBrief(@ApiParam(value = "印刷计划id") @RequestParam(required = false) String printPlanId,
                                        @ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
                                        @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                        @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
@@ -72,29 +70,30 @@ public class ExamDetailController {
                                        @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                        @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
 
-        return ResultUtil.ok(examDetailService.findExaminationBriefPage(SystemConstant.convertIdToLong(schoolId),
-                printPlanName, courseCode, paperNumber, examPlace, examRoom, packageCode, pageNumber, pageSize));
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return ResultUtil.ok(examDetailService.findExaminationBriefPage(schoolId,
+                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "考务数据导入-汇总数据查询")
     @RequestMapping(value = "/data_total", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findSummarizedData(@ApiParam(value = "学校主键", required = true) @RequestParam String schoolId,
-                                     @ApiParam(value = "印刷计划名称") @RequestParam(required = false) String printPlanName,
+    public Result findSummarizedData(@ApiParam(value = "印刷计划id") @RequestParam(required = false) String printPlanId,
                                      @ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
                                      @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                      @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
                                      @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
                                      @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) {
 
-        return ResultUtil.ok(examDetailService.findSummarizedData(SystemConstant.convertIdToLong(schoolId),
-                printPlanName, courseCode, paperNumber, examPlace, examRoom, packageCode));
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return ResultUtil.ok(examDetailService.findSummarizedData(schoolId,
+                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode));
     }
 
     @ApiOperation(value = "考务数据导入-查看明细")
     @RequestMapping(value = "/data_detail", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findExaminationDetail(@ApiParam(value = "印刷计划主键", required = true) @RequestParam String printPlanId,
+    public Result findExaminationDetail(@ApiParam(value = "印刷计划主键") @RequestParam(required = false) String printPlanId,
                                         @ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
                                         @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                                         @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
@@ -110,15 +109,15 @@ public class ExamDetailController {
     @ApiOperation(value = "考务数据导入-考点模糊查询")
     @RequestMapping(value = "/data_place_query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findExamPlaceDatasource(@ApiParam(value = "印刷计划主键", required = true) @RequestParam String printPlanId) {
-        return ResultUtil.ok(examDetailService.findExamPlaceDatasource(SystemConstant.convertIdToLong(printPlanId)));
+    public Result findExamPlaceDatasource() {
+        return ResultUtil.ok(examDetailService.findExamPlaceDatasource());
     }
 
     @ApiOperation(value = "考务数据导入-考场模糊查询")
     @RequestMapping(value = "/data_room_query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findExamRoomDatasource(@ApiParam(value = "印刷计划主键", required = true) @RequestParam String printPlanId) {
-        return ResultUtil.ok(examDetailService.findExamRoomDatasource(SystemConstant.convertIdToLong(printPlanId)));
+    public Result findExamRoomDatasource() {
+        return ResultUtil.ok(examDetailService.findExamRoomDatasource());
     }
 
     @ApiOperation(value = "考务数据导入-模板下载")

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

@@ -11,11 +11,13 @@ import com.qmth.distributed.print.business.bean.params.DeleteParams;
 import com.qmth.distributed.print.business.bean.params.PrintPlanParams;
 import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.service.ExamDetailService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import com.qmth.distributed.print.business.service.ExamTaskDetailService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
@@ -58,31 +60,32 @@ public class ExamPrintPlanController {
     @ApiOperation(value = "印刷计划查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findPrintPlanPage(@ApiParam(value = "学校主键", required = true) @RequestParam String schoolId,
-                                    @ApiParam(value = "印刷计划名称") @RequestParam(required = false) String name,
+    public Result findPrintPlanPage(@ApiParam(value = "印刷计划id") @RequestParam(required = false) String printPlanId,
                                     @ApiParam(value = "印刷计划状态") @RequestParam(required = false) PrintPlanStatusEnum status,
                                     @ApiParam(value = "计划创建时间段开始时间") @RequestParam(required = false) Long startTime,
                                     @ApiParam(value = "计划创建时间段结束时间") @RequestParam(required = false) Long endTime,
                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
 
-        return ResultUtil.ok(examPrintPlanService.printPlanPage(SystemConstant.convertIdToLong(schoolId), name, status, startTime, endTime, pageNumber, pageSize));
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return ResultUtil.ok(examPrintPlanService.printPlanPage(schoolId, SystemConstant.convertIdToLong(printPlanId), status, startTime, endTime, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "印刷计划模糊查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findPrintPlanQuery(@ApiParam(value = "印刷计划名称", required = true) @RequestParam String param) {
-        return ResultUtil.ok(examPrintPlanService.printPlanBriefQuery(param));
+    public Result findPrintPlanQuery() {
+        return ResultUtil.ok(examPrintPlanService.printPlanBriefQuery());
     }
 
     @ApiOperation(value = "按类型查询模板")
     @RequestMapping(value = "/get_template", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findPrintPlanPage(@ApiParam(value = "学校主键", required = true) @RequestParam String schoolId,
-                                    @ApiParam(value = "用户主键", required = true) @RequestParam String userId) {
-
-        return ResultUtil.ok(examPrintPlanService.printPlanTemplateDatasource(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(userId)));
+    public Result findPrintPlanPage() {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        Long userId = user.getId();
+        return ResultUtil.ok(examPrintPlanService.printPlanTemplateDatasource(schoolId, userId));
     }
 
     @ApiOperation(value = "印刷计划-新增/修改")
@@ -92,6 +95,8 @@ public class ExamPrintPlanController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        printPlanParams.setSchoolId(schoolId);
         return ResultUtil.ok(examPrintPlanService.savePrintPlan(printPlanParams));
     }
 

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

@@ -40,10 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.security.NoSuchAlgorithmException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -83,6 +80,9 @@ public class SysController {
     @Resource
     BasicAttachmentService basicAttachmentService;
 
+    @Autowired
+    private SysConfigService sysConfigService;
+
     /**
      * 登录
      *
@@ -144,26 +144,26 @@ public class SysController {
         if (!sysUser.getEnable()) {
             throw ExceptionResultEnum.USER_ENABLE.exception();
         }
-        //校验验证码
-//        String value = sysConfigService.getByKey("sys.code.enable");
-//        if (Objects.nonNull(value) && value.equals("true")) {
-//            String code = login.getCode();
-//            if (Objects.isNull(code)) {
-//                throw ExceptionResultEnum.ERROR.exception("验证码为空");
-//            }
-//            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(code)) {
-//                QueryWrapper<BasicVerifyCode> codeWrapper = new QueryWrapper<>();
-//                codeWrapper.lambda().eq(BasicVerifyCode::getMobileNumber, sysUser.getMobileNumber()).eq(BasicVerifyCode::getUserId, sysUser.getId());
-//                BasicVerifyCode accessControl = basicVerifyCodeService.getOne(codeWrapper);
-//                if (accessControl == null || (accessControl != null && !accessControl.getVerifyCode().equals(code))) {
-//                    throw ExceptionResultEnum.ERROR.exception("短信验证码错误，请仔细核对后再次输入");
-//                }
-//
-//                if (new Date(accessControl.getExpireTime()).before(new Date())) {
-//                    throw ExceptionResultEnum.ERROR.exception("短信验证码已过期");
-//                }
-//            }
-//        }
+//        校验验证码
+        SysConfig value = sysConfigService.getByKey("sys.code.enable");
+        if (Objects.nonNull(value) && value.getConfigValue().equals("true")) {
+            String code = login.getCode();
+            if (Objects.isNull(code)) {
+                throw ExceptionResultEnum.ERROR.exception("验证码为空");
+            }
+            if (!dictionaryConfig.smsDomain().getSmsNormalCode().equals(code)) {
+                QueryWrapper<BasicVerifyCode> codeWrapper = new QueryWrapper<>();
+                codeWrapper.lambda().eq(BasicVerifyCode::getMobileNumber, sysUser.getMobileNumber()).eq(BasicVerifyCode::getUserId, sysUser.getId());
+                BasicVerifyCode accessControl = basicVerifyCodeService.getOne(codeWrapper);
+                if (accessControl == null || (accessControl != null && !accessControl.getVerifyCode().equals(code))) {
+                    throw ExceptionResultEnum.ERROR.exception("短信验证码错误，请仔细核对后再次输入");
+                }
+
+                if (new Date(accessControl.getExpireTime()).before(new Date())) {
+                    throw ExceptionResultEnum.ERROR.exception("短信验证码已过期");
+                }
+            }
+        }
 
         Platform platform = ServletUtil.getRequestPlatform();
         String deviceId = ServletUtil.getRequestDeviceId();