From 785ffda67f5822d614a60475edd564c22b61f67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Tue, 15 Dec 2020 14:49:12 +0800
Subject: [PATCH 1/3] fix

---
 .../lz/modules/job/task/ResultTaskNoticJob.java    | 14 ++++++++++----
 .../performance/controller/ExportController.java   |  4 ++--
 .../resources/mapper/app/ResultRecordMapper.xml    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java b/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java
index ab160bab..20e444b7 100644
--- a/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java
+++ b/src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java
@@ -1,11 +1,13 @@
 package com.lz.modules.job.task;
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.job.business.DingtalkBusiness;
 import com.lz.modules.performance.enums.ResultFlowProcessEnum;
 import com.lz.modules.sys.service.app.ResultRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,11 +38,15 @@ public class ResultTaskNoticJob implements ITask {
 
     @Override
     public void run(String params) {
-
+        logger.info("绩效任务填写通知开始。。。");
         List<Long> ids = resultRecordService.selectStaffIdsByFlowProcess(process);
-        List<StaffEntity> staffEntities = staffService.selectByIds(ids);
-        String res = dingtalkBusiness.sendTaskInputMsg(staffEntities);
-        logger.info("绩效任务填写通知响应：" + res);
+        if(CollectionUtils.isNotEmpty(ids)){
+            logger.info("通知人员id: " + JSON.toJSONString(ids));
+            List<StaffEntity> staffEntities = staffService.selectByIds(ids);
+            String res = dingtalkBusiness.sendTaskInputMsg(staffEntities);
+            logger.info("绩效任务填写通知响应：" + res);
+        }
+
 
     }
 }
diff --git a/src/main/java/com/lz/modules/performance/controller/ExportController.java b/src/main/java/com/lz/modules/performance/controller/ExportController.java
index 8b917f34..9c801f47 100644
--- a/src/main/java/com/lz/modules/performance/controller/ExportController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ExportController.java
@@ -106,7 +106,7 @@ public class ExportController {
 
     }
 
-   /* @GetMapping("/testDingTalkTask")
+    @GetMapping("/testDingTalkTask")
     public void testDingTalkTask(){
         List<Long> ids = resultRecordService.selectStaffIdsByFlowProcess(process);
         log.info(JSON.toJSONString(ids));
@@ -114,7 +114,7 @@ public class ExportController {
         List<StaffEntity> staffEntities = staffService.selectByIds(objects);
         String res = dingtalkBusiness.sendTaskInputMsg(staffEntities);
         logger.info("绩效任务填写通知响应：" + res);
-    }*/
+    }
 
 
 
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index 9f6dbab2..9b87b1ee 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -645,7 +645,7 @@
 
 
     <select id="selectStaffIdsByFlowProcess" resultType="long">
-        select staff_id from lz_result_record  where is_delete = 0
+        select DISTINCT (staff_id) from lz_result_record  where is_delete = 0 and start_id !=0
         and flow_process in (
         <foreach collection="flowProcess" item="process" separator=",">
             #{process}

From b9227cf15797221d0d0ad433b47489a73ab81a33 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 15 Dec 2020 16:31:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/impl/ResultRecordServiceImpl.java     | 11 ++++++++
 src/main/resources/2020_12_08_sql             | 26 ++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)

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 67472279..f3125b8d 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
@@ -941,6 +941,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
     private R resetNode(ApprovalDto approvalDto) {
         FlowRecord f = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
+        ResultRecord resultRecord = resultRecordService.selectResultRecordById(f.getRecordId());
         List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(),f.getFlowIndex());
         boolean flag = false ;
         for(FlowRecord flowRecord:flowRecords){
@@ -963,8 +964,10 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         }
         for (FlowRecord r : runing) {
             r.setStatus(2);
+            resultRecord.setFlowProcess(r.getFlowProcess());
             flowRecordService.updateFlowRecordById(r);
         }
+        resultRecordService.updateResultRecordById(resultRecord);
 
         if(flag) {  //如果录入己经走了，设置新的数据，结果录入己走
             List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(f.getRecordId());
@@ -983,6 +986,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     private R resetAll(ApprovalDto approvalDto) {
         FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
         Long flowRecordId = approvalDto.getResultRecordId();
+
         if(flowRecord != null ){
             flowRecordId  = flowRecord.getRecordId();
         }
@@ -1009,6 +1013,13 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 }
             }
         }
+
+        //更新flowProcess为0
+        ResultRecord resultRecord = resultRecordService.selectResultRecordById(flowRecord.getRecordId());
+        resultRecord.setFlowProcess(0);
+        resultRecordService.updateResultRecordById(resultRecord);
+
+
         resultRecordService.resetData(flowRecordId,approvalDto.getClearFlag());
         return R.ok();
     }
