部分小改动

paper-library-business/src/main/java/com/qmth/paper/library/business/bean/params/PaperScanTaskParam.java

@@ -50,6 +50,9 @@ public class PaperScanTaskParam implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long scanUserId;
 
+    @ApiModelProperty(value = "扫描份数（学生数）")
+    private Integer studentCount;
+
     public Long getPaperScanTaskId() {
         return paperScanTaskId;
     }
@@ -105,4 +108,12 @@ public class PaperScanTaskParam implements Serializable {
     public void setScanUserId(Long scanUserId) {
         this.scanUserId = scanUserId;
     }
+
+    public Integer getStudentCount() {
+        return studentCount;
+    }
+
+    public void setStudentCount(Integer studentCount) {
+        this.studentCount = studentCount;
+    }
 }

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

@@ -46,6 +46,9 @@ public class PaperScanTaskResult implements Serializable {
     @ApiModelProperty(value = "扫描量")
     private int scanCount;
 
+    @ApiModelProperty(value = "学生数")
+    private int studentCount;
+
     @ApiModelProperty(value = "绑定进度")
     private BigDecimal bindProgress;
 
@@ -136,6 +139,14 @@ public class PaperScanTaskResult implements Serializable {
         this.scanCount = scanCount;
     }
 
+    public int getStudentCount() {
+        return studentCount;
+    }
+
+    public void setStudentCount(int studentCount) {
+        this.studentCount = studentCount;
+    }
+
     public BigDecimal getBindProgress() {
         return bindProgress;
     }

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

@@ -13,9 +13,11 @@ import com.qmth.paper.library.business.bean.result.PaperScanTaskResult;
 import com.qmth.paper.library.business.bean.result.SelectResult;
 import com.qmth.paper.library.business.entity.PaperLibrary;
 import com.qmth.paper.library.business.entity.PaperScanTask;
+import com.qmth.paper.library.business.entity.PaperScanTaskDetail;
 import com.qmth.paper.library.business.mapper.PaperScanTaskMapper;
 import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.business.service.PaperLibraryService;
+import com.qmth.paper.library.business.service.PaperScanTaskDetailService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.SysUser;
@@ -45,6 +47,8 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
     private SysUserService sysUserService;
     @Resource
     private PaperLibraryService paperLibraryService;
+    @Resource
+    private PaperScanTaskDetailService paperScanTaskDetailService;
 
     @Override
     public IPage<PaperScanTaskResult> paperScanTaskPage(String courseName, String teacherName, int smallerProgress, int largerProgress, int pageNumber, int pageSize, SysUser requestUser) {
@@ -80,6 +84,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
         String teacherName = paperScanTaskParam.getTeacherName();
         String teacherClazzName = paperScanTaskParam.getTeachClazzName();
         Long scanUserId = paperScanTaskParam.getScanUserId();
+        Integer studentCount = paperScanTaskParam.getStudentCount();
         if (SystemConstant.longNotNull(scanUserId)) {
             SysUser sysUser = sysUserService.getById(scanUserId);
             if (Objects.isNull(sysUser)) {
@@ -95,6 +100,7 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
         paperScanTask.setCourseName(courseName);
         paperScanTask.setTeacherName(teacherName);
         paperScanTask.setTeachClazzName(teacherClazzName);
+        paperScanTask.setStudentCount(studentCount);
         if (SystemConstant.longNotNull(scanUserId)) {
             paperScanTask.setScanUserId(scanUserId);
         }
@@ -137,6 +143,9 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
             }
         }
         this.removeByIds(idList);
+
+        // 删除扫描详情
+        paperScanTaskDetailService.remove(new QueryWrapper<PaperScanTaskDetail>().lambda().in(PaperScanTaskDetail::getPaperScanTaskId,idList));
     }
 
     @Override
@@ -209,6 +218,13 @@ public class PaperScanTaskServiceImpl extends ServiceImpl<PaperScanTaskMapper, P
 
             // 删除该任务扫描的的数据
             paperLibraryService.removeByIds(willDeletePaperLibraryList);
+
+            // TODO: 2022/10/9 下面单独拆一个api 
+            // 清除扫描任务相关信息（扫描员，扫描量）
+            paperScanTask.setScanUserId(null);
+            paperScanTask.setScanCount(null);
+            paperScanTask.updateInfo(requestUser.getId());
+            this.updateById(paperScanTask);
         }
     }
 

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

@@ -256,8 +256,21 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 paperScanTaskDetail.setStudentId(studentId);
                 return Stream.of(paperScanTaskDetail);
             }).collect(Collectors.toList());
-
             paperScanTaskDetailService.saveOrUpdateBatch(paperScanTaskDetailList);
+
+            // 更新扫描任务冗余字段扫描份数（学生数量）
+            List<PaperScanTask> paperScanTaskList = paperScanTaskService.list(new QueryWrapper<PaperScanTask>()
+                    .lambda()
+                    .eq(PaperScanTask::getSchoolId,schoolId)
+                    .eq(PaperScanTask::getPaperArchivesId,paperArchivesId));
+            for (PaperScanTask paperScanTask : paperScanTaskList) {
+                Long paperScanTaskId = paperScanTask.getId();
+                int studentCount = paperScanTaskDetailService.count(new QueryWrapper<PaperScanTaskDetail>()
+                        .lambda()
+                        .eq(PaperScanTaskDetail::getPaperScanTaskId,paperScanTaskId));
+                paperScanTask.setStudentCount(studentCount);
+            }
+            paperScanTaskService.saveOrUpdateBatch(paperScanTaskList);
         }
         return map;
     }

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

@@ -11,6 +11,7 @@
             pst.teacher_name AS teacherName,
             pst.teach_clazz_name AS teachClazzName,
             pst.scan_user_id AS scanUserId,
+            pst.student_count AS studentCount,
             pa.id AS paperArchivesId,
             pa.archives_name AS archivesName,
             pa.archives_code AS archivesCode,

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

@@ -167,7 +167,8 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                             addOrg.insertInfo(sysUser.getId());
                             addOrg.setSchoolId(schoolId);
                             addOrg.setParentId(schoolOrgId);
-                            sysOrgService.saveOrg(addOrg);
+                            addOrg.setName(collegeName);
+                            sysOrgService.save(addOrg);
                             collegeId = addOrg.getId();
                         } else {
                             collegeId = effectList.get(0).getId();

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

@@ -41,7 +41,6 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.paper}/scan_task")
 @Validated
-@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class PaperScanTaskController {
     @Resource
     private PaperScanTaskService paperScanTaskService;