Merge remote-tracking branch 'origin/master'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysFile;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.entity.AuditEntity;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
@@ -50,6 +51,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.SysDeptEncryptorMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
 import com.qunzhixinxi.hnqz.admin.service.ReportExportService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysFileService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
@@ -145,11 +147,7 @@ public class WmTaskController {
 
 	private final ReportExportService reportExportService;
 
-	private final RedisTemplate redisTemplate;
-
-	private final SysDeptEncryptorMapper sysDeptEncryptorMapper;
-
-	private final WmTaskSettleNoteService wmTaskSettleNoteService;
+	private final SysFileService sysFileService;
 
 	/**
 	 * 分页查询
@@ -1296,6 +1294,7 @@ public class WmTaskController {
 	 */
 	@PostMapping(value = "/task-batch-import")
 	public R taskBatch(@RequestExcel List<CommonTaskExcelModel> dataList,
+					   @RequestParam(value = "fileId") Integer fileId,
 					   @RequestParam(value = "packageName", required = false) String packageName) {
 
 		// 参数校验
@@ -1304,6 +1303,12 @@ public class WmTaskController {
 			return R.failed("空报表，不能上传");
 		}
 
+		SysFile byId = sysFileService.getById(fileId);
+		if (byId == null){
+			log.error("无法获取上传文件");
+			return R.failed("无法获取上传文件");
+		}
+
 		// 封装为DTO，map：key：积分包名称，val：证据链内容
 		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 		Map<String, List<CommonEvidenceDTO>> DTOMap = new HashMap<>();
@@ -1312,8 +1317,11 @@ public class WmTaskController {
 			evidenceDTO.setId(excelModel.getId().trim());
 			evidenceDTO.setRealName(excelModel.getRealName().trim());
 			evidenceDTO.setUsername(excelModel.getUsername().trim());
-			String spn = excelModel.getScorePackageName().trim();
+			evidenceDTO.setTargetUsername(excelModel.getTargetUsername().trim());
+			String spn = packageName.trim();
 			evidenceDTO.setScorePackageName(spn);
+			evidenceDTO.setLogs(excelModel.getLogs().trim());
+			evidenceDTO.setAuditor(excelModel.getAuditor().trim());
 			evidenceDTO.setSubjectNum(excelModel.getSubjectNum().trim());
 			evidenceDTO.setWorkstation(excelModel.getWorkstation());
 			evidenceDTO.setVisitStage(excelModel.getVisitStage());
@@ -1324,6 +1332,7 @@ public class WmTaskController {
 					.trim());
 			evidenceDTO.setInvoiceCategory(excelModel.getInvoiceCategory());
 			evidenceDTO.setAmount(new BigDecimal(excelModel.getAmount()).setScale(2, RoundingMode.HALF_EVEN));
+			evidenceDTO.setFile(byId);
 
 			// 封装结果
 			List<CommonEvidenceDTO> commonEvidenceDTOList;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/dto/CommonEvidenceDTO.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.entity.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysFile;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import lombok.Data;
@@ -42,11 +43,17 @@ public class CommonEvidenceDTO implements Serializable {
 	 */
 	private String scorePackageName;
 
+
 	/**
 	 * 工作系统
 	 */
 	private String workstation;
 
+	/**
+	 * 对方账号
+	 */
+	private String targetUsername;
+
 	/**
 	 * 受试者编号
 	 */
@@ -67,11 +74,21 @@ public class CommonEvidenceDTO implements Serializable {
 	 */
 	private String auditStatus;
 
+	/**
+	 * 日志信息
+	 */
+	private String logs;
+
 	/**
 	 * 审核通过时间
 	 */
 	private LocalDate passingTime;
 
+	/**
+	 * 审核人
+	 */
+	private String auditor;
+
 	/**
 	 * 备注
 	 */
@@ -112,4 +129,9 @@ public class CommonEvidenceDTO implements Serializable {
 	 */
 	private SysUser sysUser;
 
+	/**
+	 * 上传的文件
+	 */
+	private SysFile file;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/CommonTaskExcelModel.java

@@ -39,19 +39,18 @@ public class CommonTaskExcelModel implements Serializable {
 	private String username;
 
 	/**
-	 * 积分包名称
+	 * 工作系统
 	 */
-	@NotBlank(message = "积分包名称不能为空")
+	@NotBlank(message = "工作系统不能为空")
 	@ExcelProperty(index = 3)
-	private String scorePackageName;
+	private String workstation;
 
 	/**
-	 * 工作系统
+	 * 对方系统账号
 	 */
-	@NotBlank(message = "工作系统不能为空")
+	@NotBlank(message = "对方系统账号")
 	@ExcelProperty(index = 4)
-	private String workstation;
-
+	private String targetUsername;
 
 	/**
 	 * 受试者编号
@@ -74,38 +73,53 @@ public class CommonTaskExcelModel implements Serializable {
 	@ExcelProperty(index = 7)
 	private String uploadTime;
 
+	/**
+	 * 日志
+	 */
+	@NotBlank(message = "上传的日志不能为空")
+	@ExcelProperty(index = 8)
+	private String logs;
+
 	/**
 	 * 审核状态
 	 */
 	@NotBlank(message = "审核状态不能为空")
-	@ExcelProperty(index = 8)
+	@ExcelProperty(index = 9)
 	private String auditStatus;
 
 	/**
 	 * 审核通过时间
 	 */
 	@NotBlank(message = "审核通过时间不能为空")
-	@ExcelProperty(index = 9)
+	@ExcelProperty(index = 10)
 	private String passingTime;
 
+	/**
+	 * 审核人
+	 */
+	@NotBlank(message = "审核人不能为空")
+	@ExcelProperty(index = 11)
+	private String auditor;
+
 	/**
 	 * 备注
 	 */
-	@ExcelProperty(index = 10)
+	@NotBlank(message = "备注不能为空")
+	@ExcelProperty(index = 12)
 	private String comment;
 
 	/**
 	 * 发票类目
 	 */
 	@NotBlank(message = "发票类目不能为空")
-	@ExcelProperty(index = 11)
+	@ExcelProperty(index = 13)
 	private String invoiceCategory;
 
 	/**
 	 * 金额
 	 */
 	@NotBlank(message = "金额不能为空，且采用银行家算法，并保留2位小数")
-	@ExcelProperty(index = 12)
+	@ExcelProperty(index = 14)
 	private String amount;
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysFileServiceImpl.java

@@ -76,7 +76,9 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 		try {
 			minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
 			// 文件管理数据记录,收集管理追踪文件
-			fileLog(file, fileName);
+			SysFile sysFile = fileLog(file, fileName);
+			resultMap.put("fileId", String.valueOf(sysFile.getId()));
+
 		}
 		catch (Exception e) {
 			log.error("上传失败", e);
@@ -178,7 +180,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 	 * @param file 上传文件格式
 	 * @param fileName 文件名
 	 */
-	private void fileLog(MultipartFile file, String fileName) {
+	private SysFile fileLog(MultipartFile file, String fileName) {
 		SysFile sysFile = new SysFile();
 		// 原文件名
 		String original = file.getOriginalFilename();
@@ -192,6 +194,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
 			sysFile.setCreateUser(SecurityUtils.getUser().getUsername());
 		}
 		this.save(sysFile);
+		return sysFile;
 	}
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -2124,6 +2124,10 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 			taskContent.setTemp7(df.format(evidenceDTO.getPassingTime()));
 			taskContent.setTemp8(df.format(evidenceDTO.getUploadTime()));
 			taskContent.setTemp9(null);
+			taskContent.setTemp10(evidenceDTO.getTargetUsername());
+			taskContent.setTemp11(evidenceDTO.getAuditor());
+			taskContent.setTemp12(evidenceDTO.getLogs());
+			taskContent.setTemp13(String.valueOf(evidenceDTO.getFile().getId()));
 			taskContent.setTemp30(task.getTaskTypeId());
 			taskContent.setTemp32(evidenceDTO.getScorePackage().getId());
 			wmTaskContentMapper.insert(taskContent);