|
@@ -15,6 +15,7 @@ import oracle.jdbc.proxy.annotation.Post;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
@@ -31,6 +32,9 @@ public class StatisticalReportController extends BaseRESTfulController {
|
|
|
@Autowired
|
|
|
StatisticalReportImpl statisticalReportService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ StatisticalReportMapper statisticalReportMapper;
|
|
|
+
|
|
|
@Autowired
|
|
|
ColumnDataUtil columnDataUtil;
|
|
|
|
|
@@ -737,6 +741,10 @@ public class StatisticalReportController extends BaseRESTfulController {
|
|
|
if(carrierSsoId != null){
|
|
|
if(!"null".equals(carrierSsoId) && carrierSsoId != null){
|
|
|
map.put("carrierSsoId", carrierSsoId);
|
|
|
+ String realSsoId = statisticalReportMapper.getRealSsoId(carrierSsoId);
|
|
|
+ if(realSsoId != null) {
|
|
|
+ map.put("carrierSsoId",realSsoId);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (receiveName != null && !"null".equals(receiveName)) {
|
|
@@ -1497,6 +1505,7 @@ public class StatisticalReportController extends BaseRESTfulController {
|
|
|
if(carrierSsoId != null){
|
|
|
if(!"null".equals(carrierSsoId) && carrierSsoId != null){
|
|
|
map.put("carrierSsoId", carrierSsoId);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if (receiveName != null && !"null".equals(receiveName)) {
|