修改再制定目标是可能的提示修改指标
This commit is contained in:
parent
c333fc78a4
commit
c029461eee
@ -882,73 +882,83 @@ public class ResultRecordController extends AbstractController {
|
||||
//去重
|
||||
mapDetails = updateResultDetails.stream().collect(Collectors.toMap(ResultDetail::getId, Function.identity(), (e, r) -> e));
|
||||
updateResultDetails = mapDetails.values().stream().collect(Collectors.toList());
|
||||
log.info("实际需要写入评论的内容条数{}", updateResultDetails.size());
|
||||
if(updateResultDetails.size() > 0){
|
||||
updates.addAll(inserts);
|
||||
if(!isSetKeyResult){
|
||||
log.info("实际需要写入评论的内容条数{}", updateResultDetails.size());
|
||||
if(updateResultDetails.size() > 0){
|
||||
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 = "";
|
||||
int commandIndex = 1;
|
||||
for (ResultDetail resultDetail1:updateResultDetails
|
||||
) {
|
||||
log.info("修改的对象为{}", resultDetail1);
|
||||
if(resultDetail1.getIsDelete().intValue() == 1){
|
||||
commandValue += (commandIndex + ":(删除) 指标" + resultDetail1.getTarget() + "\n");
|
||||
commandIndex++;
|
||||
resultDetail1.setIsBack(1);
|
||||
}else if(resultDetail1.getIsBack().intValue() == 3){
|
||||
commandValue += (commandIndex + ":(新增) 指标" + resultDetail1.getTarget() + "\n");
|
||||
commandIndex++;
|
||||
resultDetail1.setIsBack(0);
|
||||
}else{
|
||||
String commandValue = "";
|
||||
int commandIndex = 1;
|
||||
for (ResultDetail resultDetail1:updateResultDetails
|
||||
) {
|
||||
log.info("修改的对象为{}", resultDetail1);
|
||||
if(resultDetail1.getIsDelete().intValue() == 1){
|
||||
commandValue += (commandIndex + ":(删除) 指标" + resultDetail1.getTarget() + "\n");
|
||||
commandIndex++;
|
||||
resultDetail1.setIsBack(1);
|
||||
}else if(resultDetail1.getIsBack().intValue() == 3){
|
||||
commandValue += (commandIndex + ":(新增) 指标" + resultDetail1.getTarget() + "\n");
|
||||
commandIndex++;
|
||||
resultDetail1.setIsBack(0);
|
||||
}else{
|
||||
|
||||
ResultDetail resultDetail = mapDetails.get(resultDetail1.getBackId());
|
||||
if(resultDetail != null){
|
||||
log.info("修改后的对象为{}", resultDetail1);
|
||||
boolean isUp = false;
|
||||
String value = "";
|
||||
String heard = "";
|
||||
if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
|
||||
//打上标识
|
||||
value += ("(修改) 名称:" +
|
||||
resultDetail1.getTarget()+ " \n(为):\n" + resultDetail.getTarget() + "\n");
|
||||
isUp = true;
|
||||
ResultDetail resultDetail = mapDetails.get(resultDetail1.getBackId());
|
||||
if(resultDetail != null){
|
||||
log.info("修改后的对象为{}", resultDetail1);
|
||||
boolean isUp = false;
|
||||
String value = "";
|
||||
String heard = "";
|
||||
if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
|
||||
//打上标识
|
||||
value += ("(修改) 名称:" +
|
||||
resultDetail1.getTarget()+ " \n(为):\n" + resultDetail.getTarget() + "\n");
|
||||
isUp = true;
|
||||
|
||||
}else{
|
||||
heard = "指标:" + resultDetail1.getTarget() + "\n";
|
||||
}
|
||||
if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
|
||||
//打上标识
|
||||
value += ("(修改) 考核标准:" +
|
||||
resultDetail1.getKeyResult() + "\n(为):\n" + resultDetail.getKeyResult() + "\n");
|
||||
isUp = true;
|
||||
}
|
||||
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
|
||||
//打上标识
|
||||
value += ("(修改) 权重:" +
|
||||
resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\n(为):\n"
|
||||
+ resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() +
|
||||
"%\n");
|
||||
isUp = true;
|
||||
}
|
||||
if(isUp){
|
||||
commandValue += (commandIndex + ":" + heard + value);
|
||||
commandIndex++;
|
||||
resultDetail1.setIsBack(1);
|
||||
}else{
|
||||
heard = "指标:" + resultDetail1.getTarget() + "\n";
|
||||
}
|
||||
if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
|
||||
//打上标识
|
||||
value += ("(修改) 考核标准:" +
|
||||
resultDetail1.getKeyResult() + "\n(为):\n" + resultDetail.getKeyResult() + "\n");
|
||||
isUp = true;
|
||||
}
|
||||
if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
|
||||
//打上标识
|
||||
value += ("(修改) 权重:" +
|
||||
resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\n(为):\n"
|
||||
+ resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() +
|
||||
"%\n");
|
||||
isUp = true;
|
||||
}
|
||||
if(isUp){
|
||||
commandValue += (commandIndex + ":" + heard + value);
|
||||
commandIndex++;
|
||||
resultDetail1.setIsBack(1);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if(commandValue.length() > 0){
|
||||
log.info("需要写入评论,具体呢容为{}", commandValue);
|
||||
|
||||
resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue);
|
||||
}
|
||||
}
|
||||
if(commandValue.length() > 0){
|
||||
log.info("需要写入评论,具体呢容为{}", commandValue);
|
||||
resultDetailService.updateBatchById(updateResultDetails);
|
||||
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();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user