diff --git a/src/main/resources/2020_12_08_sql b/src/main/resources/2020_12_08_sql
index 917764da..21a9ae1c 100644
--- a/src/main/resources/2020_12_08_sql
+++ b/src/main/resources/2020_12_08_sql
@@ -1,4 +1,4 @@
-ALTER TABLE `lz_management`.`lz_result_detail` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '进度' AFTER `model_id`;
+ALTER TABLE `lz_result_detail` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '进度' AFTER `model_id`;
 
 
 
@@ -35,31 +35,37 @@ CREATE TABLE `lz_task_process_record` (
 
 
 
-ALTER TABLE `lz_management`.`lz_result_task` ADD COLUMN `name` text COMMENT '任务名称' AFTER `gmt_modified`, ADD COLUMN `detail_id` int(11) DEFAULT 0 COMMENT 'lz_result_detail 的id' AFTER `name`, ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '任务的当前进度' AFTER `detail_id`;
+ALTER TABLE `lz_result_task` ADD COLUMN `name` text COMMENT '任务名称' AFTER `gmt_modified`, ADD COLUMN `detail_id` int(11) DEFAULT 0 COMMENT 'lz_result_detail 的id' AFTER `name`, ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '任务的当前进度' AFTER `detail_id`;
 
 
 
 
-ALTER TABLE `lz_management`.`lz_task_comment` ADD COLUMN `task_id` int(11) DEFAULT 0 COMMENT '任务id' AFTER `gmt_modified`, ADD COLUMN `type` int(11) DEFAULT 0 COMMENT '0表示对所有评论，1表示对单个具体的detail做评论' AFTER `task_id`, ADD COLUMN `detail_id` int(11) AFTER `type`, ADD COLUMN `result_record_id` int(11) DEFAULT 0 COMMENT 'lz_result_record表id' AFTER `detail_id`, ADD COLUMN `staff_id` int(11) DEFAULT 0 COMMENT '评论人员' AFTER `result_record_id`, ADD COLUMN `content` text COMMENT '评论内容' AFTER `staff_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '评论人员名称' AFTER `content`;
+ALTER TABLE `lz_task_comment` ADD COLUMN `task_id` int(11) DEFAULT 0 COMMENT '任务id' AFTER `gmt_modified`, ADD COLUMN `type` int(11) DEFAULT 0 COMMENT '0表示对所有评论，1表示对单个具体的detail做评论' AFTER `task_id`, ADD COLUMN `detail_id` int(11) AFTER `type`, ADD COLUMN `result_record_id` int(11) DEFAULT 0 COMMENT 'lz_result_record表id' AFTER `detail_id`, ADD COLUMN `staff_id` int(11) DEFAULT 0 COMMENT '评论人员' AFTER `result_record_id`, ADD COLUMN `content` text COMMENT '评论内容' AFTER `staff_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '评论人员名称' AFTER `content`;
 
 
 
-ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `detail_id` int(11) COMMENT 'lz_result_record表id' AFTER `at_staff_name`, ADD COLUMN `result_record_id` int(11) COMMENT 'lz_detail表id' AFTER `detail_id`;
+ALTER TABLE `lz_task_process_record` ADD COLUMN `detail_id` int(11) COMMENT 'lz_result_record表id' AFTER `at_staff_name`, ADD COLUMN `result_record_id` int(11) COMMENT 'lz_detail表id' AFTER `detail_id`;
 
 
-ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '当前进度' AFTER `gmt_modified`, ADD COLUMN `remark` text COMMENT '更新说明' AFTER `process_rate`, ADD COLUMN `label` text COMMENT '操作标签' AFTER `remark`, ADD COLUMN `type` int(11) DEFAULT 3 COMMENT '1，修改名称，2修改进度  ，3名称和进度都修改' AFTER `label`;
+ALTER TABLE `lz_task_process_record` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '当前进度' AFTER `gmt_modified`, ADD COLUMN `remark` text COMMENT '更新说明' AFTER `process_rate`, ADD COLUMN `label` text COMMENT '操作标签' AFTER `remark`, ADD COLUMN `type` int(11) DEFAULT 3 COMMENT '1，修改名称，2修改进度  ，3名称和进度都修改' AFTER `label`;
 
 
-ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `type` `type` int(11) DEFAULT 3 COMMENT 'user_type为0时：1，修改名称，2修改进度  ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论';
+ALTER TABLE `lz_task_process_record` CHANGE COLUMN `type` `type` int(11) DEFAULT 3 COMMENT 'user_type为0时：1，修改名称，2修改进度  ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论';
 
-ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `staff_id` int(11) COMMENT '员工id' AFTER `result_record_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '员工名称' AFTER `staff_id`;
+ALTER TABLE `lz_task_process_record` ADD COLUMN `staff_id` int(11) COMMENT '员工id' AFTER `result_record_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '员工名称' AFTER `staff_id`;
 
 
-ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `staff_id` `staff_ids` varchar(256) DEFAULT NULL COMMENT '员工id', CHANGE COLUMN `staff_name` `staff_names` varchar(256) DEFAULT NULL COMMENT '员工名称';
+ALTER TABLE `lz_task_process_record` CHANGE COLUMN `staff_id` `staff_ids` varchar(256) DEFAULT NULL COMMENT '员工id', CHANGE COLUMN `staff_name` `staff_names` varchar(256) DEFAULT NULL COMMENT '员工名称';
+
+
+
+ALTER TABLE `lz_task_process_record` CHANGE COLUMN `at_staff_id` `at_staff_ids` int(11) DEFAULT NULL COMMENT '@人员id', CHANGE COLUMN `at_staff_name` `at_staff_names` varchar(256) DEFAULT NULL COMMENT '@人员名称', CHANGE COLUMN `staff_ids` `staff_id` int(11) DEFAULT NULL COMMENT '员工id', CHANGE COLUMN `staff_names` `staff_name` varchar(256) DEFAULT NULL COMMENT '员工名称';
+
+
+ALTER TABLE `lz_task_process_record` CHANGE COLUMN `at_staff_ids` `at_staff_ids` varchar(256) DEFAULT NULL COMMENT '@人员id';
+
 
 
 
-ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `at_staff_id` `at_staff_ids` int(11) DEFAULT NULL COMMENT '@人员id', CHANGE COLUMN `at_staff_name` `at_staff_names` varchar(256) DEFAULT NULL COMMENT '@人员名称', CHANGE COLUMN `staff_ids` `staff_id` int(11) DEFAULT NULL COMMENT '员工id', CHANGE COLUMN `staff_names` `staff_name` varchar(256) DEFAULT NULL COMMENT '员工名称';
 
 
-ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `at_staff_ids` `at_staff_ids` varchar(256) DEFAULT NULL COMMENT '@人员id';
\ No newline at end of file

From b25a5904623ca997ecf5e46ce1562823c4887acd Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 15 Dec 2020 16:50:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/impl/ResultRecordServiceImpl.java       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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 f3125b8d..16d1eccd 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
@@ -968,7 +968,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowRecordService.updateFlowRecordById(r);
         }
         resultRecordService.updateResultRecordById(resultRecord);
