yonge %!s(int64=4) %!d(string=hai) anos
pai
achega
d22ae6504c

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/EmployeeInfoQueryInfo.java

@@ -40,6 +40,8 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	private Date visitStartDate;
 	
 	private Date visitEndDate;
+	
+	private String hrbp;
 
 	public String getUserNameOrIdOrMobile() {
 		return userNameOrIdOrMobile;
@@ -136,4 +138,12 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	public void setVisitEndDate(Date visitEndDate) {
 		this.visitEndDate = visitEndDate;
 	}
+
+	public String getHrbp() {
+		return hrbp;
+	}
+
+	public void setHrbp(String hrbp) {
+		this.hrbp = hrbp;
+	}
 }

+ 7 - 4
mec-biz/src/main/resources/config/mybatis/EmployeeInfoMapper.xml

@@ -167,6 +167,9 @@
 	        <if test="sourceFrom != null">
 	            AND ei.source_from_ = #{sourceFrom}
 	        </if>
+	        <if test="hrbp != null">
+	            AND ei.hrbp_ = #{hrbp}
+	        </if>
 			<if test="intentionCity != null">
 				AND ei.intention_city_ LIKE CONCAT('%',#{intentionCity},'%')
 			</if>
@@ -177,16 +180,16 @@
 	            AND ei.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	        </if>
 	        <if test="startDate != null">
-	            AND ei.update_time_ &gt;= #{startDate}
+	            AND date(ei.update_time_) &gt;= #{startDate}
 	        </if>
 	        <if test="endDate != null">
-	            AND ei.update_time_ &lt;= #{endDate}
+	            AND date(ei.update_time_) &lt;= #{endDate}
 	        </if>
 	        <if test="visitStartDate != null">
-	            AND ei.next_visit_date_ &gt;= #{visitStartDate}
+	            AND date(ei.next_visit_date_) &gt;= #{visitStartDate}
 	        </if>
 	        <if test="visitEndDate != null">
-	            AND ei.next_visit_date_ &lt;= #{visitEndDate}
+	            AND date(ei.next_visit_date_) &lt;= #{visitEndDate}
 	        </if>
 	        <if test="operator != null">
 	            AND (ei.operator_id_ like concat('%',#{operator},'%') or u.real_name_ like concat('%',#{operator},'%'))