报表数据添加报表来源、是否已全部上报、已上报数据来源

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

@@ -92,6 +92,14 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
         return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class));
     }
 
+    @GetMapping("/list")
+    @Operation(summary = "获得检测任务分配明细分页")
+    @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
+    public CommonResult<List<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailList(@Valid BusinessAssayTaskDetailReqVO reqVO) {
+        List<BusinessAssayTaskDetailExtendRespVO> resultList = businessAssayTaskDetailService.getBusinessAssayTaskDetailList(reqVO);
+        return success(resultList);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出检测任务分配明细 Excel")
     @PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')")

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

@@ -24,9 +24,18 @@ public class BusinessAssayReportDataPageReqVO extends PageParam {
 
     @Schema(description = "样品编号")
     private String sampleCode;
+    
+    @Schema(description = "数据来源")
+    private String dataSource;
 
     @Schema(description = "分析数据")
     private String assayData;
+    
+    @Schema(description = "是否已全部上报")
+    private Integer isAllReported;
+    
+    @Schema(description = "已上报数据来源")
+    private String reportedSource;
 
     @Schema(description = "流程code")
     private String reportFlowCode;

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

@@ -31,10 +31,19 @@ public class BusinessAssayReportDataRespVO {
     @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("样品编号")
     private String sampleCode;
+    
+    @Schema(description = "数据来源")
+    private String dataSource;
 
     @Schema(description = "分析数据")
     @ExcelProperty("分析数据")
     private String assayData;
+    
+    @Schema(description = "是否已全部上报")
+    private Integer isAllReported;
+    
+    @Schema(description = "已上报数据来源")
+    private String reportedSource;
 
     @Schema(description = "流程code")
     @ExcelProperty("流程code")

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

@@ -27,9 +27,18 @@ public class BusinessAssayReportDataSaveReqVO {
     @Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "样品编号不能为空")
     private String sampleCode;
+    
+    @Schema(description = "数据来源")
+    private String dataSource;
 
     @Schema(description = "分析数据")
     private String assayData;
+    
+    @Schema(description = "是否已全部上报")
+    private Integer isAllReported;
+    
+    @Schema(description = "已上报数据来源")
+    private String reportedSource;
 
     @Schema(description = "流程code")
     private String reportFlowCode;

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

@@ -0,0 +1,17 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+/**
+ * <b>BusinessAssayTaskDetailExtendRespVO</b>
+ * <p>
+ * 更新历史：
+ * <pre> 版本         更新时间            更新者        更新内容<hr/>
+ * V1.0      2025年10月17日          wxr         Add</pre>
+ * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
+ * </p>
+ * @author 王兴荣<wxr@wangxingrong.com>
+ * @version V1.0 
+ * @since 2025年10月17日
+ */
+public class BusinessAssayTaskDetailExtendRespVO extends BusinessAssayTaskDetailRespVO {
+
+}

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

@@ -52,10 +52,25 @@ public class BusinessAssayReportDataDO extends BusinessBaseDO {
     @TableField("SMP_CD")
     private String sampleCode;
     /**
+    * 数据来源
+    */
+    @TableField("DAT_SRC")
+    private String dataSource;
+    /**
     * 分析数据
     */
     @TableField("ASY_DAT")
     private String assayData;
+    /**
+     * 是否已全部上报（0-否，1-是）
+     */
+    @TableField("IS_ALL_RPOD")
+    private Integer isAllReported;
+    /**
+     * 已上报数据来源
+     */
+    @TableField("RPOD_SRC")
+    private String reportedSource;
     /**
     * 流程code
     */

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

@@ -25,7 +25,10 @@ public interface BusinessAssayReportDataMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayReportDataDO::getConfigSampleReportId, reqVO.getConfigSampleReportId())
                 .eqIfPresent(BusinessAssayReportDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessAssayReportDataDO::getSampleCode, reqVO.getSampleCode())
+                .eqIfPresent(BusinessAssayReportDataDO::getDataSource, reqVO.getDataSource())
                 .eqIfPresent(BusinessAssayReportDataDO::getAssayData, reqVO.getAssayData())
+                .eqIfPresent(BusinessAssayReportDataDO::getIsAllReported, reqVO.getIsAllReported())
+                .eqIfPresent(BusinessAssayReportDataDO::getReportedSource, reqVO.getReportedSource())
                 .eqIfPresent(BusinessAssayReportDataDO::getReportFlowCode, reqVO.getReportFlowCode())
                 .eqIfPresent(BusinessAssayReportDataDO::getDocumentDataId, reqVO.getDocumentDataId())
                 .eqIfPresent(BusinessAssayReportDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())

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

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.business.bus.dal.mapper;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
@@ -34,6 +35,23 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessAssayTaskDetailDO::getId));
     }
+    
+    default List<BusinessAssayTaskDetailExtendRespVO> selectList(BusinessAssayTaskDetailReqVO reqVO) {
+    	return selectJoinList(BusinessAssayTaskDetailExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDetailDO>()
+                .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getSampleId, reqVO.getSampleId())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getTaskNo, reqVO.getTaskNo())
+                .likeIfPresent(BusinessAssayTaskDetailDO::getSampleName, reqVO.getSampleName())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getSampleCode, reqVO.getSampleCode())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getCupNumber, reqVO.getCupNumber())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getDataSourceType, reqVO.getDataSourceType())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getSortNo, reqVO.getSortNo())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getRollbackStatus, reqVO.getRollbackStatus())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+                .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
+    			.orderByDesc(BusinessAssayTaskDetailDO::getId));
+    }
 
 	default List<BusinessAssayTaskDetailDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
 		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>()

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDetailService.java

@@ -2,14 +2,10 @@ package com.zt.plat.module.qms.business.bus.service;
 
 import java.util.*;
 
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailSaveReqVO;
 import jakarta.validation.*;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
-import com.zt.plat.framework.common.pojo.PageParam;
 
 /**
  * 检测任务分配明细 Service 接口
@@ -63,4 +59,12 @@ public interface BusinessAssayTaskDetailService {
      */
     PageResult<BusinessAssayTaskDetailDO> getBusinessAssayTaskDetailPage(BusinessAssayTaskDetailPageReqVO pageReqVO);
 
+    /**
+     * 获得检测任务分配明细列表
+     *
+     * @param reqVO 分页查询
+     * @return 检测任务分配明细列表
+     */
+    List<BusinessAssayTaskDetailExtendRespVO> getBusinessAssayTaskDetailList(BusinessAssayTaskDetailReqVO reqVO);
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDetailServiceImpl.java

@@ -1,9 +1,7 @@
 package com.zt.plat.module.qms.business.bus.service;
 
 import cn.hutool.core.collection.CollUtil;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailPageReqVO;
+
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailSaveReqVO;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,4 +88,9 @@ public class BusinessAssayTaskDetailServiceImpl implements BusinessAssayTaskDeta
         return businessAssayTaskDetailMapper.selectPage(pageReqVO);
     }
 
+	@Override
+	public List<BusinessAssayTaskDetailExtendRespVO> getBusinessAssayTaskDetailList(BusinessAssayTaskDetailReqVO reqVO) {
+		return businessAssayTaskDetailMapper.selectList(reqVO);
+	}
+
 }