签到表详情

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanPackageController.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.api.mark;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,6 +17,7 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysConfig;
 import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.mark.bean.scananswer.SheetUploadVo;
+import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageFindVo;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageQuery;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageVo;
 import com.qmth.teachcloud.mark.service.ScanPackageService;
@@ -52,12 +55,25 @@ public class ScanPackageController {
 	@RequestMapping(value = "image/upload", method = RequestMethod.POST)
 	public SheetUploadVo imageUpload(@RequestParam Long examId, @RequestParam String packageCode,
 			@RequestParam Integer packageNo, @RequestParam MultipartFile file, @RequestParam String md5) {
-		return scanPackageService.imageUpload(examId, packageCode, packageNo,file, md5);
+		return scanPackageService.imageUpload(examId, packageCode, packageNo, file, md5);
 	}
-	
+
 	@ApiOperation(value = "签到表扫描结果列表")
 	@RequestMapping(value = "image/list", method = RequestMethod.POST)
 	public IPage<ScanPackageVo> imagePage(@Validated ScanPackageQuery query) {
 		return scanPackageService.imagePage(query);
 	}
+
+	@ApiOperation(value = "签到表编号查询")
+	@RequestMapping(value = "find", method = RequestMethod.POST)
+	public ScanPackageFindVo find(@RequestParam Long examId, @RequestParam String packageCode) {
+		return scanPackageService.find(examId, packageCode);
+	}
+
+	@ApiOperation(value = "签到表详情")
+	@RequestMapping(value = "image/get", method = RequestMethod.POST)
+	public List<String> imageGet(@RequestParam Long examId, @RequestParam String coursePaperId,
+			@RequestParam String packageCode) {
+		return scanPackageService.imageGet(examId,coursePaperId, packageCode);
+	}
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/scanpackage/ScanPackageFindVo.java

@@ -0,0 +1,26 @@
+package com.qmth.teachcloud.mark.bean.scanpackage;
+
+public class ScanPackageFindVo {
+
+	private Long examId;
+
+	private String packageCode;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getPackageCode() {
+		return packageCode;
+	}
+
+	public void setPackageCode(String packageCode) {
+		this.packageCode = packageCode;
+	}
+
+
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/ScanPackageService.java

@@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.mark.bean.scananswer.SheetUploadVo;
+import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageFindVo;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageQuery;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageVo;
 import com.qmth.teachcloud.mark.entity.ScanPackage;
@@ -29,4 +30,8 @@ public interface ScanPackageService extends IService<ScanPackage> {
 
 	IPage<ScanPackageVo> imagePage(ScanPackageQuery query);
 
+	ScanPackageFindVo find(Long examId, String packageCode);
+
+	List<String> imageGet(Long examId, String coursePaperId, String packageCode);
+
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanPackageServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.teachcloud.mark.bean.scananswer.SheetUploadVo;
+import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageFindVo;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageQuery;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageVo;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
@@ -153,4 +155,26 @@ public class ScanPackageServiceImpl extends ServiceImpl<ScanPackageMapper, ScanP
 		}
 		return iPage;
 	}
+
+	@Override
+	public ScanPackageFindVo find(Long examId, String packageCode) {
+		// TODO
+		return null;
+	}
+
+	@Override
+	public List<String> imageGet(Long examId, String coursePaperId, String packageCode) {
+		List<String> ret=new ArrayList<>();
+		QueryWrapper<ScanPackage> wrapper = new QueryWrapper<>();
+		LambdaQueryWrapper<ScanPackage> lw = wrapper.lambda();
+		lw.eq(ScanPackage::getExamId, examId);
+		lw.eq(ScanPackage::getCoursePaperId, coursePaperId);
+		lw.eq(ScanPackage::getPackageCode, packageCode);
+		lw.orderByAsc(ScanPackage::getPackageNo);
+		List<ScanPackage> list=this.list(wrapper);
+		if(CollectionUtils.isNotEmpty(list)) {
+			ret=list.stream().map(e->e.getPath()).collect(Collectors.toList());
+		}
+		return ret;
+	}
 }