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-08 11:30:37 +08:00
commit a6d59d1345
1 changed files with 101 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,14 +771,14 @@ public class ResultRecordController extends AbstractController {
) { ) {
int index = 0; int index = 0;
BigDecimal weight = BigDecimal.ZERO; BigDecimal weight = BigDecimal.ZERO;
if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){ /*if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){
return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount());
} }*/
for (ResultDetailDto detailDto:model.getDetailDtos() for (ResultDetailDto detailDto:model.getDetailDtos()
) {//排序 ) {//排序
ResultDetail resultDetail = new ResultDetail(); ResultDetail resultDetail = new ResultDetail();
BeanUtils.copyProperties(detailDto, resultDetail); BeanUtils.copyProperties(detailDto, resultDetail);
if(!isSetKeyResult){
if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了
resultDetail.setIsBack(2); resultDetail.setIsBack(2);
resultDetail.setBackId(resultDetail.getId()); resultDetail.setBackId(resultDetail.getId());
@ -786,7 +786,7 @@ public class ResultRecordController extends AbstractController {
}else if(resultDetail.getId() == null){ }else if(resultDetail.getId() == null){
resultDetail.setIsBack(3);//新增 resultDetail.setIsBack(3);//新增
}else { }else {
if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ if(resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){
//这里判断是否有更新，或者删除 //这里判断是否有更新，或者删除
boolean isUp = false; boolean isUp = false;
ResultDetail resultDetail1 = null; ResultDetail resultDetail1 = null;
@ -813,9 +813,9 @@ public class ResultRecordController extends AbstractController {
inserts.add(resultDetail1); inserts.add(resultDetail1);
} }
} }
} }
}
resultDetail.setPriority(index); resultDetail.setPriority(index);
@ -884,6 +884,7 @@ public class ResultRecordController extends AbstractController {
//去重 //去重
mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e)); mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e));
updateResultDetails = mapDetails.values().stream().collect(Collectors.toList()); updateResultDetails = mapDetails.values().stream().collect(Collectors.toList());
if(!isSetKeyResult){
log.info("实际需要写入评论的内容条数{}", updateResultDetails.size()); log.info("实际需要写入评论的内容条数{}", updateResultDetails.size());
if(updateResultDetails.size() > 0){ if(updateResultDetails.size() > 0){
updates.addAll(inserts); updates.addAll(inserts);
@ -945,12 +946,21 @@ public class ResultRecordController extends AbstractController {
} }
if(commandValue.length() > 0){ if(commandValue.length() > 0){
log.info("需要写入评论，具体呢容为{}", commandValue); log.info("需要写入评论，具体呢容为{}", commandValue);
resultDetailService.updateBatchById(updateResultDetails);
resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue); resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue);
} }
} }
}else{
for (ResultDetail resultDetail1:updateResultDetails
) {
if(resultDetail1.getIsBack().intValue() == 3){
resultDetail1.setIsBack(0);
}else{
resultDetail1.setIsBack(1);
}
}
}
resultDetailService.updateBatchById(updateResultDetails);
} }
return R.ok(); return R.ok();
@ -1281,7 +1291,7 @@ public class ResultRecordController extends AbstractController {
recordFile.setIsDelete(1); recordFile.setIsDelete(1);
recordFileService.updateRecordFileById(recordFile); recordFileService.updateRecordFileById(recordFile);
return R.ok(); return R.ok();
} }lzresultrecord/saveDetail
/** /**