Merge branch 'refs/heads/feature-lihb-20250731' into test-merge

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

@@ -0,0 +1,20 @@
+package org.springblade.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author LHB
+ */
+@Data
+public class ThirdReportVo {
+    private Long id;
+    private Long contractId;
+    private String reportNo;
+    private String reportDate;
+    private String projectPositionName;
+    private String detectionResultName;
+
+    @ApiModelProperty(value = "是否关联选择过 0=否 1=是")
+    private Integer isSelectedStatus;
+}

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

@@ -20,9 +20,12 @@ public class TrialCyThirdReportQueryVo {
     @ApiModelProperty("树节点id")
     @NotNull(message = "树节点id不能为空")
     private Long nodeId;
+    private String nodeName;
     @ApiModelProperty("合同段id")
     @NotNull(message = "合同段id不能为空")
     private Long contractId;
+    @ApiModelProperty("质检节点pkeyid")
+    private Long qualityTestPKeyId;
     @ApiModelProperty("类型：0-外委检测,1-第三方")
     private Integer type;
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialCyController.java

@@ -13,6 +13,7 @@ import org.springblade.business.entity.TrialCyTestType;
 import org.springblade.business.entity.TrialCyThirdReport;
 import org.springblade.business.service.TrialCyService;
 import org.springblade.business.service.TrialCyTestTypeService;
+import org.springblade.business.vo.ThirdReportVo;
 import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 import org.springblade.core.tool.api.R;
 import org.springframework.validation.annotation.Validated;
@@ -65,7 +66,7 @@ public class TrialCyController {
     @GetMapping("/getTrialDetectionReport")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取试验检测报告", notes = "")
-    public R<Page<TrialCyFinishTestReport>> getTrialDetectionReport(@Validated TrialCyThirdReportQueryVo queryVo){
+    public R<Page<ThirdReportVo>> getTrialDetectionReport(@Validated TrialCyThirdReportQueryVo queryVo){
         return R.data(trialCyService.getTrialDetectionReport(queryVo));
     }
 
@@ -77,7 +78,7 @@ public class TrialCyController {
     @GetMapping("/getThirdReport")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取第三方/外委 检测报告", notes = "")
-    public R<Page<TrialCyThirdReport>> getThirdReport(@Validated TrialCyThirdReportQueryVo queryVo){
+    public R<Page<ThirdReportVo>> getThirdReport(@Validated TrialCyThirdReportQueryVo queryVo){
         return R.data(trialCyService.getThirdReport(queryVo));
     }
 

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

@@ -1,7 +1,11 @@
 package org.springblade.business.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.TrialCyFinishTestReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.business.vo.ThirdReportVo;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 
 /**
 * @author LHB
@@ -11,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface TrialCyFinishTestReportMapper extends BaseMapper<TrialCyFinishTestReport> {
 
+    Page<ThirdReportVo> myPage(Page<ThirdReportVo> page, @Param("query") TrialCyThirdReportQueryVo queryVo);
 }
 
 

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

@@ -3,4 +3,33 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.business.mapper.TrialCyFinishTestReportMapper">
+    <select id="myPage" resultType="org.springblade.business.vo.ThirdReportVo">
+        select
+            task_id id,
+            contract_id contractId,
+            report_number reportNo,
+            report_date reportDate,
+            position projectPositionName,
+            case
+                when experiment_result = 1 then '合格'
+                else '不合格'
+            end detectionResultName,
+        (select count(0) > 0 from u_trial_file_pdf_record where node_id = #{query.qualityTestPKeyId}  and type = 11 and record_id = t.id) isSelectedStatus
+        from u_trial_cy_finish_test_report t
+        <where>
+            <if test="query.contractId != null">
+                AND contract_id = #{query.contractId}
+            </if>
+            <if test="query.nodeName != null">
+                AND process_name = #{query.nodeName}
+            </if>
+            <if test="query.startTime != null">
+                AND report_date >= #{query.startTime}
+            </if>
+            <if test="query.endTime != null">
+                AND report_date &lt;= #{query.endTime}
+            </if>
+
+        </where>
+    </select>
 </mapper>

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

@@ -1,7 +1,11 @@
 package org.springblade.business.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.TrialCyThirdReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.business.vo.ThirdReportVo;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 
 /**
 * @author LHB
@@ -11,6 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface TrialCyThirdReportMapper extends BaseMapper<TrialCyThirdReport> {
 
+    Page<ThirdReportVo> myPage(Page<ThirdReportVo> page,
+                               @Param("query") TrialCyThirdReportQueryVo queryVo);
 }
 
 

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

@@ -3,4 +3,34 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.business.mapper.TrialCyThirdReportMapper">
+    <select id="myPage" resultType="org.springblade.business.vo.ThirdReportVo">
+        select
+            id,
+            contract_id contractId,
+            report_no reportNo,
+            report_date reportDate,
+            project_part projectPositionName,
+            case when is_qualified = 1 then '合格'
+                else '不合格'
+            end detectionResultName,
+        (select count(0) > 0 from u_trial_file_pdf_record where node_id = #{query.qualityTestPKeyId}  and type in(12,13) and record_id = t.id) isSelectedStatus
+        from u_trial_cy_third_report t
+        <where>
+            <if test="query.contractId != null">
+                AND contract_id = #{query.contractId}
+            </if>
+            <if test="query.type != null">
+                AND `third_type` = #{query.type}
+            </if>
+            <if test="query.startTime != null">
+                AND report_date >= #{query.startTime}
+            </if>
+            <if test="query.endTime != null">
+                AND report_date &lt;= #{query.endTime}
+            </if>
+            <if test="query.nodeName != null">
+                AND sample_name = #{query.nodeName}
+            </if>
+        </where>
+    </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/TrialCyFinishTestReportService.java

@@ -1,7 +1,11 @@
 package org.springblade.business.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.TrialCyFinishTestReport;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.business.vo.ThirdReportVo;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 
 /**
 * @author LHB
@@ -10,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface TrialCyFinishTestReportService extends IService<TrialCyFinishTestReport> {
 
+    Page<ThirdReportVo> myPage(Page<ThirdReportVo> objectPage,
+                               TrialCyThirdReportQueryVo queryVo);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/TrialCyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.business.entity.TrialCyFinishTestReport;
 import org.springblade.business.entity.TrialCyTestType;
 import org.springblade.business.entity.TrialCyThirdReport;
+import org.springblade.business.vo.ThirdReportVo;
 import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 
 import java.util.List;
@@ -16,7 +17,7 @@ public interface TrialCyService {
 
     List<TrialCyTestType> getTree(Long projectId, String parentId);
 
-    Page<TrialCyFinishTestReport> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo);
+    Page<ThirdReportVo> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo);
 
-    Page<TrialCyThirdReport> getThirdReport(TrialCyThirdReportQueryVo queryVo);
+    Page<ThirdReportVo> getThirdReport(TrialCyThirdReportQueryVo queryVo);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/TrialCyThirdReportService.java

@@ -1,7 +1,11 @@
 package org.springblade.business.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.business.entity.TrialCyFinishTestReport;
 import org.springblade.business.entity.TrialCyThirdReport;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.business.vo.ThirdReportVo;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 
 /**
 * @author LHB
@@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface TrialCyThirdReportService extends IService<TrialCyThirdReport> {
 
+    Page<ThirdReportVo> myPage(Page<ThirdReportVo> page, TrialCyThirdReportQueryVo queryVo);
 }

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

@@ -1,9 +1,12 @@
 package org.springblade.business.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.business.entity.TrialCyFinishTestReport;
 import org.springblade.business.service.TrialCyFinishTestReportService;
 import org.springblade.business.mapper.TrialCyFinishTestReportMapper;
+import org.springblade.business.vo.ThirdReportVo;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +18,10 @@ import org.springframework.stereotype.Service;
 public class TrialCyFinishTestReportServiceImpl extends ServiceImpl<TrialCyFinishTestReportMapper, TrialCyFinishTestReport>
     implements TrialCyFinishTestReportService {
 
+    @Override
+    public Page<ThirdReportVo> myPage(Page<ThirdReportVo> page, TrialCyThirdReportQueryVo queryVo) {
+        return baseMapper.myPage(page,queryVo);
+    }
 }
 
 

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

@@ -6,6 +6,7 @@ import org.springblade.business.entity.TrialCyFinishTestReport;
 import org.springblade.business.entity.TrialCyTestType;
 import org.springblade.business.entity.TrialCyThirdReport;
 import org.springblade.business.service.*;
+import org.springblade.business.vo.ThirdReportVo;
 import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.entity.ContractInfo;
@@ -56,31 +57,24 @@ public class TrialCyServiceImpl implements TrialCyService {
     }
 
     @Override
-    public Page<TrialCyFinishTestReport> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo) {
+    public Page<ThirdReportVo> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo) {
         TrialCyTestType byId = trialCyTestTypeService.getById(queryVo.getNodeId());
         if(byId == null){
             return new Page<>();
         }
-        Page<TrialCyFinishTestReport> page = trialCyFinishTestReportService.page(new Page<>(queryVo.getCurrent(), queryVo.getSize()), Wrappers.<TrialCyFinishTestReport>lambdaQuery()
-                .eq(TrialCyFinishTestReport::getContractId, queryVo.getContractId())
-                .ge(StringUtil.isNotBlank(queryVo.getStartTime()), TrialCyFinishTestReport::getReportDate, queryVo.getStartTime())
-                .le(StringUtil.isNotBlank(queryVo.getEndTime()), TrialCyFinishTestReport::getReportDate, queryVo.getEndTime())
-                .eq(TrialCyFinishTestReport::getProcessName, byId.getName()));
+        queryVo.setNodeName(byId.getName());
+        Page<ThirdReportVo> page = trialCyFinishTestReportService.myPage(new Page<ThirdReportVo>(queryVo.getCurrent(), queryVo.getSize()),queryVo);
         return page;
     }
 
     @Override
-    public Page<TrialCyThirdReport> getThirdReport(TrialCyThirdReportQueryVo queryVo) {
+    public Page<ThirdReportVo> getThirdReport(TrialCyThirdReportQueryVo queryVo) {
         TrialCyTestType byId = trialCyTestTypeService.getById(queryVo.getNodeId());
         if(byId == null){
             return new Page<>();
         }
-        Page<TrialCyThirdReport> page = trialCyThirdReportService.page(new Page<>(queryVo.getCurrent(), queryVo.getSize()), Wrappers.<TrialCyThirdReport>lambdaQuery()
-                .eq(TrialCyThirdReport::getContractId, queryVo.getContractId())
-                .eq(queryVo.getType() != null, TrialCyThirdReport::getThirdType, queryVo.getType())
-                .ge(StringUtil.isNotBlank(queryVo.getStartTime()), TrialCyThirdReport::getReportDate, queryVo.getStartTime())
-                .le(StringUtil.isNotBlank(queryVo.getEndTime()), TrialCyThirdReport::getReportDate, queryVo.getEndTime())
-                .eq(TrialCyThirdReport::getSampleName, byId.getName()));
+        queryVo.setNodeName(byId.getName());
+        Page<ThirdReportVo> page = trialCyThirdReportService.myPage(new Page<ThirdReportVo>(queryVo.getCurrent(), queryVo.getSize()), queryVo);
         return page;
     }
 }

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

@@ -1,9 +1,12 @@
 package org.springblade.business.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.business.entity.TrialCyThirdReport;
 import org.springblade.business.service.TrialCyThirdReportService;
 import org.springblade.business.mapper.TrialCyThirdReportMapper;
+import org.springblade.business.vo.ThirdReportVo;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +18,10 @@ import org.springframework.stereotype.Service;
 public class TrialCyThirdReportServiceImpl extends ServiceImpl<TrialCyThirdReportMapper, TrialCyThirdReport>
     implements TrialCyThirdReportService {
 
+    @Override
+    public Page<ThirdReportVo> myPage(Page<ThirdReportVo> page, TrialCyThirdReportQueryVo queryVo) {
+        return baseMapper.myPage(page, queryVo);
+    }
 }
 
 

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

@@ -27,9 +27,7 @@ import org.springblade.business.mapper.EntrustInfoMapper;
 import org.springblade.business.mapper.TrialMaterialMobilizationMapper;
 import org.springblade.business.mapper.TrialSampleInfoMapper;
 import org.springblade.business.mapper.TrialSelfInspectionRecordMapper;
-import org.springblade.business.service.IEntrustInfoService;
-import org.springblade.business.service.ITrialNumberRuleService;
-import org.springblade.business.service.ITrialSelfInspectionRecordService;
+import org.springblade.business.service.*;
 import org.springblade.business.utils.FileUtils;
 import org.springblade.business.utils.FileUtils2;
 import org.springblade.business.utils.StringSPUtils;
@@ -100,6 +98,8 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
     private final TrialDetectionDataServiceImpl trialDetectionDataService;
     private final IEntrustInfoService entrustInfoService;
     private final ITrialNumberRuleService trialNumberRuleService;
+    private final TrialCyThirdReportService trialCyThirdReportService;
+    private final TrialCyFinishTestReportService trialCyFinishTestReportService;
 
     @Override
     public IPage<TrialSelfInspectionRecordVO> selfPage(IPage<TrialSelfInspectionRecord> page, TrialSelfInspectionRecordPageDTO dto) throws FileNotFoundException {
@@ -1975,12 +1975,11 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             if (informationQuery != null) {
                 List<String> pdfList = new ArrayList<>();
                 //------自检------
+                if (informationQuery.getPdfTrialUrl() != null) {
+                    //如果当前存在第三方、外委的pdf，那么拼接
+                    pdfList.add(informationQuery.getPdfTrialUrl());
+                }
                 if (dto.getType().equals(1)) {
-                    if (informationQuery.getPdfTrialUrl() != null) {
-                        //如果当前存在第三方、外委的pdf，那么拼接
-                        pdfList.add(informationQuery.getPdfTrialUrl());
-                    }
-
                     //自检pdf
                     List<TrialSelfInspectionRecord> trialSelfInspectionRecords = baseMapper.selectList(Wrappers.<TrialSelfInspectionRecord>lambdaQuery()
                             .select(TrialSelfInspectionRecord::getPdfUrl,TrialSelfInspectionRecord::getContractId,TrialSelfInspectionRecord::getId,TrialSelfInspectionRecord::getType)
@@ -1995,11 +1994,6 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
 //                    pdfList.addAll(pdfURLs);
                     //------第三方、外委------
                 } else if (dto.getType().equals(2) || dto.getType().equals(3)) {
-                    if (informationQuery.getPdfTrialUrl() != null) {
-                        //如果当前存在试验自检的pdf，那么拼接
-                        pdfList.add(informationQuery.getPdfTrialUrl());
-                    }
-
                     //第三方、外委pdf
                     List<TrialDetectionData> trialDetectionData = trialDetectionDataService.getBaseMapper().selectList(Wrappers.<TrialDetectionData>lambdaQuery().in(TrialDetectionData::getId, Func.toLongList(dto.getIds())));
                     List<String> pdfURLs = new ArrayList<>();
@@ -2014,6 +2008,17 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
                     pdfList.addAll(pdfURLs);
                 }
 
+                //成渝自检
+                if (dto.getType().equals(11)){
+                    List<TrialCyFinishTestReport> trialCyFinishTestReports = trialCyFinishTestReportService.getBaseMapper().selectList(Wrappers.<TrialCyFinishTestReport>lambdaQuery().in(TrialCyFinishTestReport::getTaskId, Func.toLongList(dto.getIds())));
+                    List<String> collect = trialCyFinishTestReports.stream().map(TrialCyFinishTestReport::getReportFilePath).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+                    pdfList.addAll(collect);
+                }else if(dto.getType().equals(12) || dto.getType().equals(13)){
+                    List<TrialCyThirdReport> trialCyThirdReports = trialCyThirdReportService.getBaseMapper().selectList(Wrappers.<TrialCyThirdReport>lambdaQuery().in(TrialCyThirdReport::getId, Func.toLongList(dto.getIds())));
+                    List<String> collect = trialCyThirdReports.stream().map(TrialCyThirdReport::getReportDocFilePath).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+                    pdfList.addAll(collect);
+                }
+
                 if (pdfList.size() > 0) {
                     //合并试验自检、第三方、外委的pdf
                     List<String> collect = pdfList.stream().filter(Objects::nonNull).collect(Collectors.toList());