7天流程统计详细数据

src/main/java/cn/com/oa/controller/FlowInstanceController.java

@@ -1,15 +1,11 @@
 package cn.com.oa.controller;
 
+import cn.com.oa.model.vo.FlowInstanceVo;
+import cn.com.oa.service.IFlowInstanceService;
 import cn.com.v2.common.base.BaseController;
 import cn.com.v2.common.domain.AjaxResult;
 import cn.com.v2.common.domain.ResultTable;
 import cn.com.v2.common.domain.Tablepar;
-import cn.com.oa.model.Company;
-import cn.com.oa.model.FlowInstance;
-import cn.com.v2.model.GoviewProject;
-import cn.com.oa.model.vo.FlowInstanceVo;
-import cn.com.oa.service.IFlowInstanceService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiOperation;
@@ -28,6 +24,15 @@ public class FlowInstanceController extends BaseController {
     @Autowired
     private IFlowInstanceService flowInstanceService;
 
+    @ApiOperation(value = "获取近七天流程详情统计数据", notes = "获取近七天流程详情统计数据")
+    @GetMapping("/getSevenDayFlowInfoIns")
+    @ResponseBody
+    public AjaxResult getSevenDayFlowInfoIns()
+    {
+        List<FlowInstanceVo> flowInfoInsMap = flowInstanceService.getSevenDayFlowInfoIns();
+        return AjaxResult.successData(200,flowInfoInsMap).put("msg","获取成功");
+    }
+
     @ApiOperation(value = "获取近七天流程统计数据", notes = "获取近七天流程统计数据")
     @GetMapping("/getSevenDayFlowIns")
     @ResponseBody

src/main/java/cn/com/oa/mapper/FlowInstanceMapper.java

@@ -1,6 +1,5 @@
 package cn.com.oa.mapper;
 
-import cn.com.oa.model.Company;
 import cn.com.oa.model.FlowInstance;
 import cn.com.oa.model.vo.FlowInstanceVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -30,4 +29,6 @@ public interface FlowInstanceMapper extends BaseMapper<FlowInstance> {
     Integer getTotalFlowInsCount(@Param("flowInstance") FlowInstanceVo flowInstance);
 
     List<FlowInstanceVo> listAllDealing(@Param("flowInstance") FlowInstanceVo flowInstance);
+
+    List<FlowInstanceVo> getSevenDayFlowInfoIns();
 }

src/main/java/cn/com/oa/model/vo/FlowInstanceVo.java

@@ -1,8 +1,6 @@
 package cn.com.oa.model.vo;
 
 import cn.com.oa.model.FlowInstance;
-import cn.com.oa.model.Group;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,4 +17,14 @@ public class FlowInstanceVo extends FlowInstance {
      */
     private String modelName;
 
+    /**
+     * 流程统计时间
+     */
+    private String totalDate;
+
+    /**
+     * 流程统计数量
+     */
+    private String count;
+
 }

src/main/java/cn/com/oa/service/IFlowInstanceService.java

@@ -1,6 +1,5 @@
 package cn.com.oa.service;
 
-import cn.com.oa.model.Company;
 import cn.com.oa.model.FlowInstance;
 import cn.com.oa.model.vo.FlowInstanceVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,4 +25,6 @@ public interface IFlowInstanceService extends IService<FlowInstance> {
     Integer getTotalFlowInsCount();
 
     List<FlowInstanceVo> listAllDealing();
+
+    List<FlowInstanceVo> getSevenDayFlowInfoIns();
 }

src/main/java/cn/com/oa/service/impl/AttendanceRecordResultServiceImpl.java

@@ -58,6 +58,7 @@ public class AttendanceRecordResultServiceImpl extends ServiceImpl<AttendanceRec
         List<AttendanceRecordDTO> recordList = attendanceRecordService.getRecordList(attendanceRecord);
         // 已打卡人数
         int recordCount = recordList.size();
+        // 实际到人数
         int actualCount = recordCount;
         // 迟到人数
         int lateCount = 0;

src/main/java/cn/com/oa/service/impl/FlowInstancelServiceImpl.java

@@ -2,7 +2,6 @@ package cn.com.oa.service.impl;
 
 import cn.com.oa.common.constant.DataService;
 import cn.com.oa.mapper.FlowInstanceMapper;
-import cn.com.oa.model.Company;
 import cn.com.oa.model.FlowInstance;
 import cn.com.oa.model.Group;
 import cn.com.oa.model.vo.FlowInstanceVo;
@@ -75,4 +74,10 @@ public class FlowInstancelServiceImpl extends ServiceImpl<FlowInstanceMapper, Fl
         flowInstance.setDept(group.getUNIVERSALID().toString());
         return baseMapper.listAllDealing(flowInstance);
     }
+
+    @Override
+    public List<FlowInstanceVo> getSevenDayFlowInfoIns() {
+        return baseMapper.getSevenDayFlowInfoIns();
+    }
+
 }

src/main/resources/mapper/oa/FlowInstanceMapper.xml

@@ -230,4 +230,14 @@
         ORDER BY
         s.d_createdate DESC
     </select>
+    <select id="getSevenDayFlowInfoIns" resultType="cn.com.oa.model.vo.FlowInstanceVo">
+        SELECT
+            DATE ( a.d_createdate ) AS totalDate,
+            b.v_model_name AS modelName,
+            COUNT(a.l_model_id) AS count
+        FROM bpm_flow_instance a
+            JOIN bpm_flow_model b ON a.l_model_id = b.l_model_id
+        WHERE a.d_createdate BETWEEN CURDATE() - INTERVAL 6 DAY AND CURDATE() AND a.n_state != 0
+        GROUP BY totalDate, b.v_model_name;
+    </select>
 </mapper>