diff --git a/pom.xml b/pom.xml index 86f44bc..4d71c8a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ dlp-entrustment jar - 送检受理 + 送检受理111 2022.10.11-snapshots diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java index 1ad19fd..dc9bd03 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java @@ -386,7 +386,6 @@ public class CaseEvidenceController { ce.setCaseId(cj.getId()); ce.setEvidenceNo(caseEvidenceService.getNewEvidenceCode(cj.getCaseNo())); ce.setName(cj.getCaseName()+" 的第 "+i+"个物证"); - ce.setType(RandomUtil.randomEle(new String[]{"非生物性物证", "生物特性物证"})); ce.setFieldLabelNo(String.format("现场标牌 %d 号", RandomUtil.randomInt(1, 200))); ce.setSource(RandomUtil.randomEle(new String[]{"非生物性物证", "生物特性物证"})); diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java index 559c96c..03c90bf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java @@ -111,16 +111,8 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl <顺序号4位> - * 例如: - * JC 5201010400002020030002 0000001 0001 - * 合计 34 位 - * ``` - * 一份物证, 有可能会多次送检。每次送检的时候, 在原来的顺序号上递增。 - * 定义这个编号的时候有点纠结, 有两个方向的关联: 在案件号上扩充、在物证号上扩充。我们选择在物证号上扩充。 - * 检材编码的长度不一定刚好是 34 位!我们取“物证编号后 28 位”时, 其实是去掉物证编码前第1个字符后剩下的部分。 - * 如果物证编码不是 29 位, 那么取到的就不是 28 位, 而是物证编码长度减1位。 + * JC1020250001001 + * [prefix:JC][10:表示是哪种类型的检材(缴获物、生物样本)][20250001:委托编号,注意后缀需要用0补齐四位][001:流水号,需用0补齐三位] * * @param evidenceNo * @return