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-10-29 11:50:04 +08:00
commit 8dd1c6591a
1 changed files with 12 additions and 1 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

@ -480,17 +480,28 @@ public class ResultRecordController extends AbstractController {
for (ResultRecortModelDto model:dto.getRecortModelDtos()
) {
int index = 0;
BigDecimal weight = BigDecimal.ZERO;
for (ResultDetailDto detailDto:model.getDetailDtos()
) {//排序
ResultDetail resultDetail = new ResultDetail();
BeanUtils.copyProperties(detailDto, resultDetail);
resultDetail.setPriority(index);
index++;
if(resultDetail.getId() != null){
updates.add(resultDetail);
}else{
resultDetail.setStaffId(resultRecord.getStaffId());
resultDetail.setRecordId(resultRecord.getId());
resultDetail.setType(model.getType());
inserts.add(resultDetail);
}
if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){
weight = weight.add(resultDetail.getCheckWeight());
}
}
if(weight.compareTo(model.getWeight()) == 1){
return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
}
}
if(inserts.size() > 0){
@ -545,7 +556,7 @@ public class ResultRecordController extends AbstractController {
return R.ok("删除成功");
}
/**
/**lzresultrecord/saveDetail
* 信息
*/
@RequestMapping("/recordIdsSubmit")