diff --git a/src/main/java/com/xujie/sys/modules/erf/data/ErfApprovalCycleQueryData.java b/src/main/java/com/xujie/sys/modules/erf/data/ErfApprovalCycleQueryData.java
index c9aeb11a..5cdd1f72 100644
--- a/src/main/java/com/xujie/sys/modules/erf/data/ErfApprovalCycleQueryData.java
+++ b/src/main/java/com/xujie/sys/modules/erf/data/ErfApprovalCycleQueryData.java
@@ -35,7 +35,7 @@ public class ErfApprovalCycleQueryData implements Serializable {
/**
* 创建人姓名(模糊查询)
*/
- private String creatorName;
+ private String projectLeader;
/**
* 发起日开始日期
diff --git a/src/main/java/com/xujie/sys/modules/erf/dto/ErfApprovalCycleReportDto.java b/src/main/java/com/xujie/sys/modules/erf/dto/ErfApprovalCycleReportDto.java
index ed783533..67372f2b 100644
--- a/src/main/java/com/xujie/sys/modules/erf/dto/ErfApprovalCycleReportDto.java
+++ b/src/main/java/com/xujie/sys/modules/erf/dto/ErfApprovalCycleReportDto.java
@@ -57,7 +57,7 @@ public class ErfApprovalCycleReportDto implements Serializable {
/**
* 创建人姓名
*/
- private String creatorName;
+ private String projectLeader;
/**
* 当前状态
diff --git a/src/main/java/com/xujie/sys/modules/erf/dto/ErfSampleCycleReportDto.java b/src/main/java/com/xujie/sys/modules/erf/dto/ErfSampleCycleReportDto.java
index 7d606d6b..417fc2b5 100644
--- a/src/main/java/com/xujie/sys/modules/erf/dto/ErfSampleCycleReportDto.java
+++ b/src/main/java/com/xujie/sys/modules/erf/dto/ErfSampleCycleReportDto.java
@@ -10,9 +10,9 @@ import java.util.Date;
/**
* 样品完成周期报表DTO
- *
+ *
*
用途:对比期望完成时间和实际完成时间,统计样品生产周期
- *
+ *
* @author System
* @since 2026-02-12
*/
@@ -48,7 +48,7 @@ public class ErfSampleCycleReportDto implements Serializable {
/**
* 创建人姓名
*/
- private String creatorName;
+ private String projectLeader;
/**
* 期望完成日期(第一步工程师填写)
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfSampleCycleReportServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfSampleCycleReportServiceImpl.java
index 3b0d5061..56c07ea1 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfSampleCycleReportServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfSampleCycleReportServiceImpl.java
@@ -19,14 +19,14 @@ import java.util.stream.Collectors;
/**
* 样品完成周期报表服务实现类
- *
+ *
* 核心功能:
*
* - 对比期望完成时间和实际完成时间
* - 计算周期差异(提前/准时/延期)
* - 统计样品状态和数量
*
- *
+ *
* @author System
* @since 2026-02-12
*/
@@ -72,7 +72,7 @@ public class ErfSampleCycleReportServiceImpl implements ErfSampleCycleReportServ
/**
* 转换为报表DTO
- *
+ *
* @param data 试验单数据
* @return 报表DTO
*/
@@ -85,7 +85,7 @@ public class ErfSampleCycleReportServiceImpl implements ErfSampleCycleReportServ
dto.setExperimentType(data.getExperimentType());
dto.setBuNo(data.getBuNo());
dto.setBuName(data.getBuDesc());
- dto.setCreatorName(data.getCreatorName());
+ dto.setProjectLeader(data.getProjectLeader());
dto.setStatus(data.getStatus());
dto.setCreateTime(data.getCreateTime());
@@ -97,11 +97,11 @@ public class ErfSampleCycleReportServiceImpl implements ErfSampleCycleReportServ
if (data.getExpectedFinishDate() != null && data.getActualFinishDate() != null) {
LocalDate expectedDate = convertToLocalDate(data.getExpectedFinishDate());
LocalDate actualDate = convertToLocalDate(data.getActualFinishDate());
-
+
// 计算天数差异(实际 - 期望)
long daysDiff = ChronoUnit.DAYS.between(expectedDate, actualDate);
dto.setCycleDifference((int) daysDiff);
-
+
// 判断是否延期
dto.setIsDelayed(daysDiff > 0);
}
@@ -109,7 +109,7 @@ public class ErfSampleCycleReportServiceImpl implements ErfSampleCycleReportServ
// 样品状态和数量
dto.setFinalStatus(data.getFinalStatus());
dto.setFinalQuantity(data.getFinalQuantity());
-
+
// 样品状态描述
if ("NORMAL".equals(data.getFinalStatus())) {
dto.setFinalStatusDesc("正常入库");
@@ -124,7 +124,7 @@ public class ErfSampleCycleReportServiceImpl implements ErfSampleCycleReportServ
/**
* 将Date转换为LocalDate
- *
+ *
* @param date Date对象
* @return LocalDate对象
*/
diff --git a/src/main/resources/mapper/erf/ErfExpApplyMapper.xml b/src/main/resources/mapper/erf/ErfExpApplyMapper.xml
index d70dd54f..85b7ebe9 100644
--- a/src/main/resources/mapper/erf/ErfExpApplyMapper.xml
+++ b/src/main/resources/mapper/erf/ErfExpApplyMapper.xml
@@ -301,7 +301,7 @@
-
+
@@ -322,7 +322,7 @@
dbo.get_bu_desc(a.site, a.bu_no) AS buDesc,
a.experiment_type,
a.title,
- a.creator_name,
+ a.project_leader,
a.status,
a.create_time,
a.submit_time,
@@ -420,8 +420,8 @@
AND a.experiment_type = #{data.experimentType}
-
- AND a.creator_name LIKE '%' + #{data.creatorName} + '%'
+
+ AND a.project_leader LIKE '%' + #{data.projectLeader} + '%'
AND CAST(a.submit_time AS DATE) >= #{data.submitStartDate}