From 02df239792d75f4928e6d74bcb3cbe3c84688b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Thu, 15 Oct 2020 09:25:50 +0800
Subject: [PATCH] fix

---
 .../com/lz/modules/performance/req/ChartResultReq.java    | 4 +++-
 .../performance/service/impl/ChartResultServiceImpl.java  | 5 +++++
 .../com/lz/modules/sys/dao/app/ResultRecordMapper.java    | 5 +++++
 .../lz/modules/sys/service/app/ResultRecordService.java   | 4 ++++
 .../sys/service/app/impl/ResultRecordServiceImpl.java     | 7 +++++++
 src/main/resources/mapper/app/ResultRecordMapper.xml      | 4 ++++
 src/main/resources/mapper/flow/FlowRecordMapper.xml       | 8 +++++++-
 7 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java
index 0b879684..8d0ba522 100644
--- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java
+++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java
@@ -2,6 +2,8 @@ package com.lz.modules.performance.req;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Author: djc
  * @Desc:
@@ -10,7 +12,7 @@ import lombok.Data;
 @Data
 public class ChartResultReq {
     //考核类型  月度  季度
-    private int assessType;
+    private int type;
 
     private String month;
 
diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
index 00f120ae..5b04a1ec 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
@@ -1,8 +1,10 @@
 package com.lz.modules.performance.service.impl;
 
+import com.lz.modules.performance.req.AssessListReq;
 import com.lz.modules.performance.req.ChartResultReq;
 import com.lz.modules.performance.service.ChartResultService;
 import com.lz.modules.sys.service.app.ResultRecordService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +19,9 @@ public class ChartResultServiceImpl implements ChartResultService {
     private ResultRecordService resultRecordService;
     @Override
     public void ChartReport(ChartResultReq req) {
+        AssessListReq query = new AssessListReq();
+        BeanUtils.copyProperties(req,query);
+        resultRecordService.countNumByFlowProcess(query);
 
 
     }
diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
index 2f4f6080..cca8b1f0 100644
--- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
+++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
@@ -16,6 +16,8 @@ import com.lz.modules.app.req.ReportListReq;
 import com.lz.modules.app.req.ResultRecordReq;
 import com.lz.modules.app.resp.OwnResultResp;
 import com.lz.modules.flow.model.ResultRecordDto;
+import com.lz.modules.performance.req.AssessListReq;
+import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.sys.entity.app.ResultRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -69,4 +71,7 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
     ResultRecord selectCurrentMonthResultRecordByStaffIdType(@Param("staffId") Long staffId, @Param("type") int type);
 
     List<ResultRecord> selectResultRecordAllByStaffId(@Param("staffId") Long staffId);
+
+    List<ChartStatisticalRes> countNumByFlowProcess(@Param("req") AssessListReq req);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
index ecd51abc..0033d607 100644
--- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
+++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
@@ -14,6 +14,8 @@ import com.lz.modules.app.resp.OwnResultResp;
 import com.lz.modules.app.utils.t.TwoTuple;
 import com.lz.modules.flow.entity.Flow;
 import com.lz.modules.flow.model.StaffRoleDto;
+import com.lz.modules.performance.req.AssessListReq;
+import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.sys.entity.SysUserEntity;
 import com.lz.modules.sys.entity.app.ResultRecord;
 
@@ -100,4 +102,6 @@ public interface ResultRecordService extends IService<ResultRecord> {
 	ResultRecord selectCurrentMonthResultRecordByStaffIdType(Long staffId, int type);
 
 	List<ResultRecord> selectResultRecordAllByStaffId(Long staffId);
+
+	List<ChartStatisticalRes> countNumByFlowProcess(AssessListReq req);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 07d9d10d..d588ddc7 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -27,6 +27,8 @@ import com.lz.modules.flow.model.TypeFlowDto;
 import com.lz.modules.flow.model.TypeRoleDto;
 import com.lz.modules.flow.service.*;
 import com.lz.modules.job.business.DingtalkBusiness;
+import com.lz.modules.performance.req.AssessListReq;
+import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.sys.dao.app.ResultRecordMapper;
 import com.lz.modules.sys.entity.SysUserEntity;
 import com.lz.modules.sys.entity.app.ResultDetail;
@@ -729,4 +731,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
         return resultRecordMapper.staffDistribution(monthTime,staffIds);
     }
+
+    @Override
+    public List<ChartStatisticalRes> countNumByFlowProcess(AssessListReq req) {
+        return resultRecordMapper.countNumByFlowProcess(req);
+    }
 }
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index 95755060..472708c1 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -338,6 +338,10 @@
         select * from lz_result_record  where staff_id = #{staffId}
     </select>
 
+    <select id="countNumByFlowProcess" resultType="com.lz.modules.performance.res.ChartStatisticalRes">
+        SELECT count(flow_process) num,flow_process type from lz_result_record where is_delete=0 GROUP BY flow_process
+    </select>
+
 
 </mapper>
 
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index 47e6523c..17152bcf 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -212,7 +212,13 @@
     </select>
 
     <select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
-
+        SELECT DISTINCT(record_id),flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f
+        LEFT JOIN lz_result_record r
+        ON f.record_id = r.id
+        where f.is_delete=0 and r.is_delete=0
+        and approval_staff_id = #{approvalStaffId}
+        and f.status = 2
+        order by r.gmt_modified desc
     </select>
 
 </mapper>