diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java index f111dd07..992005ef 100644 --- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfApprovalReminderServiceImpl.java @@ -1016,14 +1016,14 @@ public class ErfApprovalReminderServiceImpl implements ErfApprovalReminderServic + "事业部" + "试验名称" + "试验类型" - + "申请人" + + "试验负责人" + "下达时间" + "" + "" + apply.getApplyNo() + "" + "" + nvl(apply.getBuNo()) + "" + "" + nvl(apply.getTitle()) + "" + "" + nvl(apply.getExperimentType()) + "" - + "" + nvl(apply.getCreatorName()) + "" + + "" + nvl(apply.getProjectLeader()) + "" + "" + submitTimeStr + "" + ""; } diff --git a/src/main/resources/mapper/erf/ErfExpApplyMapper.xml b/src/main/resources/mapper/erf/ErfExpApplyMapper.xml index dc14e11c..d70dd54f 100644 --- a/src/main/resources/mapper/erf/ErfExpApplyMapper.xml +++ b/src/main/resources/mapper/erf/ErfExpApplyMapper.xml @@ -103,8 +103,8 @@ AND product_type LIKE '%' + #{data.productType} + '%' - - AND creator_name LIKE '%' + #{data.creatorName} + '%' + + AND project_leader LIKE '%' + #{data.projectLeader} + '%' AND CAST(expected_finish_date AS DATE) >= #{data.expectedFinishStartDate} @@ -234,8 +234,8 @@ AND a.product_type LIKE '%' + #{data.productType} + '%' - - AND a.creator_name LIKE '%' + #{data.creatorName} + '%' + + AND project_leader LIKE '%' + #{data.projectLeader} + '%' AND CAST(a.create_time AS DATE) >= #{data.createStartDate}