领料接口优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java

@@ -122,6 +122,12 @@ public class BmAgreementInfo extends BaseEntity
     @ApiModelProperty(value = "关键词")
     private String keyWord;
 
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
     @ApiModelProperty(value = "附件列表")
     private List<BmFileInfo> bmFileInfos;
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml

@@ -37,9 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bai.status = '1'
         <if test="keyWord != null  and keyWord != ''">
             and (bai.contract_code like concat('%', #{keyWord}, '%') or
+            bai.agreement_code like concat('%', #{keyWord}, '%') or
             auth_person like concat('%', #{keyWord}, '%') or
             phone like concat('%', #{keyWord}, '%'))
         </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            <![CDATA[ AND DATE_FORMAT( bai.plan_start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
+        </if>
+        <if test="status != null and status != ''">
+            AND bai.`status` = #{status}
+        </if>
         <if test="agreementCode != null  and agreementCode != ''">
             and bai.agreement_code like concat('%', #{agreementCode}, '%')
         </if>