From 8183a5eb20db44b867c907a140bb571628d9d63b Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Tue, 18 Mar 2025 14:49:14 +0800 Subject: [PATCH] =?UTF-8?q?20250318=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++ .../config/EntrustStateMachineConfig.java | 38 ++++++ .../entrustment/config/MyDatasources.java | 2 - .../config/properties/ApiPathProperties.java | 1 - .../controller/AcceptController.java | 5 +- .../controller/CaseEvidenceController.java | 11 +- .../controller/CommonController.java | 4 +- .../EntrustAlterApplyController.java | 1 - ...trustMaterialCheckoutResultController.java | 2 - .../controller/EntrustmentController.java | 74 ++++++------ ...tmentIdentificationMaterialController.java | 8 +- .../controller/IdentificationController.java | 5 +- .../controller/SampleBoxController.java | 5 +- .../controller/SampleBoxInLogController.java | 2 +- .../controller/SampleController.java | 4 +- .../controller/SynchronizeDataController.java | 4 +- .../controller/TakerController.java | 1 - .../dto/ApprovedUpdateEntrustDTO.java | 2 - .../dto/CheckoutResultExcelDTO.java | 4 - .../platform/entrustment/dto/PrintDTO.java | 2 - .../entrustment/entity/CaseEvent.java | 5 +- .../entrustment/entity/CaseEvidence.java | 7 +- .../entity/EntrustApproveRecord.java | 5 +- .../entity/EntrustMaterialOfThirdSys.java | 1 - .../entrustment/entity/Entrustment.java | 1 - .../EntrustmentIdentificationMaterial.java | 10 +- .../entrustment/entity/Identification.java | 2 - .../entrustment/entity/SampleBoxInLog.java | 2 - .../platform/entrustment/entity/Taker.java | 2 - .../entrustment/enums/EntrustBiologyType.java | 43 ------- .../entrustment/enums/EntrustEvent.java | 20 +++ ...tants.java => EntrustStatusConstants.java} | 46 +++---- .../mapper/EntrustAlterApplyMapper.java | 7 +- .../mapper/EntrustApproveRecordMapper.java | 3 +- .../EntrustMaterialCheckoutResultMapper.java | 3 - ...trustmentIdentificationMaterialMapper.java | 1 - .../entrustment/mapper/EntrustmentMapper.java | 1 - .../entrustment/mapper/TakerMapper.java | 1 - .../entrustment/misc/ProcessFlowMapper.java | 36 +++--- .../EntrustMaterialCheckoutResultQuery.java | 2 - .../entrustment/service/CaseEventService.java | 3 +- .../service/CommonFeignService.java | 1 - .../service/EntrustAlterApplyService.java | 2 +- .../service/EntrustApproveRecordService.java | 2 +- ...rustmentIdentificationMaterialService.java | 1 - .../service/EntrustmentService.java | 2 +- .../service/IdentificationService.java | 4 - .../entrustment/service/SampleBoxService.java | 2 +- .../service/SynchronizeDataService.java | 2 +- .../service/impl/AcceptServiceImpl.java | 4 +- .../service/impl/CaseEventServiceImpl.java | 9 +- .../service/impl/CaseEvidenceServiceImpl.java | 2 +- .../service/impl/CommonFeignServiceImpl.java | 5 +- .../impl/EntrustAlterApplyServiceImpl.java | 5 +- .../impl/EntrustApproveRecordServiceImpl.java | 2 +- ...rustMaterialCheckoutResultServiceImpl.java | 14 ++- ...mentIdentificationMaterialServiceImpl.java | 24 ++-- .../service/impl/EntrustmentServiceImpl.java | 114 +++++++++--------- .../impl/IdentificationServiceImpl.java | 1 - .../service/impl/SampleBoxServiceImpl.java | 4 +- .../service/impl/SampleServiceImpl.java | 7 +- .../impl/SynchronizeDataServiceImpl.java | 37 +++--- .../vo/EntrustMaterialCheckoutResultVO.java | 6 - .../entrustment/vo/MaterialListForBookVo.java | 2 - 64 files changed, 307 insertions(+), 328 deletions(-) create mode 100644 src/main/java/digital/laboratory/platform/entrustment/config/EntrustStateMachineConfig.java delete mode 100644 src/main/java/digital/laboratory/platform/entrustment/enums/EntrustBiologyType.java create mode 100644 src/main/java/digital/laboratory/platform/entrustment/enums/EntrustEvent.java rename src/main/java/digital/laboratory/platform/entrustment/enums/{EntrustmentStatusConstants.java => EntrustStatusConstants.java} (63%) diff --git a/pom.xml b/pom.xml index b3136e4..1e5a91e 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,13 @@ ${cloud.alibaba.version} + + + org.springframework.statemachine + spring-statemachine-core + 3.1.0 + + digital.laboratory.platform diff --git a/src/main/java/digital/laboratory/platform/entrustment/config/EntrustStateMachineConfig.java b/src/main/java/digital/laboratory/platform/entrustment/config/EntrustStateMachineConfig.java new file mode 100644 index 0000000..5ffc7b6 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/config/EntrustStateMachineConfig.java @@ -0,0 +1,38 @@ +package digital.laboratory.platform.entrustment.config; + +import digital.laboratory.platform.entrustment.enums.EntrustEvent; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.statemachine.config.EnumStateMachineConfigurerAdapter; +import org.springframework.statemachine.config.builders.StateMachineStateConfigurer; + +/** + * @author ChenJiangBao + * @version 1.0 + * @description: 委托状态机配置类 + * @date 2025/3/14 11:47 + */ +@Configuration +public class EntrustStateMachineConfig extends EnumStateMachineConfigurerAdapter { + + @Value("${dlp.entrustment.isApprovalRequired}") + private boolean isApprovalRequired; // 动态标志判断是否需要审批 + + @Override + public void configure(StateMachineStateConfigurer states) throws Exception { + states.withStates() + .initial(EntrustStatusConstants.ENTRUST_STATUS_CREATED) + .state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM) + .state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK) + .state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM) + .state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER) + .state(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT) + .state(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED) + .state(EntrustStatusConstants.ENTRUST_STATUS_TEST_FINISH) + .state(EntrustStatusConstants.ENTRUST_STATUS_COMPLETED) + .state(EntrustStatusConstants.ENTRUST_STATUS_TERMINATED) + .state(EntrustStatusConstants.ENTRUST_STATUS_ABORTED) + .end(EntrustStatusConstants.ENTRUST_STATUS_COMPLETED); + } +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/config/MyDatasources.java b/src/main/java/digital/laboratory/platform/entrustment/config/MyDatasources.java index 09b6e81..8afd61b 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/config/MyDatasources.java +++ b/src/main/java/digital/laboratory/platform/entrustment/config/MyDatasources.java @@ -5,8 +5,6 @@ import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; import javax.sql.DataSource; diff --git a/src/main/java/digital/laboratory/platform/entrustment/config/properties/ApiPathProperties.java b/src/main/java/digital/laboratory/platform/entrustment/config/properties/ApiPathProperties.java index 576f431..599f368 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/config/properties/ApiPathProperties.java +++ b/src/main/java/digital/laboratory/platform/entrustment/config/properties/ApiPathProperties.java @@ -1,6 +1,5 @@ package digital.laboratory.platform.entrustment.config.properties; -import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/AcceptController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/AcceptController.java index 6c8ed14..4bf7abf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/AcceptController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/AcceptController.java @@ -7,7 +7,10 @@ import digital.laboratory.platform.entrustment.service.AcceptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; 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 dc9bd03..3210a43 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEvidenceController.java @@ -2,10 +2,8 @@ package digital.laboratory.platform.entrustment.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.file.FileNameUtil; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.amazonaws.services.s3.model.AmazonS3Exception; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -23,10 +21,10 @@ import digital.laboratory.platform.entrustment.entity.CaseEvidence; import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.CaseEvidenceService; import digital.laboratory.platform.entrustment.vo.CaseEventVO; -import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -39,7 +37,10 @@ import java.io.InputStream; import java.math.BigDecimal; import java.security.Principal; import java.time.LocalDateTime; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -381,7 +382,7 @@ public class CaseEvidenceController { break; } CaseEvidence ce = new CaseEvidence(); - + ce.setId(IdWorker.get32UUID().toUpperCase()); ce.setCaseId(cj.getId()); ce.setEvidenceNo(caseEvidenceService.getNewEvidenceCode(cj.getCaseNo())); diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/CommonController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/CommonController.java index 4ee3be2..a3599db 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CommonController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CommonController.java @@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.*; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.StringWriter; @RestController @RequiredArgsConstructor diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java index 4862a7b..ea0233f 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java @@ -11,7 +11,6 @@ import digital.laboratory.platform.entrustment.service.EntrustAlterApplyService; import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index 1e1a6da..7ec1303 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -7,11 +7,9 @@ import digital.laboratory.platform.common.core.exception.CheckedException; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.entrustment.convert.EntrustMaterialCheckoutResultConvert; import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResultDTO; -import digital.laboratory.platform.entrustment.query.BaseQuery; import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery; import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService; import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO; -import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index 65437d9..6ef2a2f 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -21,7 +21,7 @@ import digital.laboratory.platform.common.security.util.SecurityUtils; import digital.laboratory.platform.entrustment.dto.EntrustmentDTO; import digital.laboratory.platform.entrustment.entity.CaseEvent; import digital.laboratory.platform.entrustment.entity.Entrustment; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutResultService; import digital.laboratory.platform.entrustment.service.EntrustmentService; @@ -260,7 +260,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) .orderByDesc("e.create_time") ); } else { @@ -277,7 +277,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) .orderByDesc("e.create_time") ); } @@ -318,7 +318,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) ); } else { //-- 当前用户是普通用户, 不是鉴定中心员工 @@ -334,7 +334,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) ); } @@ -375,8 +375,8 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - //.ne("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + //.ne("e.status", EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) .orderByDesc("e.submit_time") ); } else { @@ -393,7 +393,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .ne("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + .ne("e.status", EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) .orderByDesc("e.submit_time") ); } @@ -441,13 +441,13 @@ public class EntrustmentController { .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) .eq(dataSources != null, "e.data_sources", dataSources) .and((wrapper) -> wrapper - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()) .or() .like((includeOtherOne == null || !includeOtherOne), "e.check_candidate_user", dlpUser.getId()) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) ) // .like((includeOtherOne == null || !includeOtherOne), "e.check_candidate_user", dlpUser.getId()) - // .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) + // .in("e.status", EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) .orderByDesc("e.submit_time") ); @@ -492,10 +492,10 @@ public class EntrustmentController { .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) .and((wrapper) -> wrapper - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()) .or() .like((includeOtherOne == null || !includeOtherOne), "e.check_candidate_user", dlpUser.getId()) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) ) ); @@ -538,7 +538,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) // 状态为审核之后 + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) // 状态为审核之后 .orderByDesc("e.check_time") ); @@ -585,7 +585,7 @@ public class EntrustmentController { .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) .eq(dataSources != null, "e.data_sources", dataSources) - .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) + .in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) .orderByDesc("e.check_time") ); @@ -630,7 +630,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) + .in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(), EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) ); } @@ -671,7 +671,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) // 状态为审核之后 + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()) // 状态为审核之后 .orderByDesc("e.approve_time") ); @@ -717,7 +717,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) .orderByDesc("e.approve_time") ); } else { @@ -734,7 +734,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) .orderByDesc("e.approve_time") ); } @@ -779,7 +779,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) ); } else { //-- 当前用户是普通用户, 不是鉴定中心员工 @@ -795,7 +795,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) ); } @@ -837,7 +837,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) .orderByDesc("e.deliver_confirm_time") ); } else { @@ -854,7 +854,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()) + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) .orderByDesc("e.deliver_confirm_time") ); } @@ -899,7 +899,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) .orderByDesc("e.deliver_confirm_time") ); } else { @@ -917,7 +917,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) .orderByDesc("e.deliver_confirm_time") ); } @@ -961,7 +961,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) ); } else { //-- 当前用户是普通用户, 不是鉴定中心员工 @@ -978,7 +978,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .eq("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) + .eq("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) ); } } @@ -1018,7 +1018,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) .orderByDesc("e.deliver_time") ); } else { @@ -1035,7 +1035,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) .orderByDesc("e.deliver_time") ); } @@ -1081,7 +1081,7 @@ public class EntrustmentController { // 先查是不是委托编号 IPage thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.query() .eq("e.entrustment_no", theKeyword) - .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) + .in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) ); if (thePage.getRecords().size() > 0) { // 查到数据了, 直接返回 @@ -1091,7 +1091,7 @@ public class EntrustmentController { IPage thePage = null; thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.query() - .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) + .in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) .ge(StrUtil.isNotBlank(fromDate), "e.create_time", fromDate) .le(StrUtil.isNotBlank(toDate), "e.create_time", toDate) .eq(dataSources != null, "e.data_sources", dataSources) @@ -1145,7 +1145,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) + .in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) ); return count; @@ -1188,7 +1188,7 @@ public class EntrustmentController { // 先查是不是委托编号 IPage thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.query() .eq("e.entrustment_no", theKeyword) - .in("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) + .in("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus() /*, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()*/) .orderByDesc("e.accept_time") ); if (thePage.getRecords().size() > 0) { @@ -1199,7 +1199,7 @@ public class EntrustmentController { IPage thePage = null; thePage = entrustmentService.getEntrustmentVOPage(page, Wrappers.query() - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后 + .gt("e.status", EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后 .ge(StrUtil.isNotBlank(fromDate), "e.create_time", fromDate) .le(StrUtil.isNotBlank(toDate), "e.create_time", toDate) .eq(dataSources != null, "e.data_sources", dataSources) @@ -1225,7 +1225,7 @@ public class EntrustmentController { .eq(StrUtil.isNotBlank(caseId), "e.case_id", caseId) .like(StrUtil.isNotBlank(caseNo), "c.case_no", caseNo) .like(StrUtil.isNotBlank(caseName), "c.case_name", caseName) - .gt("e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后 + .gt("e.status", EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()) // 状态为审核之后 .orderByDesc("e.accept_time") ); */ @@ -1641,7 +1641,7 @@ public class EntrustmentController { .eq(entrustment.getReturnOrNot() != null, "e.return_or_not", entrustment.getReturnOrNot()) .in(statuses != null && statuses.size() > 0, "e.status", statuses) - //.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + //.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) .orderByDesc("e.create_time") ); return R.ok(r); @@ -1670,7 +1670,7 @@ public class EntrustmentController { .eq(entrustment.getStatus() != null, "e.status", entrustment.getStatus()) .eq(entrustment.getReturnOrNot() != null, "e.return_or_not", entrustment.getReturnOrNot()) .in(statuses != null && statuses.size() > 0, "e.status", statuses) - //.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) + //.ne(((isSubmitted != null) && isSubmitted), "e.status", EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) .orderByDesc("e.create_time") ); return R.ok(r); diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java index e3bc5fd..ac2a2d4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java @@ -26,7 +26,7 @@ import digital.laboratory.platform.entrustment.entity.CaseEvent; import digital.laboratory.platform.entrustment.entity.CaseEvidence; import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.handler.AppStartupRunner; import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.CaseEvidenceService; @@ -396,7 +396,7 @@ public class EntrustmentIdentificationMaterialController { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); Entrustment entrustment = entrustmentService.getById(entrustmentIdentificationMaterialService.getById(id).getEntrustmentId()); - if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus() && !dlpUser.isStaff()) { + if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus() && !dlpUser.isStaff()) { throw new RuntimeException(String.format("当前委托状态不允许删除检材！")); } EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = entrustmentIdentificationMaterialService.deleteById(id); @@ -718,7 +718,7 @@ public class EntrustmentIdentificationMaterialController { Thread.sleep(10); //if (im.getAcceptPassed() == null || im.getAcceptPassed() != 1) { //只要委托没有受理就可以上传检材的照片 - if (entrustObj.getStatus() >= (EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus())) { + if (entrustObj.getStatus() >= (EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus())) { String image = jsonParam.getString("image"); // System.out.println(String.format("image=%s", image)); if (StringUtils.isNotEmpty(image)) { @@ -784,7 +784,7 @@ public class EntrustmentIdentificationMaterialController { Entrustment entrustObj = entrustmentService.getById(entrustId); //if (im.getAcceptPassed() == null || im.getAcceptPassed() != 1) { //只要委托没有受理就可以删除检材的照片 - if (entrustObj.getStatus() >= (EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus())) { + if (entrustObj.getStatus() >= (EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus())) { ossFile.fileDelete(OSSDirectoryConstants.ACCEPT_DIRECTORY + "/" + im.getEntrustmentId() + "/" + identificationMaterialId + "/" + fileName); Map ResultData = new HashMap<>(); ResultData.put("fileName", fileName); diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/IdentificationController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/IdentificationController.java index b7d0f1d..5d552af 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/IdentificationController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/IdentificationController.java @@ -7,11 +7,9 @@ import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.Identification; -import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.EntrustmentService; import digital.laboratory.platform.entrustment.service.IdentificationService; import digital.laboratory.platform.entrustment.vo.IdentificationVO; -import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -34,8 +32,7 @@ import java.util.List; public class IdentificationController { private final IdentificationService identificationService; - @Resource - private CaseEventService caseEventService; + @Resource private EntrustmentService entrustmentService; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxController.java index 228c8e8..2622c43 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxController.java @@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.*; +import digital.laboratory.platform.entrustment.entity.Entrustment; +import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper; import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService; import digital.laboratory.platform.entrustment.service.SampleBoxService; @@ -16,9 +17,9 @@ import digital.laboratory.platform.entrustment.service.SampleService; import digital.laboratory.platform.entrustment.vo.SampleBoxLiteVO; import digital.laboratory.platform.entrustment.vo.SampleBoxVO; import digital.laboratory.platform.sewage.entity.SewageJob; +import digital.laboratory.platform.sewage.feign.RemoteSewageJobService; import digital.laboratory.platform.sys.entity.entrustment.Sample; import digital.laboratory.platform.sys.entity.entrustment.SampleBox; -import digital.laboratory.platform.sewage.feign.RemoteSewageJobService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxInLogController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxInLogController.java index 24a6c0a..6502beb 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxInLogController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleBoxInLogController.java @@ -7,10 +7,10 @@ import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.entrustment.entity.SampleBoxInLog; import digital.laboratory.platform.entrustment.service.SampleBoxInLogService; -import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleController.java index 402265b..36baeca 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleController.java @@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.sys.entity.entrustment.Sample; import digital.laboratory.platform.entrustment.service.SampleService; -import org.springframework.security.access.prepost.PreAuthorize; +import digital.laboratory.platform.sys.entity.entrustment.Sample; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SynchronizeDataController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SynchronizeDataController.java index ad877f0..5d335c7 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SynchronizeDataController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/SynchronizeDataController.java @@ -2,10 +2,10 @@ package digital.laboratory.platform.entrustment.controller; import com.fasterxml.jackson.core.JsonProcessingException; import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.othersys.dto.EntrustQueryParams; import digital.laboratory.platform.entrustment.entity.EntrustOfThirdSys; import digital.laboratory.platform.entrustment.entity.Entrustment; -import digital.laboratory.platform.entrustment.service.*; +import digital.laboratory.platform.entrustment.service.SynchronizeDataService; +import digital.laboratory.platform.othersys.dto.EntrustQueryParams; import digital.laboratory.platform.sys.feign.RemoteDictionaryService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/TakerController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/TakerController.java index ebe4de6..b7158e1 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/TakerController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/TakerController.java @@ -9,7 +9,6 @@ import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.entrustment.entity.Taker; import digital.laboratory.platform.entrustment.service.TakerService; -import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java index f936ca4..b1d284c 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/ApprovedUpdateEntrustDTO.java @@ -1,10 +1,8 @@ package digital.laboratory.platform.entrustment.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import digital.laboratory.platform.sys.entity.DrugLite; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java index 6249cb8..d98bd61 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/CheckoutResultExcelDTO.java @@ -1,13 +1,9 @@ package digital.laboratory.platform.entrustment.dto; -import digital.laboratory.platform.sys.entity.DrugLite; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDateTime; -import java.util.List; - @Data @ApiModel(value = "CheckoutResultExcelDTO", description = "存储要导出的检出结果excel数据DTO对象") public class CheckoutResultExcelDTO { diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/PrintDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/PrintDTO.java index 5a1cb3b..5e27f44 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/PrintDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/PrintDTO.java @@ -2,8 +2,6 @@ package digital.laboratory.platform.entrustment.dto; import lombok.Data; -import java.util.List; - @Data public class PrintDTO { diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java b/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java index 86dfae4..a313e08 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDate; + /** * 案件、事件 diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvidence.java b/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvidence.java index e272693..f872a82 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvidence.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvidence.java @@ -9,13 +9,12 @@ import digital.laboratory.platform.common.mybatis.base.BaseEntity; import digital.laboratory.platform.sys.entity.entrustment.IMAdditionalProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.List; -import lombok.Data; -import lombok.EqualsAndHashCode; - /** * 与案件相关的物证信息 @@ -97,7 +96,7 @@ public class CaseEvidence extends BaseEntity { private String fundName; /** - * 物证情况之承载物数量, 例如 5 颗, 3包, + * 物证情况之承载物数量, 例如 5 颗, 3包, */ @ApiModelProperty(value="物证情况之承载物数量, 例如 5 颗, 3包, ") private Integer fundQuantity; diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java index 92a8f7a..9dc47ff 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustApproveRecord.java @@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Date; import lombok.Data; +import java.time.LocalDateTime; + /** * 委托审核记录 * @TableName b_entrust_approve_record diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialOfThirdSys.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialOfThirdSys.java index 6b1d127..5bf766a 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialOfThirdSys.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustMaterialOfThirdSys.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; -import java.util.List; /** * @ClassName EntrustMaterialOfThirdSys diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java index a351a74..14d1127 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java @@ -15,7 +15,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java index 1e2679a..32d04ee 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java @@ -2,23 +2,21 @@ package digital.laboratory.platform.entrustment.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; -//import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import digital.laboratory.platform.common.mybatis.base.BaseEntity; import digital.laboratory.platform.entrustment.json.DynamicBigDecimalSerializer; import digital.laboratory.platform.sys.entity.DrugLite; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; import digital.laboratory.platform.sys.entity.entrustment.IMAdditionalProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang.StringUtils; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang.StringUtils; - /** * 检材信息 diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Identification.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Identification.java index 65cf227..c38602c 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Identification.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Identification.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleBoxInLog.java b/src/main/java/digital/laboratory/platform/entrustment/entity/SampleBoxInLog.java index 913af07..8126399 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleBoxInLog.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/SampleBoxInLog.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Taker.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Taker.java index 3409831..c759da1 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Taker.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Taker.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustBiologyType.java b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustBiologyType.java deleted file mode 100644 index fbf4fb0..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustBiologyType.java +++ /dev/null @@ -1,43 +0,0 @@ -package digital.laboratory.platform.entrustment.enums; - -import cn.hutool.core.collection.CollUtil; -import lombok.Getter; - -import java.util.List; - -@Getter -public enum EntrustBiologyType { - - HAIR(0, "毛发", CollUtil.newArrayList("黑色头发", "毛发")), - URINE(1, "尿液", CollUtil.newArrayList("黄色尿液")), - OTHER(2, "其他", CollUtil.newArrayList()), - ; - - private final Integer code; - - private final String desc; - - private final List alias; - - EntrustBiologyType(Integer code, String desc, List alias) { - this.code = code; - this.desc = desc; - this.alias = alias; - } - - // 根据名称或别名判断是否存在对应枚举 - public static EntrustBiologyType isExist(String desc) { - for (EntrustBiologyType entrustStatisticType : values()) { - // 先匹配描述字段 - if (entrustStatisticType.getDesc().equals(desc)) { - return entrustStatisticType; - } - // 然后匹配别名 - if (entrustStatisticType.getAlias().contains(desc)) { - return entrustStatisticType; - } - } - return OTHER; - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustEvent.java b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustEvent.java new file mode 100644 index 0000000..f9caea6 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustEvent.java @@ -0,0 +1,20 @@ +package digital.laboratory.platform.entrustment.enums; + +/** + * @author ChenJiangBao + * @version 1.0 + * @description: 委托事件枚举 + * @date 2025/3/14 16:11 + */ +public enum EntrustEvent { + SUBMIT, // 提交委托事件 + CLAIM_CHECK, // 认领审核 + APPROVE, // 审批 + CLAIM_APPROVE, // 审核通过后审批 + CONFIRM, // 送检确认 + DELIVER, // 送检 + ACCEPT, // 受理 + TEST_FINISH, // 检验完成 + TERMINATE, // 终止 + ABORT; // 中止 +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustmentStatusConstants.java b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatusConstants.java similarity index 63% rename from src/main/java/digital/laboratory/platform/entrustment/enums/EntrustmentStatusConstants.java rename to src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatusConstants.java index 2d96c8b..5038207 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustmentStatusConstants.java +++ b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatusConstants.java @@ -18,34 +18,34 @@ import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor -public enum EntrustmentStatusConstants { +public enum EntrustStatusConstants { - ENTRUSTMENT_STATUS_CREATED(0, "待提交"), // 已创建待提交 + ENTRUST_STATUS_CREATED(0, "待提交"), // 已创建待提交 // ENTRUSTMENT_STATUS_CHECK_REJECTED(-1, "审核被驳回"), // 审核被驳回 // ENTRUSTMENT_STATUS_APPROVE_REJECTED(-2, "审批被驳回"), // 审批被驳回 - ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM(1, "待审核"), // 已提交, 待审核人员认领审核任务 - ENTRUSTMENT_STATUS_WAITING_CHECK(2, "审核中"), // 审核任务已认领, 审核中 - ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM(3, "待审批"), // 审核通过, 待审批人员认领审批任务 - ENTRUSTMENT_STATUS_WAITING_APPROVE(4, "审批中"), // 审批任务已认领, 待审批 - ENTRUSTMENT_STATUS_WAITING_CONFIRM(5, "待送检确认"), // 审批通过, 待送检确认 - ENTRUSTMENT_STATUS_WAITING_DELIVER(6, "送检确认通过, 待送检"), - ENTRUSTMENT_STATUS_WAITING_ACCEPT(7, "待受理"), + ENTRUST_STATUS_WAITING_CHECK_CLAIM(1, "待审核"), // 已提交, 待审核人员认领审核任务 + ENTRUST_STATUS_WAITING_CHECK(2, "审核中"), // 审核任务已认领, 审核中 + ENTRUST_STATUS_WAITING_APPROVE_CLAIM(3, "待审批"), // 审核通过, 待审批人员认领审批任务 + ENTRUST_STATUS_WAITING_APPROVE(4, "审批中"), // 审批任务已认领, 待审批 + ENTRUST_STATUS_WAITING_CONFIRM(5, "待送检确认"), // 审批通过, 待送检确认 + ENTRUST_STATUS_WAITING_DELIVER(6, "送检确认通过, 待送检"), + ENTRUST_STATUS_WAITING_ACCEPT(7, "待受理"), //ENTRUSTMENT_STATUS_ACCEPTING(8, "正在受理中"), // 受理过程比较花时间 - ENTRUSTMENT_STATUS_ACCEPTED(9, "已受理, 进入检验环节"), + ENTRUST_STATUS_ACCEPTED(9, "已受理, 进入检验环节"), - ENTRUSTMENT_STATUS_TEST_FINISH(10, "检验完毕"), + ENTRUST_STATUS_TEST_FINISH(10, "检验完毕"), - ENTRUSTMENT_STATUS_COMPLETED(99, "委托已完成"), // 已受理, 已完成鉴定, 结束 - ENTRUSTMENT_STATUS_TERMINATED(98, "委托已终止"), // 已受理, 无法完成鉴定, 结束 - ENTRUSTMENT_STATUS_ABORTED(97, "已中止"); // 在受理之前被中止 + ENTRUST_STATUS_COMPLETED(99, "委托已完成"), // 已受理, 已完成鉴定, 结束 + ENTRUST_STATUS_TERMINATED(98, "委托已终止"), // 已受理, 无法完成鉴定, 结束 + ENTRUST_STATUS_ABORTED(97, "已中止"); // 在受理之前被中止 // 以下状态信息需要确认 // String ENTRUSTMENT_STATUS_IDENTIFYING = "检验中"; // String ENTRUSTMENT_STATUS_IDENTIFIED = "已检验"; // String ENTRUSTMENT_STATUS_ANALYSED = "已分析"; // String ENTRUSTMENT_STATUS_WAITING_MARK_REPORT = "等制作文书"; -// String ENTRUSTMENT_STATUS_COMPLETED = "已完成"; +// String ENTRUST_STATUS_COMPLETED = "已完成"; // String ENTRUSTMENT_STATUS_WAITING_REPLENISH_SAMPLES = "待补充样本"; /** @@ -62,7 +62,7 @@ public enum EntrustmentStatusConstants { if (theStatus == null) { theStatus = 0; } - for (EntrustmentStatusConstants st : EntrustmentStatusConstants.values()) { + for (EntrustStatusConstants st : EntrustStatusConstants.values()) { if (st.getStatus() == theStatus) { return st.description; } @@ -76,22 +76,22 @@ public enum EntrustmentStatusConstants { } if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentCreate")) { - return ENTRUSTMENT_STATUS_CREATED.getStatus(); + return ENTRUST_STATUS_CREATED.getStatus(); } else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentCheck")) { - return ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus(); + return ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus(); } else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentApprove")) { - return ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(); + return ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(); } else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "deliverConfirm")) { - return ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(); + return ENTRUST_STATUS_WAITING_CONFIRM.getStatus(); } else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentWaitforDeliver")) { - return ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(); + return ENTRUST_STATUS_WAITING_DELIVER.getStatus(); } else if (StrUtil.equalsIgnoreCase(taskDefinitionKey, "entrustmentAccept")) { - return ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(); + return ENTRUST_STATUS_WAITING_ACCEPT.getStatus(); } else { return -1; @@ -115,7 +115,7 @@ public enum EntrustmentStatusConstants { 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())) { + if (theStatus.equals(ENTRUST_STATUS_ACCEPTED.getStatus()) || theStatus.equals(ENTRUST_STATUS_TEST_FINISH.getStatus()) || theStatus.equals(ENTRUST_STATUS_COMPLETED.getStatus())) { return true; } return false; diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java index 1e4cb76..bd7fb90 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustAlterApplyMapper.java @@ -1,17 +1,12 @@ package digital.laboratory.platform.entrustment.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import digital.laboratory.platform.entrustment.entity.EntrustAlterApply; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery; import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO; -import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java index d9558fb..fd9f48a 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustApproveRecordMapper.java @@ -1,12 +1,11 @@ package digital.laboratory.platform.entrustment.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.entrustment.entity.EntrustAlterApply; import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java index 953d257..4abeb6d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java @@ -1,14 +1,11 @@ package digital.laboratory.platform.entrustment.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult; -import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO; -import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentIdentificationMaterialMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentIdentificationMaterialMapper.java index a2fea99..7318e77 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentIdentificationMaterialMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentIdentificationMaterialMapper.java @@ -3,7 +3,6 @@ package digital.laboratory.platform.entrustment.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentMapper.java index 95158e2..7077cb3 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustmentMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import digital.laboratory.platform.entrustment.entity.Entrustment; -import digital.laboratory.platform.entrustment.vo.CaseEventVO; import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/TakerMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/TakerMapper.java index 7f085b8..64b46a9 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/TakerMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/TakerMapper.java @@ -3,7 +3,6 @@ package digital.laboratory.platform.entrustment.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import digital.laboratory.platform.entrustment.entity.Taker; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * 采集员 Mapper 接口 diff --git a/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java b/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java index 6b8fcad..05e121d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java @@ -1,6 +1,6 @@ package digital.laboratory.platform.entrustment.misc; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; /** @@ -9,30 +9,30 @@ import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; public class ProcessFlowMapper { public static int getNextStatus(int currentStatus, int opCode) { int processFlowMapper[][] = { - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus(), -2, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE.getStatus(), -2, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ABORTED.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_ABORTED.getStatus()}, - // {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()}, - // {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()}, - // {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()}, + // {EntrustmentStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus()}, + // {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), 1, EntrustmentStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()}, + // {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTING.getStatus(), -1, EntrustmentStatusConstants.ENTRUST_STATUS_CREATED.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()}, - {EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus(), -1, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()}, + {EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus(), -1, EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()}, }; for (int i = 0; i < processFlowMapper.length; i++) { diff --git a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java index 5f11c43..5f5bd7a 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java +++ b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustMaterialCheckoutResultQuery.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * 委托中检材检出结果消息 查询对象（分页查询、列表查询） * diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java b/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java index 3a433b4..7cdef81 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java @@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.entrustment.entity.CaseEvent; -import digital.laboratory.platform.othersys.vo.EntrustDataVo; import digital.laboratory.platform.entrustment.vo.CaseEventVO; +import digital.laboratory.platform.othersys.vo.EntrustDataVo; import java.time.LocalDate; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/CommonFeignService.java b/src/main/java/digital/laboratory/platform/entrustment/service/CommonFeignService.java index 33c6f94..10e3228 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/CommonFeignService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/CommonFeignService.java @@ -4,7 +4,6 @@ import com.deepoove.poi.XWPFTemplate; import digital.laboratory.platform.sys.entity.Area; import digital.laboratory.platform.sys.entity.SysOrg; import digital.laboratory.platform.sys.entity.SysUser; -import digital.laboratory.platform.sys.vo.UserVO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustAlterApplyService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustAlterApplyService.java index 53504b3..7acdd63 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustAlterApplyService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustAlterApplyService.java @@ -1,11 +1,11 @@ package digital.laboratory.platform.entrustment.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import digital.laboratory.platform.entrustment.dto.ApprovedUpdateEntrustDTO; import digital.laboratory.platform.entrustment.dto.EntrustAlterApplyApproveDTO; import digital.laboratory.platform.entrustment.dto.EntrustAlterApplyDTO; import digital.laboratory.platform.entrustment.entity.EntrustAlterApply; -import com.baomidou.mybatisplus.extension.service.IService; import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery; import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java index 653fb06..be25110 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustApproveRecordService.java @@ -1,8 +1,8 @@ package digital.laboratory.platform.entrustment.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord; import com.baomidou.mybatisplus.extension.service.IService; +import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord; import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.query.BaseQuery; import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentIdentificationMaterialService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentIdentificationMaterialService.java index b9e6175..406da47 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentIdentificationMaterialService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentIdentificationMaterialService.java @@ -2,7 +2,6 @@ package digital.laboratory.platform.entrustment.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.entrustment.dto.PrintDTO; import digital.laboratory.platform.entrustment.entity.CaseEvidence; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java index debf74f..a218018 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java @@ -14,8 +14,8 @@ import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import digital.laboratory.platform.entrustment.vo.MaterialListForBookVo; import digital.laboratory.platform.sys.entity.Deliverer; import digital.laboratory.platform.sys.entity.SysUser; -import digital.laboratory.platform.sys.vo.entrustment.MarkersVO; import digital.laboratory.platform.sys.entity.entrustment.Sample; +import digital.laboratory.platform.sys.vo.entrustment.MarkersVO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/IdentificationService.java b/src/main/java/digital/laboratory/platform/entrustment/service/IdentificationService.java index c705973..866f935 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/IdentificationService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/IdentificationService.java @@ -1,11 +1,7 @@ package digital.laboratory.platform.entrustment.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.Identification; -import digital.laboratory.platform.entrustment.vo.EntrustmentVO; import digital.laboratory.platform.entrustment.vo.IdentificationVO; import java.util.List; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/SampleBoxService.java b/src/main/java/digital/laboratory/platform/entrustment/service/SampleBoxService.java index 7f903ce..62f50fe 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/SampleBoxService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/SampleBoxService.java @@ -1,9 +1,9 @@ package digital.laboratory.platform.entrustment.service; import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.sys.entity.entrustment.SampleBox; import digital.laboratory.platform.entrustment.vo.SampleBoxLiteVO; import digital.laboratory.platform.entrustment.vo.SampleBoxVO; +import digital.laboratory.platform.sys.entity.entrustment.SampleBox; import java.util.List; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/SynchronizeDataService.java b/src/main/java/digital/laboratory/platform/entrustment/service/SynchronizeDataService.java index b3fdd96..9d79ac5 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/SynchronizeDataService.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/SynchronizeDataService.java @@ -2,9 +2,9 @@ package digital.laboratory.platform.entrustment.service; import com.baomidou.mybatisplus.extension.service.IService; import com.fasterxml.jackson.core.JsonProcessingException; -import digital.laboratory.platform.othersys.dto.EntrustQueryParams; import digital.laboratory.platform.entrustment.entity.EntrustOfThirdSys; import digital.laboratory.platform.entrustment.entity.Entrustment; +import digital.laboratory.platform.othersys.dto.EntrustQueryParams; import digital.laboratory.platform.othersys.vo.SynConnInfoVo; /** diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/AcceptServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/AcceptServiceImpl.java index c715bb9..1c376cf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/AcceptServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/AcceptServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import digital.laboratory.platform.common.core.exception.ValidateCodeException; import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.service.AcceptService; import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService; import digital.laboratory.platform.entrustment.service.EntrustmentService; @@ -45,7 +45,7 @@ public class AcceptServiceImpl implements AcceptService { if (entrustment == null) { throw new ValidateCodeException("检材对应的委托信息不存在！"); } - if (entrustment.getStatus().compareTo(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) >= 0) { + if (entrustment.getStatus().compareTo(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) >= 0) { throw new ValidateCodeException("该检材对应的委托信息已经受理完成，不能修改！"); } // 获取要修改的检材受理编号 diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java index ce17cab..0c52ed4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java @@ -1,6 +1,5 @@ package digital.laboratory.platform.entrustment.service.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,12 +16,12 @@ import digital.laboratory.platform.entrustment.entity.CaseEvidence; import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; import digital.laboratory.platform.entrustment.mapper.CaseEventMapper; -import digital.laboratory.platform.othersys.vo.EntrustDataVo; import digital.laboratory.platform.entrustment.service.CaseEventService; import digital.laboratory.platform.entrustment.service.CaseEvidenceService; import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService; import digital.laboratory.platform.entrustment.service.EntrustmentService; import digital.laboratory.platform.entrustment.vo.CaseEventVO; +import digital.laboratory.platform.othersys.vo.EntrustDataVo; import digital.laboratory.platform.sys.entity.SysOrg; import digital.laboratory.platform.sys.feign.RemoteOrgService; import lombok.RequiredArgsConstructor; @@ -31,10 +30,10 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEvidenceServiceImpl.java index d644b05..942e074 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEvidenceServiceImpl.java @@ -9,10 +9,10 @@ import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.entrustment.entity.CaseEvent; import digital.laboratory.platform.entrustment.entity.CaseEvidence; import digital.laboratory.platform.entrustment.mapper.CaseEvidenceMapper; +import digital.laboratory.platform.entrustment.service.CaseEvidenceService; import digital.laboratory.platform.othersys.utils.ConvertUtils; import digital.laboratory.platform.othersys.vo.EntrustDataVo; import digital.laboratory.platform.othersys.vo.MaterialVo; -import digital.laboratory.platform.entrustment.service.CaseEvidenceService; import digital.laboratory.platform.sys.feign.RemoteDictionaryService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CommonFeignServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CommonFeignServiceImpl.java index d1bfd00..6cb6caa 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/CommonFeignServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/CommonFeignServiceImpl.java @@ -25,7 +25,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; -import java.util.*; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java index 6b42a51..d85cf6b 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java @@ -25,7 +25,10 @@ import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums; import digital.laboratory.platform.entrustment.enums.EntrustAlterApplyStatus; import digital.laboratory.platform.entrustment.mapper.EntrustAlterApplyMapper; import digital.laboratory.platform.entrustment.query.EntrustAlterApplyQuery; -import digital.laboratory.platform.entrustment.service.*; +import digital.laboratory.platform.entrustment.service.CaseEventService; +import digital.laboratory.platform.entrustment.service.EntrustAlterApplyService; +import digital.laboratory.platform.entrustment.service.EntrustmentIdentificationMaterialService; +import digital.laboratory.platform.entrustment.service.EntrustmentService; import digital.laboratory.platform.entrustment.vo.EntrustAlterApplyVO; import digital.laboratory.platform.sys.entity.DrugLite; import org.springframework.stereotype.Service; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustApproveRecordServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustApproveRecordServiceImpl.java index 3f15b3d..545ab79 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustApproveRecordServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustApproveRecordServiceImpl.java @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import digital.laboratory.platform.common.aop.annotation.DlpResultProc; import digital.laboratory.platform.entrustment.entity.EntrustApproveRecord; import digital.laboratory.platform.entrustment.entity.Entrustment; +import digital.laboratory.platform.entrustment.mapper.EntrustApproveRecordMapper; import digital.laboratory.platform.entrustment.query.BaseQuery; import digital.laboratory.platform.entrustment.service.EntrustApproveRecordService; -import digital.laboratory.platform.entrustment.mapper.EntrustApproveRecordMapper; import digital.laboratory.platform.entrustment.vo.EntrustApproveRecordVO; import digital.laboratory.platform.sewage.entity.UpdateInfo; import org.springframework.stereotype.Service; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java index 7d84cb3..ee78b9d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java @@ -2,7 +2,6 @@ package digital.laboratory.platform.entrustment.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -17,7 +16,7 @@ import digital.laboratory.platform.entrustment.dto.EntrustMaterialCheckoutResult import digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult; import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.mapper.EntrustMaterialCheckoutResultMapper; import digital.laboratory.platform.entrustment.mapper.EntrustmentIdentificationMaterialMapper; import digital.laboratory.platform.entrustment.query.EntrustMaterialCheckoutResultQuery; @@ -30,7 +29,10 @@ import digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultV import digital.laboratory.platform.entrustment.vo.EntrustmentIdentificationMaterialVO; import digital.laboratory.platform.sys.entity.Area; import digital.laboratory.platform.sys.entity.DrugLite; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -120,7 +122,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl ids = dto.getIds(); @@ -655,7 +657,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl entrusts = entrustmentService.list(qw .eq(Entrustment::getEntrustmentType, entrustType) - .ge(Entrustment::getStatus, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus())); + .ge(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus())); if (entrusts.isEmpty()) { return Collections.emptyMap(); @@ -948,7 +950,7 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl entrusts = entrustmentService.list(wrapper .eq(Entrustment::getEntrustmentType, entrustType) - .eq(Entrustment::getStatus, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) + .eq(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) ); // 按照 oldIdentificationResult 进行分组 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 9571dd1..e5a6742 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 @@ -25,8 +25,7 @@ import digital.laboratory.platform.common.security.util.SecurityUtils; import digital.laboratory.platform.entrustment.dto.PrintDTO; import digital.laboratory.platform.entrustment.entity.*; import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums; -import digital.laboratory.platform.entrustment.enums.EntrustBiologyType; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.handler.AppStartupRunner; import digital.laboratory.platform.entrustment.mapper.EntrustmentIdentificationMaterialMapper; import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper; @@ -39,6 +38,7 @@ import digital.laboratory.platform.sys.entity.DrugLite; import digital.laboratory.platform.sys.entity.SysUser; import digital.laboratory.platform.sys.entity.entrustment.Sample; import digital.laboratory.platform.sys.entity.entrustment.SampleBox; +import digital.laboratory.platform.sys.enums.entrust.EntrustBiologyType; import digital.laboratory.platform.sys.feign.RemoteEquipmentService; import digital.laboratory.platform.sys.feign.RemoteSampleService; import digital.laboratory.platform.sys.feign.RemoteUserService; @@ -240,7 +240,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) { + if (entrustment.getStatus() >= EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) { Sample sample = new Sample(); sample.setIdentificationMaterialId(sourceMaterial.getId()); sample.setBoxId(boxId); @@ -256,7 +256,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) { + if (entrustment.getStatus() >= EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) { Sample sample = new Sample(); sample.setIdentificationMaterialId(sourceMaterial.getId()); sample.setBoxId(boxId); @@ -327,7 +327,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl 0) { - if (entrustment.getStatus() >= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()) { + if (entrustment.getStatus() >= EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()) { for (EntrustmentIdentificationMaterial material : materials) { Sample sample = new Sample(); sample.setIdentificationMaterialId(material.getId()); @@ -518,11 +518,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl= 0) { + if (entrustment.getStatus().compareTo(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus()) >= 0) { return null; } - if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) { + if (entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus()) { throw new RuntimeException("委托不在待审核状态"); } @@ -571,7 +571,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl createNewIm(List identificationMaterialList, DLPUser dlpUser) { Entrustment entrustment = entrustmentService.getById(identificationMaterialList.get(0).getEntrustmentId()); - if (!dlpUser.isStaff() && entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) { + if (!dlpUser.isStaff() && entrustment.getStatus() != EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus()) { throw new RuntimeException(String.format("你已提交过该委托，无法再添加检材信息!")); } // 记录当前委托的检材数量 diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index 51ed0d8..5a51d4d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -39,7 +39,7 @@ import digital.laboratory.platform.entrustment.dto.EntrustmentDTO; import digital.laboratory.platform.entrustment.entity.*; import digital.laboratory.platform.entrustment.enums.AnalysisOptionEnums; import digital.laboratory.platform.entrustment.enums.EntrustAlterApplyStatus; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.event.PushDataToLabsCareEvent; import digital.laboratory.platform.entrustment.handler.AppStartupRunner; import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper; @@ -332,11 +332,11 @@ public class EntrustmentServiceImpl extends ServiceImpl r = baseMapper.getEntrustmentVOList(qw); for (EntrustmentVO evo : r) { - evo.setStatusDescription(EntrustmentStatusConstants.getStatusDescription(evo.getStatus())); - evo.setPreviousStatusDescription(EntrustmentStatusConstants.getStatusDescription(evo.getPreviousStatus())); + evo.setStatusDescription(EntrustStatusConstants.getStatusDescription(evo.getStatus())); + evo.setPreviousStatusDescription(EntrustStatusConstants.getStatusDescription(evo.getPreviousStatus())); } return r; } @@ -357,8 +357,8 @@ public class EntrustmentServiceImpl extends ServiceImplquery().eq("id", entrustId)); // 标记该委托是否已经受理 - int isAccepted = entrustment.getStatus().compareTo(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()); + int isAccepted = entrustment.getStatus().compareTo(EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()); List materialList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery() .eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustId) .orderByAsc(isAccepted != -1, EntrustmentIdentificationMaterial::getAcceptNo) @@ -946,7 +946,7 @@ public class EntrustmentServiceImpl extends ServiceImplquery() .eq("id", entrustId)); - entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_TEST_FINISH.getStatus()); + entrustment.setStatus(EntrustStatusConstants.ENTRUST_STATUS_TEST_FINISH.getStatus()); return this.updateById(entrustment); } @@ -1157,7 +1157,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { @@ -1376,7 +1376,7 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustment.getProcessInfo(); if (pis == null) { pis = new ArrayList<>(); @@ -2758,8 +2758,8 @@ public class EntrustmentServiceImpl extends ServiceImpl users = new ArrayList<>(); SysUser submitter = remoteUserService.innerGetById(entrustment.getSubmitter()).getData(); users.add(submitter); return R.ok(users); - } else if (entrustment.getStatus() == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus()) { + } else if (entrustment.getStatus() == EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus()) { // 在送检提交员(创建者)手中: 已确认, 待送检 // return R.ok(this.taskAvailableUserList_Accept()); return R.ok(commonFeignService.remoteGetUsersByPermission(CommonConstants.ORG_TREE_ROOT_ID, CollUtil.newArrayList("EntrustmentAccept"))); @@ -3029,8 +3029,8 @@ public class EntrustmentServiceImpl extends ServiceImpl pis = entrustmentDTO.getProcessInfo(); if (pis == null) { pis = new ArrayList<>(); @@ -3079,15 +3079,15 @@ public class EntrustmentServiceImpl extends ServiceImpl> entrustGroupByStatusMap = entrustList.stream().collect(Collectors.groupingBy(Entrustment::getStatus)); - markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus(), Collections.EMPTY_LIST).size(), "待提交")); + markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus(), Collections.EMPTY_LIST).size(), "待提交")); - int deliverCount = entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus(), Collections.EMPTY_LIST).size() - + entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CONFIRM.getStatus(), Collections.EMPTY_LIST).size(); + int deliverCount = entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus(), Collections.EMPTY_LIST).size() + + entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CONFIRM.getStatus(), Collections.EMPTY_LIST).size(); markersVOS.add(new MarkersVO("案件委托", deliverCount, "待送检")); markersVOS.add(new MarkersVO("案件委托", entrustList.stream().filter(entrust -> entrust.getReturnOrNot() != null &&entrust.getReturnOrNot().equals(-1)).collect(Collectors.toList()).size(), "已退回")); - markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_COMPLETED.getStatus(), Collections.EMPTY_LIST).size(), "已完成")); + markersVOS.add(new MarkersVO("案件委托", entrustGroupByStatusMap.getOrDefault(EntrustStatusConstants.ENTRUST_STATUS_COMPLETED.getStatus(), Collections.EMPTY_LIST).size(), "已完成")); Integer entrustAlterApplyCount = (int) entrustAlterApplyService.count(Wrappers.lambdaQuery() .eq(EntrustAlterApply::getStatus, EntrustAlterApplyStatus.APPLY_SUCCESS.getStatus()) @@ -3273,29 +3273,29 @@ public class EntrustmentServiceImpl extends ServiceImpl entrustListMapOrDefault = entrustListMap.getOrDefault( - StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST + StrUtil.join("_", EntrustMarkConstants.LOCAL_SYSTEM, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST ); // 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)) - && EntrustmentStatusConstants.geAcceptedStatus(o.getStatus()) + && EntrustStatusConstants.geAcceptedStatus(o.getStatus()) ).collect(Collectors.toList()).size(), String.format("已受理 (%s)", EntrustMarkConstants.PUBLIC_SECURITY_BUREAU))); markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, entrustListMap.getOrDefault( - StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST + StrUtil.join("_", EntrustMarkConstants.THIRD_PARTY_SYSTEM, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()), Collections.EMPTY_LIST ).size(), "已受理 (大数据平台)")); markersVOS.add(new MarkersVO(EntrustMarkConstants.CASE_ACCEPT, @@ -3303,7 +3303,7 @@ public class EntrustmentServiceImpl extends ServiceImpl o.getAcceptTime().isAfter(LocalDateTime.of(LocalDate.now().withDayOfYear(1), LocalTime.MIN)) - && EntrustmentStatusConstants.geAcceptedStatus(o.getStatus()) + && EntrustStatusConstants.geAcceptedStatus(o.getStatus()) ) .collect(Collectors.toList()) .size(), @@ -3349,7 +3349,7 @@ public class EntrustmentServiceImpl extends ServiceImpl getAllSampleForPrint() { List entrustmentIdentificationMaterials = new ArrayList<>(); List entrustmentList = this.list(Wrappers.lambdaQuery() - .ge(Entrustment::getStatus, EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED) + .ge(Entrustment::getStatus, EntrustStatusConstants.ENTRUST_STATUS_ACCEPTED) .orderByAsc(Entrustment::getAcceptNo)); for (Entrustment entrustment : entrustmentList) { diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/IdentificationServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/IdentificationServiceImpl.java index fdd1eee..8d40583 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/IdentificationServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/IdentificationServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import digital.laboratory.platform.common.core.constant.CommonConstants; import digital.laboratory.platform.entrustment.entity.Identification; import digital.laboratory.platform.entrustment.handler.AppStartupRunner; -import digital.laboratory.platform.entrustment.mapper.EntrustmentMapper; import digital.laboratory.platform.entrustment.mapper.IdentificationMapper; import digital.laboratory.platform.entrustment.service.IdentificationService; import digital.laboratory.platform.entrustment.vo.IdentificationVO; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleBoxServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleBoxServiceImpl.java index 21edb7c..d898a04 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleBoxServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleBoxServiceImpl.java @@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import digital.laboratory.platform.common.core.constant.CommonConstants; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.feign.RemoteTemplate2htmlService; -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.handler.AppStartupRunner; import digital.laboratory.platform.entrustment.mapper.SampleBoxMapper; import digital.laboratory.platform.entrustment.service.*; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java index ce619d2..1b74eaf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java @@ -5,13 +5,12 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import digital.laboratory.platform.common.core.constant.CommonConstants; -import digital.laboratory.platform.sewage.entity.SewageJobIdentificationMaterial; -import digital.laboratory.platform.sys.entity.DrugLite; -import digital.laboratory.platform.entrustment.entity.*; +import digital.laboratory.platform.entrustment.entity.EntrustmentIdentificationMaterial; import digital.laboratory.platform.entrustment.handler.AppStartupRunner; -import digital.laboratory.platform.entrustment.mapper.SampleBoxMapper; import digital.laboratory.platform.entrustment.mapper.SampleMapper; import digital.laboratory.platform.entrustment.service.SampleService; +import digital.laboratory.platform.sewage.entity.SewageJobIdentificationMaterial; +import digital.laboratory.platform.sys.entity.DrugLite; import digital.laboratory.platform.sys.entity.entrustment.IMAdditionalProperty; import digital.laboratory.platform.sys.entity.entrustment.Sample; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SynchronizeDataServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SynchronizeDataServiceImpl.java index e47074c..98e7771 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SynchronizeDataServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SynchronizeDataServiceImpl.java @@ -12,13 +12,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import digital.laboratory.platform.common.core.constant.CommonConstants; import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.othersys.dto.EntrustQueryParams; import digital.laboratory.platform.entrustment.entity.*; -import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; import digital.laboratory.platform.entrustment.mapper.EntrustDataVoMapper; import digital.laboratory.platform.entrustment.service.*; import digital.laboratory.platform.othersys.dto.DataAuditBaseDto; import digital.laboratory.platform.othersys.dto.EntrustDataDto; +import digital.laboratory.platform.othersys.dto.EntrustQueryParams; import digital.laboratory.platform.othersys.utils.ConvertUtils; import digital.laboratory.platform.othersys.utils.HttpsUtils; import digital.laboratory.platform.othersys.vo.*; @@ -37,7 +37,10 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -293,9 +296,9 @@ public class SynchronizeDataServiceImpl extends ServiceImpllambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId())); entrustmentService.removeById(entrustment); synchronizeMaterialVoService.remove(Wrappers.lambdaQuery().eq(EntrustMaterialOfThirdSys::getEntrustId, thirdSys.getId())); this.removeById(thirdSys); -// entrustment.setStatus(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_ACCEPTED.getStatus()); +// entrustment.setStatus(EntrustmentStatusConstants.ENTRUST_STATUS_ACCEPTED.getStatus()); // entrustment.setAcceptNo(entrustDataVo.getSerialNumber()); // List entrustmentIdentificationMaterialList = entrustmentIdentificationMaterialService.list(Wrappers.lambdaQuery().eq(EntrustmentIdentificationMaterial::getEntrustmentId, entrustment.getId())); // List materialList = entrustDataVo.getMaterialList(); @@ -525,8 +528,8 @@ public class SynchronizeDataServiceImpl extends ServiceImpl statusList = new ArrayList<>(); switch (statusStr) { case "provinceAuditing": - statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK_CLAIM.getStatus());//1 - statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus());//0 + statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus());//1 + statusList.add(EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus());//0 break; case "acceptAuditing": - statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE_CLAIM.getStatus());//3 - statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus());//2 + statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_APPROVE_CLAIM.getStatus());//3 + statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK.getStatus());//2 break; case "toAccept": - statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus());//7 - statusList.add(EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_DELIVER.getStatus());//6 + statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_ACCEPT.getStatus());//7 + statusList.add(EntrustStatusConstants.ENTRUST_STATUS_WAITING_DELIVER.getStatus());//6 break; } return statusList; diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java index b16dd45..f660ede 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustMaterialCheckoutResultVO.java @@ -1,15 +1,9 @@ package digital.laboratory.platform.entrustment.vo; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; -import digital.laboratory.platform.sys.entity.DrugLite; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * 委托检材--检出定性定量结果信息 * @TableName b_entrust_material_checkout_result diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java b/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java index 92f4fce..244bd39 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java +++ b/src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java @@ -2,8 +2,6 @@ package digital.laboratory.platform.entrustment.vo; import lombok.Data; -import java.math.BigDecimal; - /** * @ClassName MaterialListForBookVo * @Description 文书中的检材列表VO