Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogSearchQDTO.java

@@ -12,23 +12,31 @@ public class WxUserAddLogSearchQDTO extends BasePageInfo implements Serializable
     */
     private static final long serialVersionUID = 8305835283985272207L;
 
-    private Long wxEnterpriseId;
-    private Long enterpriseId;
+    private String wxEnterpriseId;
+    private String enterpriseId;
     private Long linkId;
     private Long hmId;
     private String clerkId;
     private Date startTime;
     private Date endTime;
     private Integer addChannel;
-
-    public Long getWxEnterpriseId() {
+    
+    public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }
 
-    public Long getEnterpriseId() {
+    public String getEnterpriseId() {
         return enterpriseId;
     }
 
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
     public Long getLinkId() {
         return linkId;
     }
@@ -53,14 +61,6 @@ public class WxUserAddLogSearchQDTO extends BasePageInfo implements Serializable
         return addChannel;
     }
 
-    public void setWxEnterpriseId(Long wxEnterpriseId) {
-        this.wxEnterpriseId = wxEnterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
     public void setLinkId(Long linkId) {
         this.linkId = linkId;
     }

haoban-manage3-service/src/main/resources/mapper/hm/WxUserAddLogMapper.xml

@@ -183,13 +183,23 @@
 		status_flag != 0 order by create_time desc limit 1
 	</select>
 
-	<select id="listForPage"
-		parameterType="com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO"
-		resultMap="result-map-tabHaobanWxUserAddLog">
+	<select id="listForPage" parameterType="com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO" resultMap="result-map-tabHaobanWxUserAddLog">
 		select
 		<include refid="Base_Column_List" />
-		from tab_haoban_wx_user_add_log where 1
-		and status_flag != 0 order by
-		create_time desc
+		from tab_haoban_wx_user_add_log where wx_enterprise_id = #{enterpriseId}
+		<if test="null != enterpriseId">
+			and enterprise_id = #{enterpriseId}
+		</if>
+		<if test="null != linkId">
+			and link_id = #{linkId}
+		</if>
+		<if test="null != hmId">
+			and hm_id = #{hmId}
+		</if>
+		<if test="null != clerkId">
+			and clerk_id = #{clerkId}
+		</if>
+		and create_time >= #{startTime} and create_time <![CDATA[<=]]> #{endTime}
+		and status_flag != 0 order by create_time desc
 	</select>
 </mapper> 
\ No newline at end of file