Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialCyFinishTestReport.java

@@ -128,6 +128,12 @@ public class TrialCyFinishTestReport {
     @ApiModelProperty("记录文件路径")
     @TableField("record_file_path")
     private String recordFilePath;
+    /**
+     * 试验树id
+     */
+    @ApiModelProperty("实验树Id")
+    @TableField("exam_name_info_id")
+    public String examNameInfoId;
     /**
      * 附件
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialCyThirdReport.java

@@ -263,6 +263,12 @@ public class TrialCyThirdReport {
     @ApiModelProperty("创建时间 格式如：“2022-06-21 13:44:33 235”")
     @TableField("create_time")
     public String createTime;
+    /**
+     * 试验树id
+     */
+    @ApiModelProperty("实验树Id")
+    @TableField("exam_name_info_id")
+    public String examNameInfoId;
 
     /**
      * 附件

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TrialCyThirdReportQueryVo.java

@@ -20,7 +20,6 @@ public class TrialCyThirdReportQueryVo {
     @ApiModelProperty("树节点id")
     @NotNull(message = "树节点id不能为空")
     private Long nodeId;
-    private String nodeName;
     @ApiModelProperty("合同段id")
     @NotNull(message = "合同段id不能为空")
     private Long contractId;

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialCyFinishTestReportMapper.xml

@@ -20,8 +20,8 @@
             <if test="query.contractId != null">
                 AND contract_id = #{query.contractId}
             </if>
-            <if test="query.nodeName != null">
-                AND process_name = #{query.nodeName}
+            <if test="query.nodeId != null">
+                AND exam_name_info_id = #{query.nodeId}
             </if>
             <if test="query.startTime != null">
                 AND report_date >= #{query.startTime}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialCyThirdReportMapper.xml

@@ -28,8 +28,8 @@
             <if test="query.endTime != null">
                 AND report_date &lt;= #{query.endTime}
             </if>
-            <if test="query.nodeName != null">
-                AND sample_name = #{query.nodeName}
+            <if test="query.nodeId != null">
+                AND exam_name_info_id = #{query.nodeId}
             </if>
         </where>
     </select>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialCyServiceImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.business.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.business.entity.TrialCyFinishTestReport;
@@ -59,10 +60,10 @@ public class TrialCyServiceImpl implements TrialCyService {
     @Override
     public Page<ThirdReportVo> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo) {
         TrialCyTestType byId = trialCyTestTypeService.getById(queryVo.getNodeId());
-        if(byId == null){
+        if(StringUtils.isBlank(byId.getId())){
             return new Page<>();
         }
-        queryVo.setNodeName(byId.getName());
+        queryVo.setNodeId(Long.valueOf(byId.getId()));
         Page<ThirdReportVo> page = trialCyFinishTestReportService.myPage(new Page<ThirdReportVo>(queryVo.getCurrent(), queryVo.getSize()),queryVo);
         return page;
     }
@@ -70,10 +71,10 @@ public class TrialCyServiceImpl implements TrialCyService {
     @Override
     public Page<ThirdReportVo> getThirdReport(TrialCyThirdReportQueryVo queryVo) {
         TrialCyTestType byId = trialCyTestTypeService.getById(queryVo.getNodeId());
-        if(byId == null){
+        if(StringUtils.isBlank(byId.getId())){
             return new Page<>();
         }
-        queryVo.setNodeName(byId.getName());
+        queryVo.setNodeId(Long.valueOf(byId.getId()));
         Page<ThirdReportVo> page = trialCyThirdReportService.myPage(new Page<ThirdReportVo>(queryVo.getCurrent(), queryVo.getSize()), queryVo);
         return page;
     }