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-18 14:02:07 +08:00
commit 72ad2910be
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/lz/common/aspect/LogAspect.java
View File

@ -1,6 +1,7 @@
package com.lz.common.aspect; package com.lz.common.aspect;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.lz.common.exception.RRException;
import com.lz.common.utils.OrderUtil; import com.lz.common.utils.OrderUtil;
import com.lz.common.utils.R; import com.lz.common.utils.R;
import com.lz.common.utils.ServletUtils; import com.lz.common.utils.ServletUtils;
@ -111,8 +112,13 @@ public class LogAspect {
result = point.proceed(); result = point.proceed();
return result; return result;
} catch (Exception e) { } catch (Exception e) {
logger.error("controller error.", e); if(e instanceof RRException){
result = R.error(((RRException) e).getMsg());
}else{
result = R.error(); result = R.error();
}
logger.error("controller error.", e);
} finally { } finally {
if(cm.toString().toLowerCase().contains("captcha")){ if(cm.toString().toLowerCase().contains("captcha")){
logger.info(StringUtil.appendStrs( logger.info(StringUtil.appendStrs(

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

@ -826,22 +826,12 @@ public class ResultRecordController extends AbstractController {
boolean isSetKeyResult = false; boolean isSetKeyResult = false;
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2); List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2);
if(flowRecords.size() > 0){ if(flowRecords.size() > 0){
if(dto.getSave() != null && dto.getSave().intValue() ==1){ if(flowRecords.get(0).getFlowProcess().intValue() < 1){
if(flowRecords.get(0).getFlowProcess().intValue() < 1){//因为先提交流程在保存，所以这里写了小于2
//指定目标中
log.info("暂存制定目标中");
isSetKeyResult = true;
}
}else{
if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存，所以这里写了小于2
//指定目标中
log.info("制定目标中"); log.info("制定目标中");
isSetKeyResult = true; isSetKeyResult = true;
} }
} }
}
for (ResultRecortModelDto model:dto.getRecortModelDtos() for (ResultRecortModelDto model:dto.getRecortModelDtos()
) { ) {
@ -992,7 +982,7 @@ public class ResultRecordController extends AbstractController {
resultRecordService.updateResultRecordById(resultRecord); resultRecordService.updateResultRecordById(resultRecord);
String commentId = null; String commentId = null;
if(dto.getSave() == null && editResultDetails.size() > 0){//非暂存 if(dto.getSave() == null){//非暂存
//修改评论信息 //修改评论信息
log.info("修改了多少个指标{}", editResultDetails.size()); log.info("修改了多少个指标{}", editResultDetails.size());
editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ; editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ;