值际对标功能修改

src/main/java/com/gyee/frame/model/custom/ConditionVo.java

@@ -4,7 +4,7 @@ public class ConditionVo {
 
 	private String beginDate;
 	private String endDate;
-	String wpId;
+	private String wpId;
 
 	public String getWpId() {
 		return wpId;

src/main/java/com/gyee/frame/service/ActivePowerDataService.java

@@ -109,7 +109,7 @@ public class ActivePowerDataService implements BaseService<ActivePowerData, Acti
 		}
 
 
-		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
 		List<ActivePowerData> apls= activePowerDataMapper.selectByExample(example);
 
@@ -157,7 +157,7 @@ public class ActivePowerDataService implements BaseService<ActivePowerData, Acti
 
 		criteria.andWindturbineidIn(wtIds);
 
-		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
 		List<ActivePowerData> apls= activePowerDataMapper.selectByExample(example);
 

src/main/java/com/gyee/frame/service/FaultEliminateDefectsService.java

@@ -143,7 +143,7 @@ public class FaultEliminateDefectsService implements BaseService<FaultEliminateD
 		if(beginDate!=null && endDate!=null ){
 
 
-			criteria.andDatetimeGreaterThanOrEqualTo(beginDate).andDatetimeLessThanOrEqualTo(endDate);
+			criteria.andDatetimeGreaterThanOrEqualTo(beginDate).andDatetimeLessThan(endDate);
 			list= faultEliminateDefectsMapper.selectByExample(example);
 		}
 		if(list!=null)
@@ -194,7 +194,7 @@ public class FaultEliminateDefectsService implements BaseService<FaultEliminateD
 		if(beginDate!=null && endDate!=null ){
 
 
-			criteria.andDatetimeGreaterThanOrEqualTo(beginDate).andDatetimeLessThanOrEqualTo(endDate);
+			criteria.andDatetimeGreaterThanOrEqualTo(beginDate).andDatetimeLessThan(endDate);
 			list= faultEliminateDefectsMapper.selectByExample(example);
 		}
 		if(list!=null)
@@ -256,7 +256,7 @@ public class FaultEliminateDefectsService implements BaseService<FaultEliminateD
 		if(beginDate!=null && endDate!=null ){
 
 
-			criteria.andDatetimeGreaterThanOrEqualTo(beginDate).andDatetimeLessThanOrEqualTo(endDate);
+			criteria.andDatetimeGreaterThanOrEqualTo(beginDate).andDatetimeLessThan(endDate);
 			list= faultEliminateDefectsMapper.selectByExample(example);
 		}
 		if(list!=null)

src/main/java/com/gyee/frame/service/StatetransitionratesService.java

@@ -142,7 +142,7 @@ public class StatetransitionratesService implements BaseService<Statetransitionr
 		if(beginDate!=null && endDate!=null){
 
 
-			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 			list= statetransitionratesMapper.selectByExample(example);
 		}
 		if(list!=null)
@@ -246,7 +246,7 @@ public class StatetransitionratesService implements BaseService<Statetransitionr
 		if(beginDate!=null && endDate!=null){
 
 
-			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 			list= statetransitionratesMapper.selectByExample(example);
 		}
 		if(list!=null)
@@ -331,7 +331,7 @@ public class StatetransitionratesService implements BaseService<Statetransitionr
 		if(beginDate!=null && endDate!=null){
 
 
-			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 			list= statetransitionratesMapper.selectByExample(example);
 		}
 

src/main/java/com/gyee/frame/service/WarningInfoDayService.java

@@ -287,7 +287,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 		WarningInfoDayExample.Criteria criteria =example.createCriteria();
 
-		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
 		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
 
@@ -383,7 +383,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 		WarningInfoDayExample.Criteria criteria =example.createCriteria();
 
-		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
 		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
 
@@ -498,7 +498,7 @@ public class WarningInfoDayService implements BaseService<WarningInfoDay, Warnin
 
 		WarningInfoDayExample.Criteria criteria =example.createCriteria();
 
-		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
 		List<WarningInfoDay> wils=warningInfoDayMapper.selectByExample(example);
 

src/main/java/com/gyee/frame/service/Windpowerinfoday3Service.java

@@ -680,7 +680,7 @@ public class Windpowerinfoday3Service implements BaseService<Windpowerinfoday3,
 		}
 
 		if(beginDate!=null && endDate!=null ){
-			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 		}
 		if(StringUtils.isNotEmpty(location))
 		{
@@ -713,7 +713,7 @@ public class Windpowerinfoday3Service implements BaseService<Windpowerinfoday3,
 		}
 
 		if(beginDate!=null && endDate!=null ){
-			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 		}
 		if(StringUtils.isNotEmpty(location))
 		{

src/main/java/com/gyee/frame/service/Windturbineinfoday3Service.java

@@ -139,7 +139,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
             if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 
 
-                example.createCriteria().andWindpowerstationidLike("%FDC").andWindturbineidEqualTo(wtId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                example.createCriteria().andWindpowerstationidLike("%FDC").andWindturbineidEqualTo(wtId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
                 list = windturbineinfoday3Mapper.selectByExample(example);
             } else {
                 list = new ArrayList<>();
@@ -164,7 +164,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
             Windturbineinfoday3Example.Criteria criteia = example.createCriteria();
             if (StringUtils.isNotEmpty(wpIds)) {
 
-                criteia.andWindpowerstationidEqualTo(wpIds).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                criteia.andWindpowerstationidEqualTo(wpIds).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
                 if (StringUtils.isNotEmpty(pjIds)) {
                     String[] projectarr = pjIds.split(",");
                     List<String> projectls = Arrays.asList(projectarr);
@@ -178,7 +178,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
                 }
 
             } else {
-                criteia.andWindpowerstationidLike("%FDC%").andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                criteia.andWindpowerstationidLike("%FDC%").andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
             }
 
@@ -621,7 +621,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
                     if (StringUtils.notEmp(lineIds) && !lineIds.equals("undefined")) {
                         criteria.andLineidEqualTo(lineIds);
                     }
-                    criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                    criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
                     ls = windturbineinfoday3Mapper.selectByExample(example);
                 } else {
                     ls = new ArrayList<>();
@@ -823,7 +823,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
             criteria.andWindturbineidIn(wtids);
         }
         if(beginDate!=null && endDate!=null ){
-            criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+            criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
         }
 
 
@@ -852,7 +852,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
             if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 
 
-                criteria.andWindpowerstationidLike("%FDC").andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                criteria.andWindpowerstationidLike("%FDC").andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
                 ls = windturbineinfoday3Mapper.selectByExample(example);
             } else {
                 ls = new ArrayList<>();
@@ -1006,7 +1006,7 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
             if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 
 
-                criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
             }
             if(StringUtils.notEmp(wpId))

src/main/java/com/gyee/frame/service/WindturbineinfodayService.java

@@ -143,7 +143,7 @@ public class WindturbineinfodayService implements BaseService<WindTurbineInfoDay
 			if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)){
 
 
-				example.createCriteria().andWindpowerstationidLike("%FDC").andWindturbineidEqualTo(wtId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+				example.createCriteria().andWindpowerstationidLike("%FDC").andWindturbineidEqualTo(wtId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 				list= windTurbineInfoDayMapper.selectByExample(example);
 			}else
 			{
@@ -172,7 +172,7 @@ public class WindturbineinfodayService implements BaseService<WindTurbineInfoDay
 		}
 
 
-		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 
 		List<WindTurbineInfoDay> wils=windTurbineInfoDayMapper.selectByExample(example);