机构画像

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

@@ -46,14 +46,18 @@ public class ClubPortraitService {
     public CmPortrait dataList(CmPortrait cmPortrait) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
-        if (ObjectUtils.isEmpty(cmPortrait.getStartTime()) && ObjectUtils.isEmpty(cmPortrait.getEndTime())) {
+        String endTime = "";
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date time = calendar.getTime();
+        endTime = dateFormat.format(time);
+        String time1 = "";
+        String time2 = "";
+        boolean expty = ObjectUtils.isEmpty(cmPortrait.getStartTime()) && ObjectUtils.isEmpty(cmPortrait.getEndTime());
+        if (expty) {
             Date start = null;
             String startTime = "";
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(date);
-            calendar.add(Calendar.DAY_OF_MONTH, -1);
-            Date time = calendar.getTime();
-            String endTime = dateFormat.format(time);
             String format = dateFormat.format(date);
             cmPortrait.setEndTime(endTime);
             // 日期参数为    日
@@ -86,10 +90,16 @@ public class ClubPortraitService {
                 startTime = dateFormat.format(start);
                 cmPortrait.setStartTime(startTime);
             }
+        } else {
+            time1 = cmPortrait.getStartTime();
+            time2 = cmPortrait.getEndTime();
         }
         // 机构订单
         if (0 == cmPortrait.getType() || 4 == cmPortrait.getType()) {
-            if (0 !=  cmPortrait.getDateType() || 1 != cmPortrait.getDateType()) {
+            if ((0 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) && expty) {
+                cmPortrait.setEndTime(dateFormat.format(date));
+            }
+            if (cmPortrait.getEndTime().equals(endTime)) {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
             int ordinary = 0, secondHand = 0, rebate = 0, partialRefund = 0, fullRefund = 0, closed = 0;
@@ -186,11 +196,10 @@ public class ClubPortraitService {
 
                 cmPortrait.setOrderPortrait(orderPortraits);
             }
-            Calendar calendar = Calendar.getInstance();
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);
-            Date time = calendar.getTime();
-            String endTime = dateFormat.format(time);
+            time = calendar.getTime();
+            endTime = dateFormat.format(time);
             cmPortrait.setEndTime(endTime);
         }
         // 搜索关键词
@@ -214,7 +223,10 @@ public class ClubPortraitService {
         }
         // 咨询记录
         if (2 == cmPortrait.getType() || 4 == cmPortrait.getType()) {
-            if (0 !=  cmPortrait.getDateType() || 1 != cmPortrait.getDateType()) {
+            if ((0 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) && expty) {
+                cmPortrait.setEndTime(dateFormat.format(date));
+            }
+            if (cmPortrait.getEndTime().equals(endTime)) {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
             List<CmClubRemarks> remarksList = cmPortraitDao.selRemarksList(cmPortrait);
@@ -250,11 +262,10 @@ public class ClubPortraitService {
                 cmPortrait.setRemarksValue(integers);
                 cmPortrait.setRemarksType(strings);
             }
-            Calendar calendar = Calendar.getInstance();
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);
-            Date time = calendar.getTime();
-            String endTime = dateFormat.format(time);
+            time = calendar.getTime();
+            endTime = dateFormat.format(time);
             cmPortrait.setEndTime(endTime);
         }
         // 访问记录
@@ -271,6 +282,13 @@ public class ClubPortraitService {
                 cmPortrait.setPageType(strings);
             }
         }
+        if (!expty) {
+            cmPortrait.setStartTime(time1);
+            if ((0 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) && ObjectUtils.isEmpty(cmPortrait.getStartTime())) {
+                cmPortrait.setStartTime(time2);
+            }
+            cmPortrait.setEndTime(time2);
+        }
         return cmPortrait;
     }
 }

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

@@ -26,7 +26,7 @@
                  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}
+                 AND orderTime <![CDATA[ >= ]]> #{startTime} AND orderTime <![CDATA[ <= ]]> #{endTime}
              </if>
         </where>
     </select>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -59,6 +59,10 @@
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="flex-wrap">
+        <div class="item">
+            <label>机构ID：</label>
+            <form:input path="clubID"  htmlEscape="false" maxlength="50" class="input-medium"/>
+        </div>
         <div class="item">
             <label>机构名称：</label>
             <form:input path="searchName"  htmlEscape="false" maxlength="50" class="input-medium"/>