基础学生类迁移

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

@@ -3,11 +3,11 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskPrintDto;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintClassDto;
+import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
 import com.qmth.distributed.print.business.bean.dto.TaskPrintExtendFieldsDto;
 import com.qmth.distributed.print.business.bean.dto.TaskPrintHouseDto;
 import com.qmth.distributed.print.business.bean.params.ExamTaskPrintParams;
-import com.qmth.distributed.print.business.entity.BasicStudent;
+import com.qmth.teachcloud.common.entity.BasicStudent;
 import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.distributed.print.business.entity.ExamTaskPrint;
 

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

@@ -5,15 +5,15 @@ 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.qmth.distributed.print.business.bean.dto.TaskPrintClassDto;
-import com.qmth.distributed.print.business.bean.dto.excel.BasicStudentImportDto;
-import com.qmth.distributed.print.business.bean.params.BasicStudentParams;
-import com.qmth.distributed.print.business.bean.result.BasicStudentResult;
+import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
+import com.qmth.teachcloud.common.bean.dto.excel.BasicStudentImportDto;
+import com.qmth.teachcloud.common.bean.params.BasicStudentParams;
+import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
 import com.qmth.teachcloud.common.entity.BasicClazz;
-import com.qmth.distributed.print.business.entity.BasicStudent;
-import com.qmth.distributed.print.business.mapper.BasicStudentMapper;
+import com.qmth.teachcloud.common.entity.BasicStudent;
+import com.qmth.teachcloud.common.mapper.BasicStudentMapper;
 import com.qmth.teachcloud.common.service.BasicClazzService;
-import com.qmth.distributed.print.business.service.BasicStudentService;
+import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;

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

@@ -18,7 +18,9 @@ import com.qmth.distributed.print.business.mapper.ExamTaskPrintMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.teachcloud.common.bean.dto.MqDto;
+import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicStudent;
 import com.qmth.teachcloud.common.entity.BasicUserCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
@@ -26,6 +28,7 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.MqTagEnum;
 import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
+import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.teachcloud.common.service.BasicUserCourseService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.ConvertUtil;

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

@@ -14,7 +14,7 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.teachcloud.common.bean.dto.excel.BasicClazzImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.BasicCourseImportDto;
-import com.qmth.distributed.print.business.bean.dto.excel.BasicStudentImportDto;
+import com.qmth.teachcloud.common.bean.dto.excel.BasicStudentImportDto;
 import com.qmth.distributed.print.business.bean.params.SerialNumberParams;
 import com.qmth.distributed.print.business.cache.CreatePdfCacheUtil;
 import com.qmth.distributed.print.business.entity.*;

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

@@ -1,12 +1,10 @@
 package com.qmth.distributed.print.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.distributed.print.business.bean.params.BasicStudentParams;
+import com.qmth.teachcloud.common.bean.params.BasicStudentParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.distributed.print.business.service.BasicStudentService;
+import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncStudentDataImportService;
 import com.qmth.teachcloud.common.contant.SystemConstant;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/TaskPrintClassDto.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/TaskPrintClassDto.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.dto;
+package com.qmth.teachcloud.common.bean.dto;
 
 /**
  * @Date: 2021/3/29.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/excel/BasicStudentImportDto.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/BasicStudentImportDto.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.dto.excel;
+package com.qmth.teachcloud.common.bean.dto.excel;
 
 import com.qmth.teachcloud.common.annotation.ExcelNote;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/BasicStudentParams.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicStudentParams.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.params;
+package com.qmth.teachcloud.common.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/BasicStudentResult.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicStudentResult.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.result;
+package com.qmth.teachcloud.common.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicStudent.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicStudent.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicStudentMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicStudentMapper.java

@@ -1,11 +1,11 @@
-package com.qmth.distributed.print.business.mapper;
+package com.qmth.teachcloud.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintClassDto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.result.BasicStudentResult;
-import com.qmth.distributed.print.business.entity.BasicStudent;
+import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
+import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
+import com.qmth.teachcloud.common.entity.BasicStudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicStudentService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/BasicStudentService.java

@@ -1,12 +1,12 @@
-package com.qmth.distributed.print.business.service;
+package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.TaskPrintClassDto;
-import com.qmth.distributed.print.business.bean.params.BasicStudentParams;
-import com.qmth.distributed.print.business.bean.result.BasicStudentResult;
-import com.qmth.distributed.print.business.entity.BasicStudent;
+import com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto;
+import com.qmth.teachcloud.common.bean.params.BasicStudentParams;
+import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
+import com.qmth.teachcloud.common.entity.BasicStudent;
 import com.qmth.teachcloud.common.entity.SysUser;
 import org.springframework.util.LinkedMultiValueMap;
 

distributed-print-business/src/main/resources/mapper/BasicStudentMapper.xml → teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.BasicStudentMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.BasicStudentMapper">
 
-    <select id="listByClass" resultType="com.qmth.distributed.print.business.bean.dto.TaskPrintClassDto">
+    <select id="listByClass" resultType="com.qmth.teachcloud.common.bean.dto.TaskPrintClassDto">
         SELECT
             s.clazz_id classId,
             clz.clazz_name className,
@@ -23,7 +23,7 @@
     </select>
 
     <select id="findBasicStudentPage"
-            resultType="com.qmth.distributed.print.business.bean.result.BasicStudentResult">
+            resultType="com.qmth.teachcloud.common.bean.result.BasicStudentResult">
         SELECT
             stu.id,
             student_name AS studentName,