Dlp-Gyjd/dlp-entrustment
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
杨海航
2026-09-29 15:46:34 +08:00
parent e0dc3b8842 bf59513d07
commit 164e6302a7
5 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java
-1
View File
@@ -101,7 +101,6 @@ public class EntrustMaterialCheckoutResultController {
@GetMapping("/pushSuspectDetectionResult") @GetMapping("/pushSuspectDetectionResult")
@ApiOperation("推送检出结果") @ApiOperation("推送检出结果")
public R pushSuspectDetectionResult(String entrustId) throws SQLException { public R pushSuspectDetectionResult(String entrustId) throws SQLException {
DLPUser dlpUser = SecurityUtils.getUser();
return R.ok(entrustMaterialCheckoutResultService.pushSuspectDetectionResult(entrustId)); return R.ok(entrustMaterialCheckoutResultService.pushSuspectDetectionResult(entrustId));
} }
src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java
-2
View File
@@ -2,7 +2,6 @@ package digital.laboratory.platform.entrustment.controller;
import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.AmazonS3Exception;
@@ -26,7 +25,6 @@ import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants;
import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.CaseEventService;
import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService; import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService;
import digital.laboratory.platform.entrustment.service.EntrustmentService; import digital.laboratory.platform.entrustment.service.EntrustmentService;
import digital.laboratory.platform.entrustment.vo.CaseEventVO;
import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import digital.laboratory.platform.entrustment.vo.EntrustmentVO;
import digital.laboratory.platform.sys.dto.entrustment.CommonIdDto; import digital.laboratory.platform.sys.dto.entrustment.CommonIdDto;
import digital.laboratory.platform.sys.entity.SysUser; import digital.laboratory.platform.sys.entity.SysUser;
src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java
-1
View File
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java
-2
View File
@@ -52,7 +52,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.net.URLEncoder;
import java.sql.*; import java.sql.*;
import java.time.*; import java.time.*;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@@ -2048,7 +2047,6 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl<Entrus
return statistics; return statistics;
} }
@Override @Override
public String generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException { public String generateQuarterlyReportExcel(GenerateQuarterlyReportDTO dto, HttpServletResponse response) throws IOException {
HashMap<Integer, Map<String, List<Integer>>> map = this.generateQuarterlyReportData(dto.getYear(), dto.getQuarterlyList()); HashMap<Integer, Map<String, List<Integer>>> map = this.generateQuarterlyReportData(dto.getYear(), dto.getQuarterlyList());
src/main/java/digital/laboratory/platform/entrustment/service/impl/ExcelOperationServiceImpl.java
+4 -1
View File
@@ -10,7 +10,10 @@ import digital.laboratory.platform.common.core.exception.CheckedException;
import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.common.security.util.SecurityUtils; import digital.laboratory.platform.common.security.util.SecurityUtils;
import digital.laboratory.platform.entrustment.entity.*; import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.entrustment.entity.Entrustment;
import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial;
import digital.laboratory.platform.entrustment.entity.Suspect;
import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums; import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums;
import digital.laboratory.platform.entrustment.enums.EntrustExportHeaderEnum; import digital.laboratory.platform.entrustment.enums.EntrustExportHeaderEnum;
import digital.laboratory.platform.entrustment.enums.EntrustIdentificationSituationType; import digital.laboratory.platform.entrustment.enums.EntrustIdentificationSituationType;