试验-接入成渝第三方接口开发

1、查询第三方/外委的时候过滤掉已删除的

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -17,17 +18,20 @@ public class TrialCyAccessories {
     /**
      * 主键
      */
+    @ApiModelProperty("唯一id")
     @TableId(type = IdType.INPUT)
     private Long id;
 
     /**
      * 报告id，已签章的报告/是第三方检测报告/外委检测报告/上传报告
      */
+    @ApiModelProperty("报告id，已签章的报告/ 是第三方检测报告/ 外委检测报告/ 上传报告")
     private Long reportId;
 
     /**
      * 成渝接口返回的id
      */
+    @ApiModelProperty("成渝接口返回的")
     @TableField("acc_id")
     private String AccID;
 
@@ -35,18 +39,21 @@ public class TrialCyAccessories {
      * 类型名称
      */
 
+    @ApiModelProperty("类型名称")
     @TableField("acc_type")
     private String AccType;
 
     /**
      * 文件名称
      */
+    @ApiModelProperty("文件名称")
     @TableField("file_name")
     private String FileName;
 
     /**
      * 文件路径
      */
+    @ApiModelProperty("文件路径")
     @TableField("file_path")
     private String FilePath;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -18,19 +19,23 @@ import java.util.List;
 public class TrialCyFinishTestReport {
 
     @TableId(type = IdType.INPUT)
+    @ApiModelProperty("唯一id")
     private Long id;
     /**
      * 合同ID
      */
     @TableField("contract_id")
+    @ApiModelProperty("合同ID")
     private Long contractId;
     /**
      * 任务ID
      */
+    @ApiModelProperty("任务ID")
     private Integer taskId;
     /**
      * 合同段编码
      */
+    @ApiModelProperty("合同段编码")
     private String contractNumber;
     /**
      * 单位类型
@@ -38,78 +43,95 @@ public class TrialCyFinishTestReport {
      * 1 监理
      * 2 中试
      */
+    @ApiModelProperty("单位类型 0 施工 1 监理 2 中试")
     private Integer cs;
     /**
      * 记录编号
      */
+    @ApiModelProperty("记录编号")
     private String number;
     /**
      * 报告编号
      */
+    @ApiModelProperty("报告编号")
     private String reportNumber;
     /**
      * 试验项目名称
      */
+    @ApiModelProperty("试验项目名称")
     private String name;
     /**
      * 试验工序名称
      */
+    @ApiModelProperty("试验工序名称")
     private String processName;
     /**
      * 取样地点
      */
+    @ApiModelProperty("取样地点")
     @TableField("sampling_place")
     private String SamplingPlace;
     /**
      * 样品信息 同试验检测查询界面
      */
+    @ApiModelProperty("样品信息 同试验检测查询界面")
     @TableField("sample_info")
     private String SampleInfo;
     /**
      * 类型规格 规格型号
      */
+    @ApiModelProperty("类型规格 规格型号")
     @TableField("specification")
     private String Specification;
     /**
      * 合格证上传情况 已上传、未上传
      */
+    @ApiModelProperty("合格证上传情况 已上传、未上传")
     @TableField("hash_gz")
     private String HasHGZ;
     /**
      * 所检参数信息 同试验检测查询界面
      */
+    @ApiModelProperty("所检参数信息 同试验检测查询界面")
     @TableField("test_param_info")
     private String TestParamInfo;
     /**
      * 报告时间
      */
+    @ApiModelProperty("报告时间")
     private String reportDate;
     /**
      * 是否合格 True 合格，False不合格
      */
+    @ApiModelProperty("是否合格 1 合格，0 不合格")
     private String experimentResult;
     /**
      * 报告人
      */
+    @ApiModelProperty("报告人")
     @TableField("user_name")
     private String username;
     /**
      * 使用部位
      */
+    @ApiModelProperty("使用部位")
     private String position;
     /**
      * 报告文件路径
      */
+    @ApiModelProperty("报告文件路径")
     @TableField("report_file_path")
     private String ReportFilePath;
     /**
      * 记录文件路径
      */
+    @ApiModelProperty("记录文件路径")
     @TableField("record_file_path")
     private String RecordFilePath;
     /**
      * 附件
      */
+    @ApiModelProperty("附件")
     @TableField(exist = false)
     private List<TrialCyAccessories> Accessories;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,29 +16,35 @@ import lombok.Data;
 @Data
 public class TrialCyTestType {
     @TableId(type = IdType.INPUT)
+    @ApiModelProperty("唯一id")
     private Long pKeyId;
     /**
      * 项目id
      */
+    @ApiModelProperty("项目id")
     private Long projectId;
     /**
      * ID唯一标识
      */
     @TableField("id")
+    @ApiModelProperty("成渝的id")
     private String ID;
     /**
      * 名称
      */
     @TableField("name")
+    @ApiModelProperty("名称")
     private String Name;
     /**
      * 父级ID
      */
     @TableField("father_id")
+    @ApiModelProperty("父级id")
     private String FatherID;
     /**
      * 顺序号
      */
     @TableField("order_index")
+    @ApiModelProperty("顺序号")
     private String OrderIndex;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -16,184 +17,221 @@ import java.util.List;
 @TableName("u_trial_cy_third_report")
 @Data
 public class TrialCyThirdReport {
+    @ApiModelProperty("唯一id")
     @TableId(type = IdType.INPUT)
     private Long pKeyId;
     /**
      * 合同id
      */
+    @ApiModelProperty("合同id")
     private Long contractId;
     /**
      * ID
      */
+    @ApiModelProperty("成渝的id")
     @TableField("id")
     public String ID;
     /**
      * 报告类型（0:外委检测，1:第三方检测，2:扫描上传报告）
      */
+    @ApiModelProperty("报告类型（0:外委检测，1:第三方检测，2:扫描上传报告）")
     public Integer thirdType;
     /**
      * 委托编号
      */
+    @ApiModelProperty("委托编号")
     @TableField("consign_no")
     public String ConsignNo;
     /**
      * 报告编号
      */
+    @ApiModelProperty("报告编号")
     @TableField("report_no")
     public String ReportNo;
     /**
      * 取样时间 格式如：“2022-06-21”
      */
+    @ApiModelProperty("取样时间 格式如：“2022-06-21”")
     @TableField("take_sampling_date")
     public String TakeSamplingDate;
     /**
      * 送样时间 格式如：“2022-06-21”
      */
+    @ApiModelProperty("送样时间 格式如：“2022-06-21”")
     @TableField("send_sample_date")
     public String SendSampleDate;
     /**
      * 检测时间 格式如：“2022-06-21”
      */
+    @ApiModelProperty("检测时间 格式如：“2022-06-21”")
     @TableField("test_date")
     public String TestDate;
     /**
      * 报告时间 格式如：“2022-06-21”
      */
+    @ApiModelProperty("报告时间 格式如：“2022-06-21”")
     @TableField("report_date")
     public String ReportDate;
     /**
      * 委托单位
      */
+    @ApiModelProperty("委托单位")
     @TableField("consign_unit")
     public String ConsignUnit;
     /**
      * 检测机构
      */
+    @ApiModelProperty("检测机构")
     @TableField("accept_test_unit")
     public String AcceptTestUnit;
     /**
      * 送样人
      */
+    @ApiModelProperty("送样人")
     @TableField("send_sample_person")
     public String SendSamplePerson;
     /**
      * 接样人
      */
+    @ApiModelProperty("接样人")
     @TableField("witness_person")
     public String WitnessPerson;
     /**
      * 工程部位
      */
+    @ApiModelProperty("工程部位")
     @TableField("project_part")
     public String ProjectPart;
     /**
      * 取样地点
      */
+    @ApiModelProperty("取样地点")
     @TableField("sampling_place")
     public String SamplingPlace;
     /**
      * 样品名称
      */
+    @ApiModelProperty("样品名称")
     @TableField("sample_name")
     public String SampleName;
     /**
      * 委托单文件下载地址
      */
+    @ApiModelProperty("委托单文件下载地址")
     @TableField("consign_doc_file_path")
     public String ConsignDocFilePath;
     /**
      * 记录单文件下载地址
      */
+    @ApiModelProperty("记录单文件下载地址")
     @TableField("record_doc_file_path")
     public String RecordDocFilePath;
     /**
      * 报告单文件下载地址
      */
+    @ApiModelProperty("报告单文件下载地址")
     @TableField("report_doc_file_path")
     public String ReportDocFilePath;
     /**
      * 检测依据
      */
+    @ApiModelProperty("检测依据")
     @TableField("test_standard")
     public String TestStandard;
     /**
      * 评定标准
      */
+    @ApiModelProperty("评定标准")
     @TableField("assess_standard")
     public String AssessStandard;
     /**
      * 检测结论
      */
+    @ApiModelProperty("检测结论")
     @TableField("test_conclusion")
     public String TestConclusion;
     /**
      * 备注
      */
+    @ApiModelProperty("备注")
     @TableField("memo")
     public String Memo;
     /**
      * 期数
      */
+    @ApiModelProperty("期数")
     @TableField("period_num")
     public String PeriodNum;
     /**
      * 是否合格
      */
+    @ApiModelProperty("是否合格：1 合格， 0 不合格")
     @TableField("is_qualified")
     public String IsQualified;
     /**
      * 样品编号
      */
+    @ApiModelProperty("样品编号")
     @TableField("sample_code")
     public String SampleCode;
     /**
      * 规格型号
      */
+    @ApiModelProperty("规格型号")
     @TableField("gui_ge_xing_hao")
     public String GuiGeXingHao;
     /**
      * 生产厂家
      */
+    @ApiModelProperty("生产厂家")
     @TableField("sheng_chan_cj")
     public String ShengChanCJ;
     /**
      * 产地
      */
+    @ApiModelProperty("产地")
     @TableField("chan_di")
     public String ChanDi;
     /**
      * 样品数量
      */
+    @ApiModelProperty("样品数量")
     @TableField("sample_num")
     public String SampleNum;
     /**
      * 检测机构资质证书编号
      */
+    @ApiModelProperty("检测机构资质证书编号")
     @TableField("consign_unit_ability")
     public String ConsignUnitAbility;
     /**
      * 批号
      */
+    @ApiModelProperty("批号")
     @TableField("batch_num")
     public String BatchNum;
     /**
      * 代表数量
      */
+    @ApiModelProperty("代表数量")
     @TableField("quantity")
     public String Quantity;
     /**
      * 单位
      */
+    @ApiModelProperty("单位")
     @TableField("unit")
     public String Unit;
     /**
      * 类型ID
      */
+    @ApiModelProperty("类型ID")
     @TableField("consign_test_cls_id")
     public String ConsignTestClsID;
     /**
      * 结论
      */
+    @ApiModelProperty("结论")
     @TableField("result")
     public String Result;
     /**
@@ -202,11 +240,13 @@ public class TrialCyThirdReport {
      * 0：未删除
      * 1：已删除
      */
+    @ApiModelProperty("是否已删除 0：未删除 1：已删除")
     @TableField("is_deleted")
     public String IsDeleted;
     /**
      * 删除时间
      */
+    @ApiModelProperty("删除时间")
     @TableField("delete_time")
     public String DeleteTime;
     /**
@@ -214,17 +254,20 @@ public class TrialCyThirdReport {
      * 1 快报
      * 2 正式报告
      */
+    @ApiModelProperty("快报/ 正式报告 1 快报 2 正式报告")
     @TableField("report_type")
     public Integer ReportType;
     /**
      * 创建时间 格式如：“2022-06-21 13:44:33 235”
      */
+    @ApiModelProperty("创建时间 格式如：“2022-06-21 13:44:33 235”")
     @TableField("create_time")
     public String CreateTime;
 
     /**
      * 附件
      */
+    @ApiModelProperty("附件")
     @TableField(exist = false)
     private List<TrialCyAccessories> Accessories;
 }

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

@@ -0,0 +1,29 @@
+package org.springblade.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 接口查询条件对象
+ * @author LHB
+ */
+@Data
+public class TrialCyThirdReportQueryVo {
+    private Integer current;
+    private Integer size;
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    @ApiModelProperty("结束时间")
+    private String endTime;
+    @ApiModelProperty("树节点id")
+    @NotNull(message = "树节点id不能为空")
+    private Long nodeId;
+    @ApiModelProperty("合同段id")
+    @NotNull(message = "合同段id不能为空")
+    private Long contractId;
+    @ApiModelProperty("类型：0-外委检测,1-第三方")
+    private Integer type;
+
+}

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

@@ -1,5 +1,6 @@
 package org.springblade.business.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -12,9 +13,12 @@ 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.TrialCyThirdReportQueryVo;
 import org.springblade.core.tool.api.R;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -61,12 +65,8 @@ public class TrialCyController {
     @GetMapping("/getTrialDetectionReport")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取试验检测报告", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "contractId", value = "合同段id", required = true),
-            @ApiImplicitParam(name = "pKeyId", value = "树节点pKeyId", required = true)
-    })
-    public R<List<TrialCyFinishTestReport>> getTrialDetectionReport(Long contractId, Long pKeyId){
-        return R.data(trialCyService.getTrialDetectionReport(contractId,pKeyId));
+    public R<Page<TrialCyFinishTestReport>> getTrialDetectionReport(@Validated TrialCyThirdReportQueryVo queryVo){
+        return R.data(trialCyService.getTrialDetectionReport(queryVo));
     }
 
 
@@ -77,13 +77,8 @@ public class TrialCyController {
     @GetMapping("/getThirdReport")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取第三方/外委 检测报告", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "contractId", value = "合同段id", required = true),
-            @ApiImplicitParam(name = "pKeyId", value = "树节点pKeyId", required = true),
-            @ApiImplicitParam(name = "type", value = "类型：0-外委检测,1-第三方", required = true)
-    })
-    public R<List<TrialCyThirdReport>> getThirdReport(Long contractId, Long pKeyId, Integer type){
-        return R.data(trialCyService.getThirdReport(contractId,pKeyId,type));
+    public R<Page<TrialCyThirdReport>> getThirdReport(@Validated TrialCyThirdReportQueryVo queryVo){
+        return R.data(trialCyService.getThirdReport(queryVo));
     }
 
 

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

@@ -1,8 +1,10 @@
 package org.springblade.business.service;
 
+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.TrialCyThirdReportQueryVo;
 
 import java.util.List;
 
@@ -14,7 +16,7 @@ public interface TrialCyService {
 
     List<TrialCyTestType> getTree(Long projectId, String parentId);
 
-    List<TrialCyFinishTestReport> getTrialDetectionReport(Long contractId, Long pKeyId);
+    Page<TrialCyFinishTestReport> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo);
 
-    List<TrialCyThirdReport> getThirdReport(Long contractId, Long pKeyId, Integer type);
+    Page<TrialCyThirdReport> getThirdReport(TrialCyThirdReportQueryVo queryVo);
 }

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

@@ -1,10 +1,13 @@
 package org.springblade.business.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.service.*;
+import org.springblade.business.vo.TrialCyThirdReportQueryVo;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.feign.ContractClient;
@@ -17,6 +20,7 @@ import java.util.List;
 
 /**
  * 成渝数据获取
+ *
  * @author LHB
  */
 @Service
@@ -38,7 +42,7 @@ public class TrialCyServiceImpl implements TrialCyService {
     @Override
     public Boolean isCyAndTestModule(Long projectId, Long contractId) {
         ProjectInfo byId = projectClient.getById(String.valueOf(projectId));
-        if(!"cqcyfx".equals(byId.getProjectNumber())){
+        if (!"cqcyfx".equals(byId.getProjectNumber())) {
             return false;
         }
         ContractInfo contractById = contractClient.getContractById(contractId);
@@ -50,26 +54,37 @@ public class TrialCyServiceImpl implements TrialCyService {
         List<TrialCyTestType> list = trialCyTestTypeService.list(Wrappers.<TrialCyTestType>lambdaQuery()
                 .eq(TrialCyTestType::getProjectId, projectId)
                 .eq(TrialCyTestType::getFatherID, parentId)
+                .orderByAsc(TrialCyTestType::getOrderIndex)
         );
         return list;
     }
 
     @Override
-    public List<TrialCyFinishTestReport> getTrialDetectionReport(Long contractId, Long pKeyId) {
-        TrialCyTestType byId = trialCyTestTypeService.getById(pKeyId);
-
-        return trialCyFinishTestReportService.list(Wrappers.<TrialCyFinishTestReport>lambdaQuery()
-                .eq(TrialCyFinishTestReport::getContractId, contractId)
+    public Page<TrialCyFinishTestReport> 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()));
+        return page;
     }
 
     @Override
-    public List<TrialCyThirdReport> getThirdReport(Long contractId, Long pKeyId, Integer type) {
-        TrialCyTestType byId = trialCyTestTypeService.getById(pKeyId);
-        return trialCyThirdReportService.list(Wrappers.<TrialCyThirdReport>lambdaQuery()
-                .eq(TrialCyThirdReport::getContractId, contractId)
-                .eq(TrialCyThirdReport::getThirdType, type)
-                .eq(TrialCyThirdReport::getIsDeleted, 0)
+    public Page<TrialCyThirdReport> 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()));
+        return page;
     }
 }