diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index f0bd8d3..1e27009 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -1474,62 +1474,65 @@ public class EntrustController extends BladeController { // ); wrapper.ge(Entrust::getCreateTime, parse); List entrusts = service.list(wrapper); + wrapper.eq(Entrust::getIsDeleted , 1); + List entrustIsDeleted = service.list(wrapper); + // 设置受理编号 String acceptance = ""; if ("1".equals(number)) { if (entrusts.size() >= 0 && entrusts.size() < 9) { - acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + 1); + acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 9 && entrusts.size() < 99) { - acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + 1); + acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 99 && entrusts.size() < 999) { - acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + 1); + acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 999 && entrusts.size() < 9999) { - acceptance = "SDCADC-W-" + year + (entrusts.size() + 1); + acceptance = "SDCADC-W-" + year + (entrusts.size() + entrustIsDeleted.size() + 1); } } if ("2".equals(number)) { if (entrusts.size() >= 0 && entrusts.size() < 9) { - acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + 1); + acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 9 && entrusts.size() < 99) { - acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + 1); + acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 99 && entrusts.size() < 999) { - acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + 1); + acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 999 && entrusts.size() < 9999) { - acceptance = "SDCADC-J-" + year + (entrusts.size() + 1); + acceptance = "SDCADC-J-" + year + (entrusts.size() + entrustIsDeleted.size() + 1); } } if ("3".equals(number)) { if (entrusts.size() >= 0 && entrusts.size() < 9) { - acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + 1); + acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 9 && entrusts.size() < 99) { - acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + 1); + acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 99 && entrusts.size() < 999) { - acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + 1); + acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 999 && entrusts.size() < 9999) { - acceptance = "SDCADC-Z-" + year + (entrusts.size() + 1); + acceptance = "SDCADC-Z-" + year + (entrusts.size() + entrustIsDeleted.size() + 1); } } if ("4".equals(number)) { if (entrusts.size() >= 0 && entrusts.size() < 9) { - acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + 1); + acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 9 && entrusts.size() < 99) { - acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + 1); + acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 99 && entrusts.size() < 999) { - acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + 1); + acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1); } if (entrusts.size() >= 999 && entrusts.size() < 9999) { - acceptance = "SDCADC-S-" + year + (entrusts.size() + 1); + acceptance = "SDCADC-S-" + year + (entrusts.size() + entrustIsDeleted.size() + 1); } } return acceptance;