|
@@ -46,10 +46,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos =new ArrayList<>();
|
|
|
|
|
|
- if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
|
|
|
- {
|
|
|
+
|
|
|
vos =contrastWpService.benchmarkLossList(wpId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
|
BenchmarkUtil bu = new BenchmarkUtil();
|
|
@@ -75,10 +74,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos =new ArrayList<>();
|
|
|
|
|
|
- if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
|
|
|
- {
|
|
|
+
|
|
|
vos =contrastWpService.benchmarkWpList(wpId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
|
BenchmarkUtil bu = new BenchmarkUtil();
|
|
@@ -103,10 +101,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos =new ArrayList<>();
|
|
|
|
|
|
- if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
|
|
|
- {
|
|
|
+
|
|
|
vos =contrastWtService.benchmarkWtList(wpId,wtId,beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
|
BenchmarkUtil bu = new BenchmarkUtil();
|
|
|
vos = bu.getBenchMarkOrder(vos);
|
|
@@ -132,10 +129,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos =new ArrayList<>();
|
|
|
|
|
|
- if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
|
|
|
- {
|
|
|
+
|
|
|
vos =contrastWpService.benchmarkWpOutList(wpId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
@@ -178,10 +174,9 @@ public class ContrastController {
|
|
|
Date end = DateUtils.parseDate(endDate);
|
|
|
|
|
|
List<DataVo> vos =new ArrayList<>();
|
|
|
- if(StringUtils.isNotEmpty(wpId) && StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate))
|
|
|
- {
|
|
|
+
|
|
|
vos = contrastWpService.findWpPowerChat(wpids, begin, end);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
|
return AjaxResult.successData(AjaxStatus.success.code, vos);
|
|
@@ -200,10 +195,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos =new ArrayList<>();
|
|
|
|
|
|
- if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
|
|
|
- {
|
|
|
+
|
|
|
vos =contrastPjService.benchmarkPjList(wpId,pjId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
@@ -229,10 +223,9 @@ public class ContrastController {
|
|
|
public AjaxResult findPjPowerChat(String wpId,String pjId, String beginDate, String endDate) throws Exception {
|
|
|
|
|
|
List<DataVo> vos =new ArrayList<>();
|
|
|
- if(StringUtils.isNotEmpty(wpId) && StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate))
|
|
|
- {
|
|
|
+
|
|
|
vos = contrastPjService.findPjPowerChat(wpId,pjId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
@@ -252,10 +245,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos =new ArrayList<>();
|
|
|
|
|
|
- if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
|
|
|
- {
|
|
|
+
|
|
|
vos =contrastLnService.benchmarkLnList(wpId,lnId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
@@ -281,11 +273,10 @@ public class ContrastController {
|
|
|
public AjaxResult findLnPowerChat(String wpId,String lnId, String beginDate, String endDate) throws Exception {
|
|
|
|
|
|
List<DataVo> vos =new ArrayList<>();
|
|
|
- if(StringUtils.isNotEmpty(wpId) && StringUtils.isNotEmpty(beginDate) && StringUtils.isNotEmpty(endDate))
|
|
|
- {
|
|
|
+
|
|
|
|
|
|
vos = contrastLnService.findLnPowerChat(wpId,lnId, beginDate, endDate);
|
|
|
- }
|
|
|
+
|
|
|
if (vos != null && !vos.isEmpty()) {
|
|
|
return AjaxResult.successData(AjaxStatus.success.code, vos);
|
|
|
} else {
|
|
@@ -328,10 +319,9 @@ public class ContrastController {
|
|
|
|
|
|
List<BenchMarkVo> vos=null;
|
|
|
// List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId,beginDate, endDate);
|
|
|
- if (StringUtils.notEmp(wpId) && StringUtils.notEmp(year) && StringUtils.notEmp(month) && StringUtils.notEmp(zjs)) {
|
|
|
|
|
|
contrastZjService.addBenchmarkZj(request, wpId, year, month, zjs);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
if (null != request.getSession().getAttribute("bmvos")) {
|
|
|
vos = (List<BenchMarkVo>) request.getSession().getAttribute("bmvos");
|