Merge remote-tracking branch 'origin/developerA' into developerB

src/main/java/com/caimei365/manager/entity/caimei/enums/KeyWordEnum.java

@@ -49,7 +49,7 @@ public enum KeyWordEnum {
      * @return
      */
     public static Map<String, String> getTimeVal(Integer key) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Map<String, String> timeVal = new HashMap<>();
         Date now = new Date();
         Calendar instance = Calendar.getInstance();

src/main/java/com/caimei365/manager/service/caimei/impl/KeyWordServiceImpl.java

@@ -30,7 +30,7 @@ public class KeyWordServiceImpl implements KeyWordService {
 
     @Override
     public ResponseJson<PaginationVo<KeyWord>> getKeyWordList(String keyword, Integer searchTimeCode, Integer fromSearch, String beginTime, String endTime, Integer labelStatus, int pageNum, int pageSize) {
-        if (null != searchTimeCode && searchTimeCode > 0) {
+        if (null != searchTimeCode && searchTimeCode > 0 && StringUtils.isEmpty(beginTime) && StringUtils.isEmpty(endTime)) {
             Map<String, String> timeVal = KeyWordEnum.getTimeVal(searchTimeCode);
             beginTime = timeVal.get("beginTime");
             endTime = timeVal.get("endTime");
@@ -63,6 +63,12 @@ public class KeyWordServiceImpl implements KeyWordService {
 
     @Override
     public ResponseJson<PaginationVo<KeyWord>> getRecommendList(String keyword, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
+        if (!StringUtils.isEmpty(beginTime)) {
+            beginTime += " 00:00:00";
+        }
+        if (!StringUtils.isEmpty(endTime)) {
+            endTime += " 23:59:59";
+        }
         PageHelper.startPage(pageNum, pageSize);
         List<KeyWord> keyWords = keyWordDao.findRecommendList(keyword, beginTime, endTime);
         PaginationVo<KeyWord> pageData = new PaginationVo<>(keyWords);

src/main/resources/mapper/KeyWordDao.xml

@@ -37,7 +37,7 @@
         FROM cm_user_search_frequency cusf
         WHERE cusf.delStatus = 1
         <if test="beginTime !=null and beginTime !=''">
-            AND searchTime BETWEEN #{beginTime} AND #{endTime}
+            AND if(fromSearch=2,searchTime BETWEEN #{beginTime} AND #{endTime},1=1)
         </if>
         <if test="keyword !=null and keyword !=''">
             AND keyword LIKE CONCAT('%',#{keyword},'%')
@@ -52,7 +52,7 @@
     </select>
 
     <select id="findRecommendList" resultType="com.caimei365.manager.entity.caimei.KeyWord">
-        SELECT keyWord, recommendTime, id
+        SELECT keyWord, recommendTime, id,trueStatus as labelStatus
         FROM cm_user_search_frequency
         where trueStatus = 0
         and delStatus = 1