feat:报告数据算法逻辑调整

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

@@ -109,4 +109,8 @@ public class BusinessAssayReportDataDO extends BusinessBaseDO {
     //样品创建时间
     @TableField(exist = false)
     private LocalDateTime baseSampleCreateTime;
+
+    //样品类型key
+    @TableField(exist = false)
+    private String sampleTypeKey;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataPageReqVO.java

@@ -43,4 +43,7 @@ public class ReportDocumentDataPageReqVO extends PageParam {
 
     @Schema(description = "样品大类名称")
     private String baseSampleName;
+
+    @Schema(description = "样品类型key")
+    private String sampleTypeKey;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataRespVO.java

@@ -56,6 +56,10 @@ public class ReportDocumentDataRespVO {
     @ExcelProperty("样品大类名称")
     private String baseSampleName;
 
+    @Schema(description = "样品类型key")
+    @ExcelProperty("样品类型key")
+    private String sampleTypeKey;
+
     //==================扩展字段===========
 
     @Schema(description = "样品创建时间")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataSaveReqVO.java

@@ -40,4 +40,7 @@ public class ReportDocumentDataSaveReqVO {
     @Schema(description = "样品大类名称")
     private String baseSampleName;
 
+    @Schema(description = "样品类型key")
+    private String sampleTypeKey;
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentDataDO.java

@@ -75,7 +75,9 @@ public class ReportDocumentDataDO extends BusinessBaseDO {
     @TableField("BSE_SMP_NAME")
     private String baseSampleName;
 
-
+    //样品类型key
+    @TableField("SMP_TP_KY")
+    private String sampleTypeKey;
 
     //==================扩展字段===========
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java

@@ -108,7 +108,9 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
     public CommonResult<String> execAddDataByEntrust(ReportDocumentMainSaveReqVO reqVO) {
         Long id = reqVO.getId();
         String businessSampleEntrustRegistrationIds = reqVO.getBusinessSampleEntrustRegistrationIds();
-        if(ObjectUtils.isEmpty(businessSampleEntrustRegistrationIds) || id == null)
+        if(id == null)
+            return error(REPORT_DOCUMENT_DATA_NOT_EXISTS.getCode(), "缺少id参数，请刷新后重试");
+        if(ObjectUtils.isEmpty(businessSampleEntrustRegistrationIds))
             return error(REPORT_DOCUMENT_DATA_NOT_EXISTS.getCode(), "缺少businessSampleEntrustRegistrationIds参数，请刷新后重试");
         List<ReportDocumentMainCorrelationDO> reportRelationList = reportDocumentMainCorrelationService.listByMainId(id);
         //todo 判断修改的场景。处理方法：删除reportRelation、ReportDocumentData
@@ -152,6 +154,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
             reportDocumentDataDO.setSampleName(assayReportData.getSampleName());
             reportDocumentDataDO.setBaseSampleName(assayReportData.getBaseSampleName());
             reportDocumentDataDO.setDocumentContent(assayReportData.getAssayData());
+            reportDocumentDataDO.setSampleTypeKey(assayReportData.getSampleTypeKey());
             insertList.add(reportDocumentDataDO);
         }
         if(!insertList.isEmpty())

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

@@ -30,7 +30,8 @@
         d.DELETED as deleted,
         s.CREATE_TIME as baseSampleCreateTime,
         s.SMP_NAME as sampleName,
-        s.BSE_SMP_NAME as baseSampleName
+        s.BSE_SMP_NAME as baseSampleName,
+        (select KY from T_DIC_BSN dic where dic.id = s.DIC_BSN_ID) as sampleTypeKey
         FROM T_BSN_ASY_RPT_DAT d
         inner join T_BSN_BSE_SMP s on d.BSN_BSE_SMP_ID = s.id
         <where>

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustRegistrationMapper.xml

@@ -56,6 +56,7 @@
         m.SYS_DEPT_CD as systemDepartmentCode,
         m.UPD_CNT as updateCount,
         m.RMK as remark,
+        m.CREATE_TIME as createTime,
         es.name as configEntrustSourceName
         FROM T_BSN_SMP_ENTT_REG m
         left join T_CFG_ENTT_SRC es on m.CFG_ENTT_SRC_ID = es.id