荧光数据接口

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

@@ -31,7 +31,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 荧光采集记录")
 @RestController
-@RequestMapping("/qms/business-XRF-data")
+@RequestMapping("/qms/business-xrf-data")
 @Validated
 public class BusinessXRFDataController implements BusinessControllerMarker {
 

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

@@ -63,6 +63,10 @@ public class BatchSampleAnalysisColumnRespVO implements Serializable {
     @Schema(description = "单位")
     private String unit;
 
+    /** 类型（project：元素，parameter：参数） **/
+    @Schema(description = "类型（project：元素，parameter：参数）")
+    private String type;
+    
     @Schema(description = "填写方式")
     private String fillingWay;
     

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

@@ -54,8 +54,8 @@ public class BusinessAssayProjectAndParameterRespVO implements Serializable {
     @Schema(description = "元素或参数配置参数编号")
     private Integer paramNo;
     
-    /** 类型（1：元素，2：参数） **/
+    /** 类型（project：元素，parameter：参数） **/
-    @Schema(description = "类型（project：元素，2：参数）")
+    @Schema(description = "类型（project：元素，parameter：参数）")
     private String type;
     
     @Schema(description = "填写方式")

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

@@ -14,7 +14,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 public class BusinessXRFDataPageReqVO extends PageParam {
 
     @Schema(description = "设备编号")
-    private Long deviceNo;
+    private String deviceNo;
 
     @Schema(description = "荧光线名称", example = "王五")
     private String lineName;
@@ -44,6 +44,9 @@ public class BusinessXRFDataPageReqVO extends PageParam {
     @Schema(description = "分样子样ID", example = "13189")
     private Long businessSubSampleId;
     
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
+
     @Schema(description = "检测数据")
     private String assayData;
 

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

@@ -0,0 +1,85 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 荧光采集记录分页 Request VO")
+@Data
+public class BusinessXRFDataReqVO {
+
+    @Schema(description = "设备编号")
+    private String deviceNo;
+
+    @Schema(description = "荧光线名称", example = "王五")
+    private String lineName;
+
+    @Schema(description = "荧光样品id", example = "13273")
+    private String xRFSampleId;
+
+    @Schema(description = "荧光样品id列表")
+    private List<String> xRFSampleIdList;
+
+    @Schema(description = "样品编号")
+    private String sampleCode;
+
+    @Schema(description = "样品名称", example = "李四")
+    private String sampleName;
+
+    @Schema(description = "样品时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleTime;
+
+    @Schema(description = "分析人")
+    private String assayOperator;
+
+    @Schema(description = "样品主样ID", example = "29288")
+    private Long businessBaseSampleId;
+
+    @Schema(description = "样品分样ID", example = "4878")
+    private Long businessSubParentSampleId;
+
+    @Schema(description = "分样子样ID", example = "13189")
+    private Long businessSubSampleId;
+    
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
+
+    @Schema(description = "检测数据")
+    private String assayData;
+
+    @Schema(description = "是否为检查创建数据")
+    private Integer isCheckCreate;
+
+    @Schema(description = "是否已匹配")
+    private Integer isMatched;
+
+    @Schema(description = "是否已上报")
+    private Integer isReported;
+
+    @Schema(description = "上报人")
+    private String reporter;
+
+    @Schema(description = "上报时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] reportTime;
+
+    @Schema(description = "乐观锁", example = "4171")
+    private Integer updateCount;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

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

@@ -18,7 +18,7 @@ public class BusinessXRFDataRespVO {
 
     @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("设备编号")
-    private Long deviceNo;
+    private String deviceNo;
 
     @Schema(description = "荧光线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("荧光线名称")
@@ -56,6 +56,9 @@ public class BusinessXRFDataRespVO {
     @ExcelProperty("分样子样ID")
     private Long businessSubSampleId;
     
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
+
     @Schema(description = "检测数据", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("检测数据")
     private String assayData;

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

@@ -16,7 +16,7 @@ public class BusinessXRFDataSaveReqVO {
 
     @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "设备编号不能为空")
-    private Long deviceNo;
+    private String deviceNo;
 
     @Schema(description = "荧光线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @NotEmpty(message = "荧光线名称不能为空")
@@ -49,6 +49,9 @@ public class BusinessXRFDataSaveReqVO {
     @NotNull(message = "分样子样ID不能为空")
     private Long businessSubSampleId;
     
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
+
     @Schema(description = "检测数据", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "检测数据不能为空")
     private String assayData;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessXRFDataDO.java

@@ -37,7 +37,7 @@ public class BusinessXRFDataDO extends BusinessBaseDO {
     * 设备编号
     */
     @TableField("DEV_NO")
-    private Long deviceNo;
+    private String deviceNo;
     /**
     * 荧光线名称
     */
@@ -84,6 +84,11 @@ public class BusinessXRFDataDO extends BusinessBaseDO {
     @TableField("BSN_SB_SMP_ID")
     private Long businessSubSampleId;
     /**
+    * 检测任务ID
+    */
+    @TableField("BSN_ASY_TSK_DAT_ID")
+    private Long businessAssayTaskDataId;
+    /**
     * 检测数据
     */
     @TableField("ASY_DAT")

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

@@ -119,6 +119,17 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         		.eq(BusinessAssayTaskDataDO::getId, businessAssayTaskDataId));
 	}
 	
+	default BusinessAssayTaskDataExtendRespVO selectBySampleCode(String sampleCode) {
+		return selectJoinOne(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+				.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+        		.selectAll(BusinessAssayTaskDataDO.class)
+        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+        		.eq(BusinessSubSampleDO::getSampleAssayCode, sampleCode)
+        		.eq(BusinessAssayTaskDataDO::getIsReported, QmsCommonConstant.NO));		
+	}
+	
 	default List<BusinessAssayTaskDataExtendRespVO> selectResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
 		MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapper<BusinessAssayTaskDataDO>()
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
@@ -320,4 +331,5 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 	 */
 	List<UnAssignTaskedSubSampleRespVO> selectUnAssignTaskedSubSample();
 
+
 }

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

@@ -5,6 +5,9 @@ import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessXRFDataDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 /**
  * 荧光采集记录 Mapper
@@ -26,6 +29,34 @@ public interface BusinessXRFDataMapper extends BaseMapperX<BusinessXRFDataDO> {
                 .eqIfPresent(BusinessXRFDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessXRFDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessXRFDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
+                .eqIfPresent(BusinessXRFDataDO::getAssayData, reqVO.getAssayData())
+                .eqIfPresent(BusinessXRFDataDO::getIsCheckCreate, reqVO.getIsCheckCreate())
+                .eqIfPresent(BusinessXRFDataDO::getIsMatched, reqVO.getIsMatched())
+                .eqIfPresent(BusinessXRFDataDO::getIsReported, reqVO.getIsReported())
+                .eqIfPresent(BusinessXRFDataDO::getReporter, reqVO.getReporter())
+                .betweenIfPresent(BusinessXRFDataDO::getReportTime, reqVO.getReportTime())
+                .eqIfPresent(BusinessXRFDataDO::getUpdateCount, reqVO.getUpdateCount())
+                .eqIfPresent(BusinessXRFDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessXRFDataDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessXRFDataDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessXRFDataDO::getId));
+    }
+
+    default List<BusinessXRFDataDO> selectList(BusinessXRFDataReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<BusinessXRFDataDO>()
+                .eqIfPresent(BusinessXRFDataDO::getDeviceNo, reqVO.getDeviceNo())
+                .likeIfPresent(BusinessXRFDataDO::getLineName, reqVO.getLineName())
+                .eqIfPresent(BusinessXRFDataDO::getXRFSampleId, reqVO.getXRFSampleId())
+                .inIfPresent(BusinessXRFDataDO::getXRFSampleId, reqVO.getXRFSampleIdList())
+                .eqIfPresent(BusinessXRFDataDO::getSampleCode, reqVO.getSampleCode())
+                .likeIfPresent(BusinessXRFDataDO::getSampleName, reqVO.getSampleName())
+                .betweenIfPresent(BusinessXRFDataDO::getSampleTime, reqVO.getSampleTime())
+                .eqIfPresent(BusinessXRFDataDO::getAssayOperator, reqVO.getAssayOperator())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
+                .eqIfPresent(BusinessXRFDataDO::getBusinessAssayTaskDataId, reqVO.getBusinessAssayTaskDataId())
                 .eqIfPresent(BusinessXRFDataDO::getAssayData, reqVO.getAssayData())
                 .eqIfPresent(BusinessXRFDataDO::getIsCheckCreate, reqVO.getIsCheckCreate())
                 .eqIfPresent(BusinessXRFDataDO::getIsMatched, reqVO.getIsMatched())