From be89a965d8fa2dc0304bb429c10c2a0c14ee511b Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 3 Dec 2025 16:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=AD=89bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SampleTaskAssignController.java | 7 +++++++ .../vo/BusinessAssayTaskDataReqVO.java | 11 ++++++++++ .../BusinessHandoverRecordSubPageReqVO.java | 8 ++++++++ ...sinessSampleEntrustRegistrationRespVO.java | 3 +++ .../BusinessHandoverRecordSubMapper.java | 2 ++ .../dal/mapper/BusinessSubSampleMapper.java | 2 +- .../service/BusinessSubSampleServiceImpl.java | 3 +++ .../SampleAnalysisAuditServiceImpl.java | 3 +++ .../bus/service/SampleTaskAssignService.java | 7 +++++++ .../service/SampleTaskAssignServiceImpl.java | 6 ++++++ .../mapper/BusinessAssayTaskDataMapper.xml | 20 +++++++++++++++---- 11 files changed, 67 insertions(+), 5 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java index e1dac76..f47fc73 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java @@ -39,6 +39,13 @@ public class SampleTaskAssignController implements BusinessControllerMarker { List list = sampleTaskAssignService.getAssignUserList(); return success(list); } + + @Operation(description = "根据用户id获取用户信息") + @GetMapping("/getUserInfoById") + public CommonResult getUserInfoById(Long userId) { + AdminUserRespDTO userRespDTO = sampleTaskAssignService.getUserInfoById(userId); + return success(userRespDTO); + } @GetMapping("/getAssaySampleList") public CommonResult getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java index 77b2d62..94a73a9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java @@ -105,4 +105,15 @@ public class BusinessAssayTaskDataReqVO { @Schema(description = "样品状态") private String sampleStatus; + @Schema(description = "检测方法配置名称") + private String configAssayMethodName; + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "分析编号") + private String sampleAssayCode; + + @Schema(description = "归库编号") + private String sampleReturnCode; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessHandoverRecordSubPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessHandoverRecordSubPageReqVO.java index 783c9a5..e335e60 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessHandoverRecordSubPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessHandoverRecordSubPageReqVO.java @@ -64,5 +64,13 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam { @Schema(description = "备注") private String remark; + //==============扩展字段================ + private Long deptId; + + @Schema(description = "分析编号") + private String sampleAssayCode; + + @Schema(description = "归库编号") + private String sampleReturnCode; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationRespVO.java index 2d33f95..918b195 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationRespVO.java @@ -6,6 +6,7 @@ import java.util.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; +import com.zt.plat.module.qms.core.aspect.annotation.Dict; @Schema(description = "管理后台 - 委检登记业务 Response VO") @Data @@ -144,10 +145,12 @@ public class BusinessSampleEntrustRegistrationRespVO { @ExcelProperty("数据校验状态,success-数据校验成功、fail-数据校验失败") private String dataCheckStatus; + @Dict(dicCode = "entrust_assay_status") @Schema(description = "检验状态,unchecked-未检验；checked-已检验", example = "2") @ExcelProperty("检验状态,unchecked-未检验；checked-已检验") private String assayStatus; + @Dict(dicCode = "entrust_data_status") @Schema(description = "数据回报状态,unreturned-未回报；returned-已回报", example = "1") @ExcelProperty("数据回报状态,unreturned-未回报；returned-已回报") private String dataStatus; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessHandoverRecordSubMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessHandoverRecordSubMapper.java index 7749762..ccbcb51 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessHandoverRecordSubMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessHandoverRecordSubMapper.java @@ -47,6 +47,8 @@ public interface BusinessHandoverRecordSubMapper extends BaseMapperX businessSubSampleAnalysisGroupList = businessSubSampleAnalysisGroupMapper.selectByBusinessSubSampleId(subSample.getId()); BusinessSubSampleAnalysisGroupDO receiveSample = businessSubSampleAnalysisGroupList.stream().filter(f -> "已收样".equals(f.getSampleStatus()) && !f.getAssayDepartmentId().equals(loginUser.getVisitDeptId())).findFirst().orElse(null); if (receiveSample != null) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index 767e7b7..0439190 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java @@ -327,6 +327,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic map.put("sampleCode", businessAssayTaskDetailDO.getSampleCode()); map.put("sampleName", businessAssayTaskDetailDO.getSampleName()); map.put("analysisType", "analysis"); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); BusinessAssayProjectDataReqVO projectDataSearch2 = new BusinessAssayProjectDataReqVO(); projectDataSearch2.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId()); @@ -362,6 +363,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic map.put("sampleCode", businessQCManagementData.getSampleCode()); map.put("sampleName", businessQCManagementData.getSampleName()); map.put("analysisType", businessQCManagementData.getDictionaryBusinessKey()); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); BusinessQCManagementProjectDataReqVO projectDataSearch2 = new BusinessQCManagementProjectDataReqVO(); projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementData.getId()); @@ -395,6 +397,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic map.put("sampleCode", businessQCCoefficientData.getSampleCode()); map.put("sampleName", businessQCCoefficientData.getSampleName()); map.put("analysisType", businessQCCoefficientData.getDictionaryBusinessKey()); + map.put("assayTime", businessAssayTaskJson.get("assayTime")); BusinessQCCoefficientParameterDataReqVO parameterDataSearch2 = new BusinessQCCoefficientParameterDataReqVO(); parameterDataSearch2.setBusinessQCCoefficientDataId(businessQCCoefficientData.getId()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java index 8afa8f5..7e77658 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java @@ -18,6 +18,13 @@ public interface SampleTaskAssignService { */ List getAssignUserList(); + /** + * 根据用户id获取用户信息 + * @param userId + * @return + */ + AdminUserRespDTO getUserInfoById(Long userId); + /** * 获取未指派任务子样信息 * @return diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java index d837dd0..b391d76 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java @@ -176,6 +176,12 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { return userListResult.getCheckedData(); } + @Override + public AdminUserRespDTO getUserInfoById(Long userId) { + CommonResult useResult = adminUserApi.getUser(userId); + return useResult.getCheckedData(); + } + @Override public List getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) { List list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample(reqVO); diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml index dbb7c17..cf6bef7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml @@ -33,8 +33,11 @@ AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey} - - AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]} + + AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]} + + + AND tcam.NAME like '%' || #{reqVO.configAssayMethodName} || '%' GROUP BY tbatd.CFG_ASY_MTHD_ID, @@ -126,8 +129,17 @@ AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey} - - AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]} + + AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]} + + + AND tbss.SMP_CD = #{reqVO.sampleCode} + + + AND tbss.SMP_ASY_CD = #{reqVO.sampleAssayCode} + + + AND tbss.SMP_RTN_CD = #{reqVO.sampleReturnCode} GROUP BY tbss.ID , tbss.SMP_NAME ,