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:
杜建超 2020-12-15 14:31:21 +08:00
commit 370ca2a9b4
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -961,16 +961,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); resultDetailService.saveBatch(inserts);
}*/ }
if(updates.size() > 0){ if(updates.size() > 0){
resultDetailService.updateBatchById(updates); resultDetailService.updateBatchById(updates);
} }
@ -994,14 +989,14 @@ public class ResultRecordController extends AbstractController {
editResultDetails = mapDetails.values().stream().collect(Collectors.toList()); editResultDetails = mapDetails.values().stream().collect(Collectors.toList());
if(!isSetKeyResult){ if(!isSetKeyResult){
log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); log.info("实际需要写入评论的内容条数{}", updateResultDetails.size());
if(updateResultDetails.size() > 0){ if(editResultDetails.size() > 0){
updates.addAll(inserts); updates.addAll(inserts);
mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); mapDetails = updates.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e));
String commandValue = ""; String commandValue = "";
int commandIndex = 1; int commandIndex = 1;
for (ResultDetail resultDetail1:updateResultDetails for (ResultDetail resultDetail1:editResultDetails
) { ) {
log.info("修改的对象为{}", resultDetail1); log.info("修改的对象为{}", resultDetail1);
if(resultDetail1.getIsDelete().intValue() == 1){ if(resultDetail1.getIsDelete().intValue() == 1){

2
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -760,7 +760,7 @@ public class DingtalkBusiness {
info.setEmployeeId(userIds); info.setEmployeeId(userIds);
logger.info("推送的人员信息{}", info); logger.info("推送的人员信息{}", info);
dingTalkUtil.sendSingleActionCardMSG(appid, info, WorkMsgTypeEnum.TASK_REPLY_COMMENT.getTitle(), 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; m = 0;
userIds = ""; userIds = "";
continue; continue;