diff --git a/src/main/java/com/zteits/oa/configuration/WebMvcConfig.java b/src/main/java/com/zteits/oa/configuration/WebMvcConfig.java index 94582a6..1a6ac3c 100644 --- a/src/main/java/com/zteits/oa/configuration/WebMvcConfig.java +++ b/src/main/java/com/zteits/oa/configuration/WebMvcConfig.java @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import com.zteits.oa.configuration.auth.AuthInterceptor; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @Configuration @EnableWebMvc @@ -23,8 +23,6 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter { return new AuthInterceptor(); } - - @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { diff --git a/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java b/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java index 8a380ce..fec1d4d 100644 --- a/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java +++ b/src/main/java/com/zteits/oa/configuration/auth/AuthInterceptor.java @@ -13,7 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import com.alibaba.fastjson.JSONObject; import com.zteits.oa.api.base.annotation.NoAuth; @@ -21,6 +20,7 @@ import com.zteits.oa.api.base.bean.BizResult; import com.zteits.oa.api.base.constants.ErrorType; import com.zteits.oa.api.base.constants.SessionEnum; import com.zteits.oa.api.dto.asraop.LoginOathRes; +import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; /** * Copyright: Copyright (c) 2017 zteits @@ -121,4 +121,3 @@ public class AuthInterceptor extends HandlerInterceptorAdapter { } - diff --git a/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java b/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java index a3e51a4..95fa40e 100644 --- a/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java +++ b/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java @@ -98,6 +98,15 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService { BeanUtils.copyProperties(asraDailyDO, asraProjectAndPersonNumDTO); if(!personNumDTOList.contains(asraProjectAndPersonNumDTO)){ personNumDTOList.add(asraProjectAndPersonNumDTO); + }else{ + for (AsraProjectAndPersonNumDTO getAsraProjectAndPersonNumDTO:personNumDTOList){ + if(getAsraProjectAndPersonNumDTO == null){ + continue; + } + if(getAsraProjectAndPersonNumDTO.getProjectId().equals(asraDailyDO.getProjectId())){ + getAsraProjectAndPersonNumDTO.setCommitPersonNum(getAsraProjectAndPersonNumDTO.getCommitPersonNum()+asraDailyDO.getCommitPersonNum()); + } + } } } //2.添加明细