wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-12-15 17:04:06 +08:00
commit 0c9a145ead
5 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/lz/modules/job/task/ResultTaskNoticJob.java
View File

@ -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);
}
}
}

4
src/main/java/com/lz/modules/performance/controller/ExportController.java
View File

@ -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);
}*/
}

26
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -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,9 +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());
for(int i = 0 ;i < newflowRecords.size() ; i ++){
@ -982,11 +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){
@ -996,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 ){ //如果录入己经走了，设置新的数据，结果录入己走
@ -1009,7 +1012,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
}
}
resultRecordService.resetData(flowRecordId,approvalDto.getClearFlag());
//更新flowProcess为0
ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId);
resultRecord.setFlowProcess(0);
resultRecordService.updateResultRecordById(resultRecord);
resultRecordService.resetData(resultRecordId,approvalDto.getClearFlag());
return R.ok();
}

26
src/main/resources/2020_12_08_sql
View File

@ -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';

2
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -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}