‘linchangsheng’ 2 meses atrás
pai
commit
d71af6d3f4

+ 5 - 2
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/OrderBaseCMapper.java

@@ -31,8 +31,11 @@ public interface OrderBaseCMapper {
      * @param adminWebsitIds
      * @return
      */
-    public OrderBaseCountBean countOrderBaseIndex(@Param("companyWechatId") String companyWechatId, @Param("adminWebsitIds") List<String> adminWebsitIds,@Param("adminUserType") Integer adminUserType);
-
+    public OrderBaseCountBean countOrderBaseIndex(@Param("companyWechatId") String companyWechatId,
+                                                  @Param("adminWebsitIds") List<String> adminWebsitIds,
+                                                  @Param("adminUserType") Integer adminUserType,
+                                                  @Param("startTime") String startTime,
+                                                  @Param("endTime") String endTime);
     /**
      * 工单状态统计2
      * @return

+ 4 - 3
mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseCountController.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 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;
 
 @RequiredArgsConstructor
@@ -23,10 +24,10 @@ public class OrderBaseCountController {
 
     @PostMapping("/status/count")
     @ApiOperation(value = "按工单状态统计")
-    public ResponseHelper<OrderBaseCountBean> countStatus() {
-        OrderBaseCountBean orderBaseCountBean = orderBaseCountLogic.baseCountBean();
+    public ResponseHelper<OrderBaseCountBean> countStatus(   @RequestParam(required = false) String startTime,
+                                                             @RequestParam(required = false) String endTime) {
+        OrderBaseCountBean orderBaseCountBean = orderBaseCountLogic.baseCountBean(startTime,endTime);
         return ResponseHelper.success(orderBaseCountBean);
     }
 
-
 }

+ 3 - 0
mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -249,6 +249,9 @@
         <if test="companyWechatId != null and companyWechatId !=''">
             and a.company_wechat_id = #{companyWechatId}
         </if>
+        <if test="startTime != null and startTime !=''">
+            and a.create_time between #{startTime} and #{endTime}
+        </if>
         <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
             AND (
             a.websit_id IN