-
         if(flag) {  //如果录入己经走了，设置新的数据，结果录入己走
             List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(f.getRecordId());
             for(int i = 0 ;i < newflowRecords.size() ; i ++){
@@ -985,12 +984,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
     private R resetAll(ApprovalDto approvalDto) {
         FlowRecord flowRecord = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
-        Long flowRecordId = approvalDto.getResultRecordId();
+        Long resultRecordId = approvalDto.getResultRecordId();
 
         if(flowRecord != null ){
-            flowRecordId  = flowRecord.getRecordId();
+            resultRecordId  = flowRecord.getRecordId();
         }
-        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
+        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(resultRecordId);
         List<Long> flowRecordIds =new ArrayList<>();
         boolean flag = false ;
         for(FlowRecord f: flowRecords){
@@ -1000,9 +999,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 flag = true;
             }
         }
-        flowRecordService.deleteFlowRecordByRecordId(flowRecordId);
-        initFlowRecord(flowRecordId);
-        List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(flowRecordId);
+        flowRecordService.deleteFlowRecordByRecordId(resultRecordId);
+        initFlowRecord(resultRecordId);
+        List<FlowRecord> newflowRecords = flowRecordService.selectFlowRecordByRecordId(resultRecordId);
         for(int i = 0 ;i < newflowRecords.size() ; i ++){
             flowRecordService.updateFlowRecordIdById(newflowRecords.get(i).getId(),flowRecordIds.get(i));
             if(flag ){  //如果录入己经走了，设置新的数据，结果录入己走
@@ -1015,12 +1014,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         }
 
         //更新flowProcess为0
-        ResultRecord resultRecord = resultRecordService.selectResultRecordById(flowRecord.getRecordId());
+        ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId);
         resultRecord.setFlowProcess(0);
         resultRecordService.updateResultRecordById(resultRecord);
 
 
-        resultRecordService.resetData(flowRecordId,approvalDto.getClearFlag());
+        resultRecordService.resetData(resultRecordId,approvalDto.getClearFlag());
         return R.ok();
     }