机构画像

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -69,11 +69,10 @@ public class ClubPortraitService {
         if (expty) {
             Date start = null;
             String startTime = "";
-            String format = dateFormat.format(date);
             cmPortrait.setEndTime(endTime);
             // 日期参数为    日
             if (1 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) {
-                cmPortrait.setAccessDate(endTime);
+//                cmPortrait.setAccessDate(endTime);
                 cmPortrait.setStartTime(endTime);
 //                cmPortrait.setEndTime(endTime);
             }

src/main/resources/mappings/modules/user/CmPortraitMapper.xml

@@ -56,9 +56,6 @@
         FROM cm_order
         <where>
              clubID = #{clubID}
-             <if test="accessDate != null and accessDate != ''">
-                 AND orderTime like concat('%',#{accessDate},'%')
-             </if>
              <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                  AND orderTime <![CDATA[ >= ]]> #{startTime} AND orderTime <![CDATA[ <= ]]> #{endTime}
              </if>
@@ -74,9 +71,6 @@
         FROM cm_behavior_record cbr LEFT JOIN club c ON cbr.userID = c.userID
         <where>
             cbr.pageType IN (8, 9) AND c.clubID = #{clubID} AND cbr.pageLabel IS NOT NULL AND cbr.pageLabel != ''
-            <if test="accessDate != null and accessDate != ''">
-                AND cbr.accessDate = #{accessDate}
-            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND cbr.accessDate <![CDATA[ >= ]]> #{startTime} AND cbr.accessDate <![CDATA[ <= ]]> #{endTime}
             </if>
@@ -95,9 +89,6 @@
         FROM cm_club_remarks
         <where>
             clubID = #{clubID}
-            <if test="accessDate != null and accessDate != ''">
-                AND addTime like concat('%', #{accessDate},'%')
-            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND addTime <![CDATA[ >= ]]> #{startTime} AND addTime <![CDATA[ <= ]]> #{endTime}
             </if>
@@ -115,9 +106,6 @@
         LEFT JOIN club c ON cbr.userID = c.userID
         <where>
                 c.clubID = #{clubID}
-            <if test="accessDate != null and accessDate != ''">
-                AND cbr.accessDate like concat('%', #{accessDate},'%')
-            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND cbr.accessDate <![CDATA[ >= ]]> #{startTime} AND cbr.accessDate <![CDATA[ <= ]]> #{endTime}
             </if>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -163,7 +163,7 @@
         }
 
         .upload-content {
-            margin-top: -70px;
+            /*margin-top: -70px;*/
             display: inline-block;
         }
 

src/main/webapp/WEB-INF/views/modules/svip/cmSvipCouponForm.jsp

@@ -149,7 +149,7 @@
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>优惠月份：</label>
         <div class="controls">
-            <form:input path="month" type="text" maxlength="20" class="input-medium Wdate" value="${useTime}"
+            <form:input path="month" type="text" maxlength="20" class="input-medium Wdate" value="${useTime}" disabled="true"
                         onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});"/>&nbsp;&nbsp; —— &nbsp;&nbsp;
             <form:input path="endMonth" type="text" maxlength="20" class="input-medium Wdate" value="${endMonth}" disabled="true"
                         onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});"/>