调整统计查询条件

src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java

@@ -5,10 +5,7 @@ import cn.chjyj.szwh.service.IndexService;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
@@ -24,14 +21,12 @@ public class AdminIndexController extends BaseController {
     private IndexService indexService;
 
     @PostMapping("/home")
-    public JSONObject home(HttpServletRequest request){
-        String leftDate=request.getParameter("leftDate");
-        // 拼装查询条件
-        //Map<String,Object> queryMap = new HashMap<>();
-        //queryMap.put("leftDate",leftDate);
-//        queryMap.put("rightDate",rightDate);
-//        queryMap.put("sale_ranking",saleRanking);
-//        queryMap.put("saleRankingDate",saleRankingDate);
+    public JSONObject home(@RequestBody String rejson){
+        JSONObject request = JSONObject.parseObject(rejson);
+        String leftDate=request.getString("leftDate");
+        String rightDate=request.getString("rightDate");
+        String saleRankingDate = request.getString("saleRankingDate");
+
         String dtflag = StringUtils.isEmpty(leftDate)?"":leftDate;
 //        // 执行查询操作
         Map result =indexService.getCountSys(dtflag);

src/main/java/cn/chjyj/szwh/service/impl/IndexServiceImpl.java

@@ -55,8 +55,8 @@ public class IndexServiceImpl implements IndexService {
         calendar.add(Calendar.DATE,-1);
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
         String yesterday=sdf.format(calendar.getTime());
-        String yesterday_start = yesterday+"00:00:00";
-        String yesterday_end = yesterday+"23:59:59";
+        String yesterday_start = "'"+yesterday+" 00:00:00'";
+        String yesterday_end = "'"+yesterday+" 23:59:59'";
         // 现在时刻
         String nowtime=sdf.format(System.currentTimeMillis());
 
@@ -83,16 +83,16 @@ public class IndexServiceImpl implements IndexService {
         //上架数量
         Map xgmap = new HashMap();
         xgmap.put("goods_status","1");
-        xgmap.put("createtime","between "+yesterday_start+" and "+yesterday_end);
+        xgmap.put("btwstr","createtime between "+yesterday_start+" and "+yesterday_end);
         Integer shelfCount=goodsMapper.goodsCount(xgmap);
-        result.put("shelf_count",shelfCount);
+        result.put("shelf_count",shelfCount==null?0:shelfCount);
 
         //下架数量
         Map ogmap = new HashMap();
         ogmap.put("goods_status","2");
-        ogmap.put("canceltime","between "+yesterday_start+" and "+yesterday_end);
+        ogmap.put("btwstr","canceltime between "+yesterday_start+" and "+yesterday_end);
         Integer outCount= goodsMapper.goodsCount(ogmap);
-        result.put("out_count",goodsCount);
+        result.put("out_count",outCount==null?0:outCount);
 
         //新增订单
         Integer yesterOrderCount = orderMapper.countOrderTimeSection("createtime",yesterday_start,yesterday_end);

src/main/resources/mapper/szwh/GoodsMapper.xml

@@ -17,9 +17,12 @@
         select count(*) from <include refid="tbName"/>
         <where>
             <foreach collection="map" item="v" index="k" separator="and">
-                <if test="v != null and v != ''">
+                <if test="v != null and v != '' and k!='btwstr'">
                     ${k} = #{v}
                 </if>
+                <if test="k=='btwstr'">
+                    ${v}
+                </if>
             </foreach>
         </where>
     </select>

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -87,7 +87,7 @@
     <select id="countOrderTimeSection" resultType="java.lang.Integer">
         select count(*) from
         <include refid="tbName"/>
-        where #{key} between #{startTime} and #{endTime}
+        where #{key} between ${startTime} and ${endTime}
     </select>
 
     <!-- 条件订单总额 -->