From cd82d981168466d8632b29082af01bee6df8ddb2 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 14 Dec 2020 18:21:24 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=87=AA=E5=B7=B1=E4=BB=BB=E5=8A=A1=E6=97=B6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=80=9A=E7=9F=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/job/business/DingtalkBusiness.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index e931eeca..bff1d7fe 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -720,7 +720,7 @@ public class DingtalkBusiness { if (token != null && token.length() > 0) { StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskProcessRecord.getStaffId()); - if (taskProcessRecord.getStaffId().longValue() != resultDetail.getId().longValue()) { + if (taskProcessRecord.getStaffId().longValue() != resultDetail.getStaffId().longValue()) { //自己评论自己的不允许给自己发消息 StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId()); From 8ec15087005ad1d32c6d8388ef19d11f381c25a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Dec 2020 18:22:41 +0800 Subject: [PATCH 02/17] fix --- .../performance/controller/ResultTaskController.java | 3 +++ .../modules/performance/dto/TaskProcessRecordDto.java | 11 +++++++++++ .../lz/modules/performance/req/ChangeTaskListReq.java | 3 +++ .../service/impl/TaskProcessRecordServiceImpl.java | 3 +++ .../mapper/performance/TaskProcessRecordMapper.xml | 4 ++-- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java index a617644a..e8eb4703 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java @@ -57,6 +57,9 @@ public class ResultTaskController extends AbstractController{ @ApiOperation("任务变更记录") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskProcessRecordDto.class)}) public R changeTaskList(@RequestBody ChangeTaskListReq req){ + if(req.getStaffId()==null){ + req.setStaffId(getUserId()); + } PageUtils pageUtils = taskProcessRecordService.selectTaskProcessRecordsByTaskId(req); return R.ok().put("data",pageUtils); } diff --git a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java index f23f05a1..b22ee336 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -44,6 +44,17 @@ public class TaskProcessRecordDto { @ApiModelProperty(value = "职位", name = "position") private String position; + @ApiModelProperty(value = "@员工id", name = "atStaffIds") + private String atStaffIds; + + @ApiModelProperty(value = "@员工姓名", name = "atStaffNames") + private String atStaffNames; + + @ApiModelProperty(value = "是不是自己的评论", name = "isSelf") + private int isSelf; + + private Long staffId; + private Long taskId; private Long detailId; diff --git a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java index af00aad4..d2b62ba7 100644 --- a/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChangeTaskListReq.java @@ -23,4 +23,7 @@ public class ChangeTaskListReq extends BasePage { @ApiModelProperty(value="0:记录 不传全部",name = "useType") private Integer useType; + + @ApiModelProperty(value="员工id",name = "staffId") + private Long staffId; } diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 92236da7..23c9aae6 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -140,6 +140,9 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setPosition(staffOccupationEntity.getPosition())); + if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) { + dto.setIsSelf(1); + } } } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index d2ec9871..f73dd25e 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -131,7 +131,7 @@ - select gmt_create,remark,label,type,use_type,task_id,detail_id from lz_task_process_record where is_delete = 0 + select gmt_create,remark,label,type,use_type,task_id,detail_id,staff_id,at_staff_ids,at_staff_names from lz_task_process_record where is_delete = 0 and use_type = #{useType} From 91fe46fdcc920c85f1a7cdd16620c8c050957176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Dec 2020 18:38:48 +0800 Subject: [PATCH 03/17] fix --- .../service/impl/ResultTaskServiceImpl.java | 23 +++++++++++++++---- .../impl/TaskProcessRecordServiceImpl.java | 11 +++++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 277421e0..d2ea4ebd 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -110,12 +110,25 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDto.setTypeDesc(byType.getDesc())); - if(finalStaffEntity !=null){ - resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); - resultTaskDto.setStaffName(finalStaffEntity.getName()); + if(taskProcessRecordDto.getUseType()==0){ + ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc())); + if(finalStaffEntity !=null){ + resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); + resultTaskDto.setStaffName(finalStaffEntity.getName()); + } } + if(taskProcessRecordDto.getUseType()==1){ + resultTaskDto.setTypeDesc(taskProcessRecordDto.getLabel()); + StaffEntity staffEntity1 = staffService.selectStaffById(taskProcessRecordDto.getStaffId()); + if(staffEntity1 !=null){ + resultTaskDto.setAvatar(staffEntity1.getAvatar()); + resultTaskDto.setStaffName(staffEntity1.getName()); + } + + } + + } }); diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 23c9aae6..f07449bd 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -140,8 +140,15 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setPosition(staffOccupationEntity.getPosition())); - if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) { - dto.setIsSelf(1); + if (dto.getUseType()==1 ) { + if(dto.getStaffId().equals(req.getStaffId())){ + dto.setIsSelf(1); + } + staffEntity = staffService.selectStaffById(dto.getStaffId()); + Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> { + dto.setAvatar(staffEntity12.getAvatar()); + dto.setStaffName(staffEntity12.getName()); + }); } } From 1563b63aa875f202aad3fe0afd56820df64d51a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Dec 2020 18:48:18 +0800 Subject: [PATCH 04/17] fix --- .../resources/mapper/performance/TaskProcessRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index f73dd25e..81cc78de 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -143,7 +143,7 @@ From 9b8c07648e957ff6c78091bb89c046243f9fb755 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 10:42:21 +0800 Subject: [PATCH 05/17] fix --- .../performance/service/impl/ResultTaskServiceImpl.java | 1 + .../performance/service/impl/TaskProcessRecordServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index d2ea4ebd..27fccbc4 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -124,6 +124,7 @@ public class ResultTaskServiceImpl extends ServiceImpl { dto.setAvatar(staffEntity12.getAvatar()); dto.setStaffName(staffEntity12.getName()); + StaffOccupationEntity staffOccupation= staffOccupationService.getStaffOccupationByStaffId(staffEntity12.getId()); + Optional.ofNullable(staffOccupation).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition())); }); + } } From 92520e8bd8f0ceec6bd0088017c35087b8154f9a 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 11:55:46 +0800 Subject: [PATCH 06/17] fix --- .../controller/ResultRecordController.java | 35 +++++++++++++++++++ .../flow/model/ResultRecordDetailDto.java | 14 ++++++++ 2 files changed, 49 insertions(+) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 7304d3f5..26fe63ac 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -48,6 +48,7 @@ import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -134,6 +135,8 @@ public class ResultRecordController extends AbstractController { private ResourceService resourceService; @Autowired private ChartResultService chartResultService; + @Autowired + private FlowStartService flowStartService; @Autowired private ResultTaskService resultTaskService; @@ -632,6 +635,38 @@ public class ResultRecordController extends AbstractController { resultRecordDetailDto.setWeight(weight); resultRecordDetailDto.setRecortModelDtos(resultRecortModelDtos); + //增加导出所需数据 + List depIds = Lists.newArrayList(resultRecord.getDepartmentId()); + Map> map = departmentsService.selectDepartmentTreeByDepIds(depIds); + + List names = map.get(Long.valueOf(resultRecord.getDepartmentId())); + if(CollectionUtils.isNotEmpty(names)){ + Collections.reverse(names); + int size = names.size(); + if(size>0 && StringUtils.isNotBlank(names.get(0))){ + resultRecordDetailDto.setDepartmentOne(names.get(0)); + } + if(size>1 && StringUtils.isNotBlank(names.get(1))){ + resultRecordDetailDto.setDepartmentTwo(names.get(1)); + } + if(size>2 && StringUtils.isNotBlank(names.get(2))){ + resultRecordDetailDto.setDepartmentThree(names.get(2)); + } + } + + FlowStart flowStart = flowStartService.selectFlowStartById(resultRecord.getStartId()); + if(flowStart != null){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + String startDate = sdf.format(flowStart.getStartTime()); + if(flowStart.getCycleType().intValue() != 0){ + String endDate = sdf.format(flowStart.getEndTime()); + resultRecordDetailDto.setAssessCycle(startDate + "至" + endDate ); + }else{ + resultRecordDetailDto.setAssessCycle(startDate); + } + } + + return R.ok().put("data", resultRecordDetailDto); } diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index fa661127..d36f1a29 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -85,6 +85,20 @@ public class ResultRecordDetailDto { List recortModelDtos; @ApiModelProperty(value = "当前指标权重之和", name = "weight") BigDecimal weight; + + //新增导出所需数据 + @ApiModelProperty(value = "考核周期", name = "assessCycle") + private String assessCycle; + //一级部门 + @ApiModelProperty(value = "一级部门", name = "departmentOne") + private String departmentOne; + //二级部门 + @ApiModelProperty(value = "二级部门", name = "departmentTwo") + private String departmentTwo; + //三级部门 + @ApiModelProperty(value = "三级部门", name = "departmentThree") + private String departmentThree; + /** * * @return From 43c590c94f39738265bf600e69f87a874dd9fbca Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 12:10:22 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98detai?= =?UTF-8?q?l=E7=9A=84staffid=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/service/impl/FlowStartServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index e15a8364..1d086531 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -260,7 +260,7 @@ public class FlowStartServiceImpl extends ServiceImpl> mustRole = new HashMap<>(); Map> selfMustRole = new HashMap<>(); List noticeStaff = new ArrayList<>(); - List resultRecords = new ArrayList<>(); + List startStartDtos = new ArrayList<>(); for (int n = 0; n < evaluationGroups.size(); n++ ) { EvaluationGroup evaluationGroup = evaluationGroups.get(n); @@ -307,11 +307,11 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Tue, 15 Dec 2020 13:55:15 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=B7=9F=E6=96=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=E9=98=B2=E6=AD=A2=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 26fe63ac..c7a70ce1 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -802,6 +802,7 @@ public class ResultRecordController extends AbstractController { resultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); List updateResultDetails = new ArrayList<>(); + List editResultDetails = new ArrayList<>();//涉及到修改的指标保存，方便后面生成修改记录 //获取当前绩效的节点 boolean isSetKeyResult = false; @@ -837,11 +838,15 @@ public class ResultRecordController extends AbstractController { BeanUtils.copyProperties(detailDto, resultDetail); if(!isSetKeyResult){ if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 + log.info("指标被删除了"); resultDetail.setIsBack(2); resultDetail.setBackId(resultDetail.getId()); updateResultDetails.add(resultDetail); + editResultDetails.add(resultDetail); }else if(resultDetail.getId() == null){ resultDetail.setIsBack(3);//新增 + editResultDetails.add(resultDetail);//插入数据库之后会生成id + log.info("新增指标"); }else { if(resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ //这里判断是否有更新，或者删除 @@ -852,15 +857,18 @@ public class ResultRecordController extends AbstractController { if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 + log.info("修改名称"); isUp = true; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 + log.info("修改关键结果"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 + log.info("修改权重"); isUp = true; } if(isUp){ @@ -868,6 +876,7 @@ public class ResultRecordController extends AbstractController { resultDetail1.setIsBack(2); resultDetail1.setBackId(resultDetail.getId()); inserts.add(resultDetail1); + editResultDetails.add(resultDetail1);//插入数据库之后会生成id } } } @@ -968,11 +977,11 @@ public class ResultRecordController extends AbstractController { if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ //修改评论信息 - updateResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ; + editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ; log.info("可能需要写入评论的内容条数{}", updateResultDetails.size()); //去重 - mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); - updateResultDetails = mapDetails.values().stream().collect(Collectors.toList()); + mapDetails = editResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); + editResultDetails = mapDetails.values().stream().collect(Collectors.toList()); if(!isSetKeyResult){ log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); if(updateResultDetails.size() > 0){ From 71617a486cfc61d4c8a507a1b0ee19b53a2224b0 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:04:52 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9D=83=E9=87=8D=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8F=8A=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index c7a70ce1..3c9d1194 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -791,7 +791,7 @@ public class ResultRecordController extends AbstractController { ResultRecord resultRecord = new ResultRecord(); BeanUtils.copyProperties(dto, resultRecord); resultRecord.setAllScore(resultRecord.getLastScore()); - List inserts = new ArrayList<>(); + //List inserts = new ArrayList<>(); List updates = new ArrayList<>(); List insertScores = new ArrayList<>(); @@ -951,16 +951,11 @@ public class ResultRecordController extends AbstractController { } } - //下面不限权重的，计算权重之和是否超标 - /*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 - && weight.compareTo(model.getWeight()) == 1){ - return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); - }*/ } //下面更新指标记录 - /*if(inserts.size() > 0){ + if(inserts.size() > 0){ resultDetailService.saveBatch(inserts); - }*/ + } if(updates.size() > 0){ resultDetailService.updateBatchById(updates); } From c9735ec966a34467e6f6a173c762361ac93ab706 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:07:21 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 3c9d1194..76658264 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -791,7 +791,7 @@ public class ResultRecordController extends AbstractController { ResultRecord resultRecord = new ResultRecord(); BeanUtils.copyProperties(dto, resultRecord); resultRecord.setAllScore(resultRecord.getLastScore()); - //List inserts = new ArrayList<>(); + List inserts = new ArrayList<>(); List updates = new ArrayList<>(); List insertScores = new ArrayList<>(); From b4d8a49e2f453c9555ea0baae5e0e58cf5bd39d6 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:14:04 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 76658264..1e8dcd88 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -979,14 +979,14 @@ public class ResultRecordController extends AbstractController { editResultDetails = mapDetails.values().stream().collect(Collectors.toList()); if(!isSetKeyResult){ log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); - if(updateResultDetails.size() > 0){ + if(editResultDetails.size() > 0){ updates.addAll(inserts); mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); String commandValue = ""; int commandIndex = 1; - for (ResultDetail resultDetail1:updateResultDetails + for (ResultDetail resultDetail1:editResultDetails ) { log.info("修改的对象为{}", resultDetail1); if(resultDetail1.getIsDelete().intValue() == 1){ From ac732bc9bd3dd11755dbe741731d7d4caf578e51 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:26:30 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5@=E7=9A=84=E6=9B=BF=E6=8D=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/job/business/DingtalkBusiness.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index bff1d7fe..07ea71f3 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -760,7 +760,7 @@ public class DingtalkBusiness { info.setEmployeeId(userIds); logger.info("推送的人员信息{}", info); dingTalkUtil.sendSingleActionCardMSG(appid, info, WorkMsgTypeEnum.TASK_REPLY_COMMENT.getTitle(), - WorkMsgTypeEnum.TASK_REPLY_COMMENT.getContent(), WorkMsgTypeEnum.TASK_REPLY_COMMENT.getBtnText(), url, token); + content, WorkMsgTypeEnum.TASK_REPLY_COMMENT.getBtnText(), url, token); m = 0; userIds = ""; continue; From 051a5b231fc139957cf47ff966805693e4aa3111 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:31:16 +0800 Subject: [PATCH 13/17] fix --- .../controller/ResultRecordController.java | 10 +++++++ .../flow/model/ResultRecordDetailDto.java | 2 ++ .../controller/ExportController.java | 29 ++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index c7a70ce1..197e525d 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -19,6 +19,7 @@ import com.lz.modules.app.resp.ResultDetailResp; import com.lz.modules.app.resp.Step; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; +import com.lz.modules.app.service.StaffOccupationService; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.entity.*; import com.lz.modules.flow.model.*; @@ -27,6 +28,7 @@ import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.dto.ResultTaskDto; +import com.lz.modules.performance.dto.StaffTypeDto; import com.lz.modules.performance.req.ResultUpdateTaskReq; import com.lz.modules.performance.entity.ResultTask; @@ -140,6 +142,8 @@ public class ResultRecordController extends AbstractController { @Autowired private ResultTaskService resultTaskService; + @Autowired + private StaffOccupationService staffOccupationService; @@ -654,6 +658,12 @@ public class ResultRecordController extends AbstractController { } } + List staffIds = Lists.newArrayList(resultRecord.getStaffId()); + List staffTypeDtos = staffOccupationService.selectStaffTypesByStaffIds(staffIds); + + if(CollectionUtils.isNotEmpty(staffTypeDtos)){ + resultRecordDetailDto.setPosition(staffTypeDtos.get(0).getPosition()); + } FlowStart flowStart = flowStartService.selectFlowStartById(resultRecord.getStartId()); if(flowStart != null){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index d36f1a29..855e101d 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -98,6 +98,8 @@ public class ResultRecordDetailDto { //三级部门 @ApiModelProperty(value = "三级部门", name = "departmentThree") private String departmentThree; + @ApiModelProperty(value = "职位", name = "position") + private String position; /** * 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 aeb7d1c3..9c801f47 100644 --- a/src/main/java/com/lz/modules/performance/controller/ExportController.java +++ b/src/main/java/com/lz/modules/performance/controller/ExportController.java @@ -5,20 +5,28 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.StyleSet; +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.flow.model.ResultDetailDto; import com.lz.modules.flow.model.ResultRecordDetailDto; import com.lz.modules.flow.model.ResultRecortModelDto; +import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.dto.RecordDetailExportDto; +import com.lz.modules.performance.enums.ResultFlowProcessEnum; import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.LevelDetailExportRes; import com.lz.modules.performance.service.ChartResultService; +import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -30,6 +38,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Field; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -43,9 +52,19 @@ import java.util.stream.Collectors; @Slf4j @Api(value="导出excel接口", tags={"导出表格"}) public class ExportController { + private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired private ChartResultService chartResultService; + @Autowired + DingtalkBusiness dingtalkBusiness; + @Autowired + private ResultRecordService resultRecordService; + @Autowired + private StaffService staffService; + static final List process = Lists.newArrayList(ResultFlowProcessEnum.TARGET.getStatus(), ResultFlowProcessEnum.CONFIRM.getStatus(), + ResultFlowProcessEnum.DO.getStatus(), ResultFlowProcessEnum.WRITE.getStatus()); @GetMapping("/export/levelDetail") @ApiOperation("导出等级详情") @@ -87,7 +106,15 @@ public class ExportController { } - + @GetMapping("/testDingTalkTask") + public void testDingTalkTask(){ + List ids = resultRecordService.selectStaffIdsByFlowProcess(process); + log.info(JSON.toJSONString(ids)); + List objects = Lists.newArrayList(313L,314L,294L); + List staffEntities = staffService.selectByIds(objects); + String res = dingtalkBusiness.sendTaskInputMsg(staffEntities); + logger.info("绩效任务填写通知响应：" + res); + } From 112cf8622c9ad9b2c20b4ae1c567d75bd92cac76 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:34:41 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E7=9A=AE=E8=AE=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=8C=87=E6=A0=87id=20detailId?= =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=89=93=E5=BC=80=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B0=83=E8=BD=AC=E5=88=B0detailId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/job/business/DingtalkBusiness.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 07ea71f3..6b37868a 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -710,7 +710,7 @@ public class DingtalkBusiness { } else { url += "?halokit=" + System.currentTimeMillis(); } - url += ("&detail=1&id=" + resultDetail.getRecordId()); + url += ("&detail=1&id=" + resultDetail.getRecordId() + "&detailId=" + resultDetail.getId()); url = URLEncoder.encode(url); From 5932ca768331088e279c092e26ccad66ca921112 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:36:05 +0800 Subject: [PATCH 15/17] fix --- .../lz/modules/performance/controller/ExportController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9c801f47..8b917f34 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 ids = resultRecordService.selectStaffIdsByFlowProcess(process); log.info(JSON.toJSONString(ids)); @@ -114,7 +114,7 @@ public class ExportController { List staffEntities = staffService.selectByIds(objects); String res = dingtalkBusiness.sendTaskInputMsg(staffEntities); logger.info("绩效任务填写通知响应：" + res); - } + }*/ From 6638f8fb8dbd7c9b277ad4a9c0e6998c107255da Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Dec 2020 14:44:22 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index b39f0150..cdac9256 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1063,7 +1063,7 @@ public class ResultRecordController extends AbstractController { } } }else{ - for (ResultDetail resultDetail1:updateResultDetails + for (ResultDetail resultDetail1:editResultDetails ) { if(resultDetail1.getIsBack().intValue() == 3){ resultDetail1.setIsBack(0); @@ -1072,7 +1072,7 @@ public class ResultRecordController extends AbstractController { } } } - resultDetailService.updateBatchById(updateResultDetails); + resultDetailService.updateBatchById(editResultDetails); } return R.ok(); 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 17/17] 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 ids = resultRecordService.selectStaffIdsByFlowProcess(process); - List staffEntities = staffService.selectByIds(ids); - String res = dingtalkBusiness.sendTaskInputMsg(staffEntities); - logger.info("绩效任务填写通知响应：" + res); + if(CollectionUtils.isNotEmpty(ids)){ + logger.info("通知人员id: " + JSON.toJSONString(ids)); + List 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 ids = resultRecordService.selectStaffIdsByFlowProcess(process); log.info(JSON.toJSONString(ids)); @@ -114,7 +114,7 @@ public class ExportController { List 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 @@