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

20250312 更新

Browse Source
This commit is contained in:
陈江保
2025-03-12 17:02:35 +08:00
parent e3badb0457
commit 230aebe7bf
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java
View File

@@ -18,7 +18,6 @@ import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang.StringUtils;
import org.checkerframework.checker.units.qual.A;
/**

19
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustmentStatusConstants.java
View File

@@ -102,4 +102,23 @@ public enum EntrustmentStatusConstants {
public int getStatus() {
return status;
}
/**
* 判断状态是否在已受理以及之后的状态, ge代表大于等于
*
* @param theStatus 待判断的状态码
* @return 如果状态码为已受理、检验完成 或 委托完成之一，则返回true；否则返回false
*/
// 判断状态是否在已受理以及之后的状态, ge代表大于等于
public static boolean geAcceptedStatus(Integer theStatus) {
if (theStatus == null) {
return false;
}
if (theStatus.equals(ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) || theStatus.equals(ENTRUSTMENT_STATUS_TEST_FINISH.getStatus()) || theStatus.equals(ENTRUSTMENT_STATUS_COMPLETED.getStatus())) {
return true;
}
return false;
}
}

10
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -3288,7 +3288,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
);
// o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN)) 筛选出当年的数据
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
entrustListMapOrDefault.stream().filter(o -> o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN))).collect(Collectors.toList()).size(),
entrustListMapOrDefault.stream().filter(o ->
o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN))
&& EntrustmentStatusConstants.geAcceptedStatus(o.getStatus())
).collect(Collectors.toList()).size(),
String.format("已受理 (%s)", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU)));
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
entrustListMap.getOrDefault(
@@ -3298,7 +3301,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT,
this.list(Wrappers.<Entrustment>lambdaQuery().inSql(Entrustment::getId, "SELECT entrust_id FROM b_entrust_material_checkout_result"))
.stream()
.filter(o -> o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN)))
.filter(o ->
o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN))
&& EntrustmentStatusConstants.geAcceptedStatus(o.getStatus())
)
.collect(Collectors.toList())
.size(),
"检测结果")