朋友圈

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/QwMomentPlanDataDTO.java

@@ -18,6 +18,7 @@ public class QwMomentPlanDataDTO implements Serializable{
 	private String enterpriseId;
 	/**staff*/
 	private String staffId;
+	private String staffName ;
 	/**导购*/
 	private String clerkId;
 	/**门店id*/
@@ -39,6 +40,14 @@ public class QwMomentPlanDataDTO implements Serializable{
 	/**是否点赞*/
 	private Integer likeFlag;
 
+	public String getStaffName() {
+		return staffName;
+	}
+
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+
 	public Long getDataId() {
 		return dataId;
 	}

haoban-manage3-service/src/main/resources/mapper/moment/qwMomentPlanMapper.xml

@@ -141,24 +141,9 @@
                 <if test="null != execType">
             exec_type=#{execType},
                 </if>
-                <if test="null != wxEnterpriseId">
-            wx_enterprise_id=#{wxEnterpriseId},
-                </if>
-                <if test="null != enterpriseId">
-            enterprise_id=#{enterpriseId},
-                </if>
-                <if test="null != creatorId">
-            creator_id=#{creatorId},
-                </if>
-                <if test="null != creatorName">
-            creator_name=#{creatorName},
-                </if>
                 <if test="null != statusFlag">
             status_flag=#{statusFlag},
                 </if>
-                <if test="null != deleteFlag">
-            delete_flag=#{deleteFlag},
-                </if>
                 <if test="null != publishType">
             publish_type=#{publishType},
                 </if>
@@ -168,12 +153,6 @@
                 <if test="null != planClerkType">
             plan_clerk_type=#{planClerkType},
                 </if>
-                <if test="null != totalNum">
-            total_num=#{totalNum},
-                </if>
-                <if test="null != doneNum">
-            done_num=#{doneNum},
-                </if>
                 <if test="null != stopTime">
             stop_time=#{stopTime},
                 </if>
@@ -236,8 +215,10 @@
 
     <select id="list" resultMap="result-map-tabHaobanQwMomentPlan"
             parameterType="com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO">
-        select <include refid="Base_Column_List"/> from tab_haoban_qw_moment_plan where wx_enterprise_id=#{wxEnterpriseId} and enterprise_id = #{enterpriseId}
-
+        select <include refid="Base_Column_List"/> from tab_haoban_qw_moment_plan where  enterprise_id = #{enterpriseId}
+        <if test="null != wxEnterpriseId">
+           and wx_enterprise_id=#{wxEnterpriseId}
+        </if>
         <if test="statusFlag ==0">
             and ( status_flag = 1 and begin_date  <![CDATA[ > ]]> NOW()  )
         </if>