申请人-》试验负责人

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;
 
     /**
      * 发起日开始日期

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;
 
     /**
      * 当前状态

src/main/java/com/xujie/sys/modules/erf/dto/ErfSampleCycleReportDto.java

@@ -48,7 +48,7 @@ public class ErfSampleCycleReportDto implements Serializable {
     /**
      * 创建人姓名
      */
-    private String creatorName;
+    private String projectLeader;
 
     /**
      * 期望完成日期（第一步工程师填写）

src/main/java/com/xujie/sys/modules/erf/service/impl/ErfSampleCycleReportServiceImpl.java

@@ -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());
 

src/main/resources/mapper/erf/ErfExpApplyMapper.xml

@@ -301,7 +301,7 @@
         <result column="buDesc" property="buName"/>
         <result column="experiment_type" property="experimentType"/>
         <result column="title" property="title"/>
-        <result column="creator_name" property="creatorName"/>
+        <result column="project_leader" property="projectLeader"/>
         <result column="status" property="status"/>
         <result column="create_time" property="createTime"/>
         <result column="submit_time" property="submitTime"/>
@@ -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 @@
             <if test="data.experimentType != null and data.experimentType != ''">
                 AND a.experiment_type = #{data.experimentType}
             </if>
-            <if test="data.creatorName != null and data.creatorName != ''">
-                AND a.creator_name LIKE '%' + #{data.creatorName} + '%'
+            <if test="data.projectLeader != null and data.projectLeader != ''">
+                AND a.project_leader LIKE '%' + #{data.projectLeader} + '%'
             </if>
             <if test="data.submitStartDate != null">
                 AND CAST(a.submit_time AS DATE) &gt;= #{data.submitStartDate}