APP查询运维情况

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -828,15 +828,17 @@ public class WorkOrderManageController {
     }
 
     /**
-     * 综合展示-查询工单执行情况
+     * 综合展示/App-查询工单执行情况
      * @return Response对象
      */
     @RequestMapping(value = "selectOrderStatus", method = RequestMethod.GET)
-    @ApiOperation(value = "综合展示-查询工单执行情况")
+    @ApiOperation(value = "综合展示/App-查询工单执行情况")
     public AjaxMessage<List<WorkOrderManageDto>> selectOrderStatus(
-            @ApiParam(value = "公司机构id", required = false)@RequestParam(required = false) Integer companyOrgId) {
+            @ApiParam(value = "公司机构id", required = false)@RequestParam(required = false) Integer companyOrgId,
+            @ApiParam(value = "0或null本月、1本年、2近一年", required = false)@RequestParam(required = false) Integer statsType) {
         WorkOrderManageDto workOrderManageDto=new WorkOrderManageDto();
         workOrderManageDto.setCompanyOrgId(companyOrgId!=null?companyOrgId.toString():null);
+        workOrderManageDto.setStatsType(statsType);
 
         LoginUser loginUser = UserUtil.getCurrentUser();
         workOrderManageDto.setTenantId(loginUser.getTenantId());

operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -97,4 +97,8 @@ public class WorkOrderManageDto extends WorkOrderManage {
 
     @ApiModelProperty(value = "工单状态名称")
     private String orderStatusName;
+
+    @ApiModelProperty(value="统计类型 0或null本月、1本年、2近一年",hidden = true)
+    @JsonIgnore
+    private Integer statsType;
 }

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -391,15 +391,17 @@ public class PlanManageController {
     }
 
     /**
-     * 综合展示-查询任务执行情况
+     * 综合展示/App-查询任务执行情况
      * @return Response对象
      */
     @RequestMapping(value = "selectTaskFinished", method = RequestMethod.GET)
-    @ApiOperation(value = "综合展示-查询任务执行情况")
+    @ApiOperation(value = "综合展示/App-查询任务执行情况")
     public AjaxMessage<List<PlanManageDto>> selectTaskFinished(
-            @ApiParam(value = "公司机构id", required = false)@RequestParam(required = false) Integer companyOrgId) {
+            @ApiParam(value = "公司机构id", required = false)@RequestParam(required = false) Integer companyOrgId,
+            @ApiParam(value = "0或null本月、1本年、2近一年", required = false)@RequestParam(required = false) Integer statsType) {
         PlanManageDto planManageDto=new PlanManageDto();
         planManageDto.setCompanyOrgId(companyOrgId!=null?companyOrgId.toString():null);
+        planManageDto.setStatsType(statsType);
 
         LoginUser loginUser = UserUtil.getCurrentUser();
         planManageDto.setTenantId(loginUser.getTenantId());

operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -80,4 +80,8 @@ public class PlanManageDto extends PlanManage {
 
     @ApiModelProperty(value = "任务完成数量")
     private Integer finishedCount;
+
+    @ApiModelProperty(value="统计类型 0或null本月、1本年、2近一年",hidden = true)
+    @JsonIgnore
+    private Integer statsType;
 }

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -694,7 +694,16 @@
       select order_status,count(1) order_count ,
        case when order_status=0 then '未派单' when order_status=1 or order_status=4 then '处理中' else '已完结' end order_status_name
       from sc_work_order_manage t1
-      where  t1.date_create>=date_format(curdate(), '%Y-%m' )
+      where
+      <if test="statsType == null or statsType == 0">
+        t1.date_create>=date_format(curdate(), '%Y-%m' )
+      </if>
+      <if test="statsType == 1">
+        t1.date_create>=date_format(curdate(), '%Y-1-1' )
+      </if>
+      <if test="statsType == 2">
+        t1.date_create>=date_sub(date_format(curdate(), '%Y-%m-1' ), interval 11 month)
+      </if>
       <if test="tenantId != null and tenantId != ''">
         and t1.tenant_id=#{tenantId}
       </if>

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -488,7 +488,16 @@
     from(
       select task_type,plan_status,count(1) task_count
       from sc_plan_manage t1
-      where  t1.date_create>=date_format(curdate(), '%Y-%m' )
+      where
+      <if test="statsType == null or statsType == 0">
+        t1.date_create>=date_format(curdate(), '%Y-%m' )
+      </if>
+      <if test="statsType == 1">
+        t1.date_create>=date_format(curdate(), '%Y-1-1' )
+      </if>
+      <if test="statsType == 2">
+        t1.date_create>=date_sub(date_format(curdate(), '%Y-%m-1' ), interval 11 month)
+      </if>
       <if test="tenantId != null and tenantId != ''">
         and t1.tenant_id=#{tenantId}
       </if>