更新文件 WechatScanLoginServiceImpl.java

src/main/java/com/template/services/impl/WechatScanLoginServiceImpl.java

@@ -190,9 +190,10 @@ public class WechatScanLoginServiceImpl implements WechatScanLoginService {
 		List<EnergyTj> waterl = wechatScanLoginMapper.getWaterTjByMonAndBuild(month);
 		List<EnergyTj> elcl = wechatScanLoginMapper.getElcTjByMonAndBuild(month);
 		for (int i = 0; i < waterl.size(); i++) {
-			EnergyTj e = wechatScanLoginMapper.getTjByMon(waterl.get(i).getName(),month,"0");
+			EnergyTj e = wechatScanLoginMapper.getTjByMon(waterl.get(i).getName(),waterl.get(i).getMeterName(),month,"0");
 			if (e==null){
-				waterl.get(i).setType(0);waterl.get(i).setDate(month);
+				waterl.get(i).setType(0);
+				waterl.get(i).setDate(month);
 				wechatScanLoginMapper.insertMonthMeter(waterl.get(i));
 			} else {
 				waterl.get(i).setId(e.getId());
@@ -200,9 +201,10 @@ public class WechatScanLoginServiceImpl implements WechatScanLoginService {
 			}
 		}
 		for (int j = 0; j < elcl.size(); j++) {
-			EnergyTj w = wechatScanLoginMapper.getTjByMon(elcl.get(j).getName(),month,"1");
+			EnergyTj w = wechatScanLoginMapper.getTjByMon(elcl.get(j).getName(),elcl.get(j).getMeterName(),month,"1");
 			if (w==null){
-				elcl.get(j).setType(1);elcl.get(j).setDate(month);
+				elcl.get(j).setType(1);
+				elcl.get(j).setDate(month);
 				wechatScanLoginMapper.insertMonthMeter(elcl.get(j));
 			} else {
 				elcl.get(j).setId(w.getId());
@@ -216,9 +218,10 @@ public class WechatScanLoginServiceImpl implements WechatScanLoginService {
 		List<EnergyTj> waterl = wechatScanLoginMapper.getWaterTjByDayAndBuild(day);
 		List<EnergyTj> elcl = wechatScanLoginMapper.getElcTjByDayAndBuild(day);
 		for (int i = 0; i < waterl.size(); i++) {
-			EnergyTj w = wechatScanLoginMapper.getTjByDay(waterl.get(i).getName(),day,"0");
+			EnergyTj w = wechatScanLoginMapper.getTjByDay(waterl.get(i).getName(),waterl.get(i).getMeterName(),day,"0");
 			if (w==null){
-				waterl.get(i).setType(0);waterl.get(i).setDate(day);
+				waterl.get(i).setType(0);
+				waterl.get(i).setDate(day);
 				wechatScanLoginMapper.insertDayMeter(waterl.get(i));
 			} else {
 				waterl.get(i).setId(w.getId());
@@ -226,9 +229,10 @@ public class WechatScanLoginServiceImpl implements WechatScanLoginService {
 			}
 		}
 		for (int j = 0; j < elcl.size(); j++) {
-			EnergyTj e = wechatScanLoginMapper.getTjByDay(elcl.get(j).getName(),day,"1");
+			EnergyTj e = wechatScanLoginMapper.getTjByDay(elcl.get(j).getName(),elcl.get(j).getMeterName(),day,"1");
 			if (e==null){
-				elcl.get(j).setType(1);elcl.get(j).setDate(day);
+				elcl.get(j).setType(1);
+				elcl.get(j).setDate(day);
 				wechatScanLoginMapper.insertDayMeter(elcl.get(j));
 			} else {
 				elcl.get(j).setId(e.getId());