样品接收查询修改

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java

@@ -37,7 +37,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-handover")
 @Validated
-public class BusinessSampleHandoverController implements BusinessControllerMarker {
+public class BusinessSampleHandoverController {
 
 
     @Resource

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustDetailExtendRespVO.java

@@ -1,7 +1,17 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
@@ -16,6 +26,12 @@ public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntru
 	/** 打印标签 **/
     private String printTemplate;
     
+    @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应）
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "任务结束时间(yyyy-MM-dd HH:mm:ss)")
+    private LocalDateTime createTime;
+    
 	private List<BusinessSampleEntrustProjectExtendRespVO> sampleEntrustDetailProjectList;
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSamplePageReqVO.java

@@ -6,6 +6,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import java.math.BigDecimal;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -133,6 +134,8 @@ public class BusinessSubSamplePageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //=======================================扩展字段=======================================
+
 	@Schema(description = "分析部门id")
     private Long assayDepartmentId;
 	
@@ -142,7 +145,9 @@ public class BusinessSubSamplePageReqVO extends PageParam {
 	@Schema(description = "分析部门状态")
 	private String assayDepartmentStatus;
 	
-    //=======================================扩展字段=======================================
+    @Schema(description = "样品流程节点KEY列表")
+    private List<String> sampleFlowNodeKeyList;
+    
     @Schema(description = "库位编码")
     private String warehouseLocationCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleReqVO.java

@@ -134,6 +134,29 @@ public class BusinessSubSampleReqVO  {
     @Schema(description = "备注")
     private String remark;
 
+    //=======================================扩展字段=======================================
+
+	@Schema(description = "分析部门id")
+    private Long assayDepartmentId;
+	
+	@Schema(description = "分析部门名称")
+    private String assayDepartmentName;
+	
+	@Schema(description = "分析部门状态")
+	private String assayDepartmentStatus;
+	
+    @Schema(description = "样品流程节点KEY列表")
+    private List<String> sampleFlowNodeKeyList;
+    
+    @Schema(description = "库位编码")
+    private String warehouseLocationCode;
+
+    @Schema(description = "仓库编码")
+    private String warehouseCode;
+
+    //是否过滤已申请调拨的数据: 1-是， 其他值：否
+    @Schema(description = "是否过滤已申请调拨的数据")
+    private String hideDispatchData;
 
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java

@@ -63,6 +63,7 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleDO::getLastBalanceCode, reqVO.getLastBalanceCode())
                 .eqIfPresent(BusinessSubSampleDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
                 .eqIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
+                .inIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKeyList())
                 .betweenIfPresent(BusinessSubSampleDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
                 .eqIfPresent(BusinessSubSampleDO::getNextSampleFlowNode, reqVO.getNextSampleFlowNode())
                 .eqIfPresent(BusinessSubSampleDO::getSampleStatus, reqVO.getSampleStatus())
@@ -118,6 +119,7 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleDO::getLastBalanceCode, reqVO.getLastBalanceCode())
                 .eqIfPresent(BusinessSubSampleDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
                 .eqIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
+                .inIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKeyList())
                 .betweenIfPresent(BusinessSubSampleDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
                 .eqIfPresent(BusinessSubSampleDO::getNextSampleFlowNode, reqVO.getNextSampleFlowNode())
                 .eqIfPresent(BusinessSubSampleDO::getSampleStatus, reqVO.getSampleStatus())
@@ -171,6 +173,7 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleDO::getLastBalanceCode, reqVO.getLastBalanceCode())
                 .eqIfPresent(BusinessSubSampleDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
                 .eqIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
+                .inIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKeyList())
                 .betweenIfPresent(BusinessSubSampleDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
                 .eqIfPresent(BusinessSubSampleDO::getNextSampleFlowNode, reqVO.getNextSampleFlowNode())
                 .eqIfPresent(BusinessSubSampleDO::getSampleStatus, reqVO.getSampleStatus())
@@ -233,6 +236,7 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
         		.selectAs(ConfigSubSampleDO::getPrintTemplate, BusinessSubSampleExtendRespVO::getPrintTemplate)
                 .eqIfPresent(BusinessSubSampleDO::getSampleCode, reqVO.getSampleCode())
                 .eqIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
+                .inIfPresent(BusinessSubSampleDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKeyList())
                 .eqIfPresent(BusinessSubSampleDO::getSampleStatus, QmsCommonConstant.NORMAL)
                 .eqIfPresent(BusinessSubSampleDO::getIsEnabled, QmsCommonConstant.YES)
                 .orderByDesc(BusinessSubSampleDO::getId));