From a230f6653b7c87c3529bd5640886c22d688509c4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 26 五月 2025 14:37:48 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/resources/mapper/system/TQaReportFileMapper.xml | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/model/TQaReportFile.java | 4 ++++
ruoyi-system/src/main/java/com/ruoyi/system/model/TFeasibilityReportFile.java | 4 ++++
ruoyi-system/src/main/resources/mapper/system/TFeasibilityReportFileMapper.xml | 3 ++-
ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml | 12 +++++++++---
ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java | 3 +++
8 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
index 3ed222b..bdf9a2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
@@ -116,6 +116,7 @@
TQaProduceReportDTO dto = JSON.parseObject(param,TQaProduceReportDTO.class);
// 通过当前用户查询项目组
Long userId = tokenService.getLoginUser().getUserId();
+ String nickName = tokenService.getLoginUser().getUser().getNickName();
TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId)
.last("LIMIT 1"));
@@ -149,6 +150,7 @@
.like(TQaProduceReport::getReportCode, reportCode));
reportCode = reportCode + "-" + String.format("%03d", count+1);
dto.setReportCode(reportCode);
+ dto.setDevelopPerson(nickName);
qaProduceReportService.save(dto);
// 添加检测报告文件
List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFeasibilityReportFile.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFeasibilityReportFile.java
index 163966e..14d27e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFeasibilityReportFile.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFeasibilityReportFile.java
@@ -40,6 +40,10 @@
@TableField("file_name")
private String fileName;
+ @ApiModelProperty(value = "文件地址")
+ @TableField("file_url")
+ private String fileUrl;
+
@ApiModelProperty(value = "文件大小")
@TableField("file_size")
private Double fileSize;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java
index 9d37d1d..a2fbc2b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java
@@ -65,7 +65,7 @@
@TableField("report_type")
private Integer reportType;
- @ApiModelProperty(value = "审批人")
+ @ApiModelProperty(value = "审批人id")
@TableField("audit_person_id")
private Long auditPersonId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaReportFile.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaReportFile.java
index e1792ad..d5d5db6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaReportFile.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaReportFile.java
@@ -40,6 +40,10 @@
@TableField("file_name")
private String fileName;
+ @ApiModelProperty(value = "文件地址")
+ @TableField("file_url")
+ private String fileUrl;
+
@ApiModelProperty(value = "文件大小")
@TableField("file_size")
private Double fileSize;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java
index 44d458a..c53f387 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java
@@ -20,6 +20,9 @@
@ApiModelProperty(value = "报告编号")
private String reportCode;
+ @ApiModelProperty(value = "报告类型 1=中试 2=辅料 3=产品报告")
+ private Integer reportType;
+
@ApiModelProperty(value = "状态 -1=草稿箱 1=待审核 2=已通过待评定 3=已评定 4=已驳回 5=已撤销 ")
private Integer status;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFeasibilityReportFileMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFeasibilityReportFileMapper.xml
index 07769ba..7963730 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFeasibilityReportFileMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFeasibilityReportFileMapper.xml
@@ -8,6 +8,7 @@
<result column="report_id" property="reportId" />
<result column="file_name" property="fileName" />
<result column="file_size" property="fileSize" />
+ <result column="file_url" property="fileUrl" />
<result column="status" property="status" />
<result column="report_type" property="reportType" />
<result column="create_time" property="createTime" />
@@ -16,7 +17,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, report_id, file_name, file_size, status, report_type, create_time, create_by
+ id, report_id, file_name,file_url, file_size, status, report_type, create_time, create_by
</sql>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml
index 2ab248c..a76908c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml
@@ -47,17 +47,20 @@
<if test="query.teamName != null and query.teamName != ''">
and tpt.team_name like concat('%', #{query.teamName}, '%')
</if>
+ <if test="query.reportType != null">
+ and tqpr.report_type = #{query.reportType}
+ </if>
<if test="query.status != null">
and tqpr.status = #{query.status}
- </if>
- <if test="query.status == null">
- and tqpr.status != -1
</if>
<if test="query.teamIds != null and query.teamIds.size() > 0">
and tqpr.team_id in
<foreach collection="query.teamIds" item="teamId" open="(" separator="," close=")">
#{teamId}
</foreach>
+ </if>
+ <if test="query.status == null">
+ and tqpr.status != -1
</if>
AND tqpr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
@@ -80,6 +83,9 @@
<if test="query.teamName != null and query.teamName != ''">
and tpt.team_name like concat('%', #{query.teamName}, '%')
</if>
+ <if test="query.reportType != null">
+ and tqpr.report_type = #{query.reportType}
+ </if>
<if test="query.status != null">
and tqpr.status = #{query.status}
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQaReportFileMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQaReportFileMapper.xml
index a4f915f..a17e47d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TQaReportFileMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TQaReportFileMapper.xml
@@ -8,6 +8,7 @@
<result column="report_id" property="reportId" />
<result column="file_name" property="fileName" />
<result column="file_size" property="fileSize" />
+ <result column="file_url" property="fileUrl" />
<result column="status" property="status" />
<result column="report_type" property="reportType" />
<result column="create_time" property="createTime" />
@@ -16,7 +17,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, report_id, file_name, file_size, status, report_type, create_time, create_by
+ id, report_id, file_name, file_size,file_url, status, report_type, create_time, create_by
</sql>
</mapper>
--
Gitblit v1.7.1