定时同步水量优化(换表)

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayReportController.java

@@ -37,7 +37,7 @@ public class PayReportController {
     @GetMapping("/getPayTransactiondetailsReport")
     public AjaxMessage<Pagination<PayTransactiondetailsReportDto>> getPayTransactiondetailsReport(
             @ApiParam(value = "机构ID", required = false) @RequestParam(required = false) Integer officeId,
-            @ApiParam(value = "支付方式，字典类：type=支付方式", required = false) @RequestParam(required = false) Integer payway,
+            @ApiParam(value = "支付方式ID，字典类：type=支付方式", required = false) @RequestParam(required = false) Integer payway,
             @ApiParam(value = "收费员ID",required = false)@RequestParam(required = false) Integer operateId,
             @ApiParam(value = "开始时间yyyyMMddhhmmss", required = false) @RequestParam(required = false) String beginTime,
             @ApiParam(value = "结束时间yyyyMMddhhmmss", required = false) @RequestParam(required = false) String endTime,

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/AmountSynByDayServiceImpl.java

@@ -164,7 +164,7 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
                             }
 
                             //有换表记录且换表时间在两次同步之间 用水量=(换表中的旧表止度-上次抄表止度) + (本次止度-换表中的新表起度)
-                            Boolean replace = false;
+                            boolean replace = false;
                             if(replaceMeterDto != null){
 
                                 LocalDateTime currTime = LocalDateTime.ofInstant(meterReadRecord.getReadTime().toInstant(),ZoneId.systemDefault()); //本次抄表时间
@@ -184,7 +184,7 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
                                 }
                             }
 
-                            if(!replace.booleanValue()){
+                            if(!replace){
                                 if (readingNew.compareTo(tempReading) > 0){
                                     Amount = Amount.add(readingNew.subtract(tempReading));
                                 }

smart-city-platform/src/main/resources/mapper/pay/AmountWaterUsedAmountMapper.xml

@@ -449,24 +449,28 @@ SELECT
 
 	<select id ="getRepalceRecord" resultMap="ReplaceMeterMap">
 		SELECT
-		pc.device_id as deviceId,
-		pc.date_create as replaceTime,
-		pc.new_begin_wsv as newBegin,
-		pc.old_end_wsv as oldEnd
-		FROM sc_water_meter_replace_log pc
-		left JOIN
-			(select
-			pc2.id,pc2.device_id,MAX(pc2.date_create) as dateCreate
-			FROM sc_water_meter_replace_log pc2
-			WHERE pc2.device_id in
-			<foreach collection="list" item="listItem" open="(" close=")" separator=",">
-				<if test="listItem != null and listItem != ''">
-					#{listItem}
-				</if>
-			</foreach>
-
-			GROUP BY pc2.device_id,pc2.id) b
-		on pc.id=b.id
+			pc.device_id AS deviceId,
+			pc.date_create AS replaceTime,
+			pc.new_begin_wsv AS newBegin,
+			pc.old_end_wsv AS oldEnd
+		FROM
+		(
+			SELECT
+				pc2.id,
+				MAX( pc2.date_create ) AS dateCreate
+			FROM
+				sc_water_meter_replace_log pc2
+			WHERE
+				pc2.device_id IN
+				<foreach collection="list" item="listItem" open="(" close=")" separator=",">
+					<if test="listItem != null and listItem != ''">
+						#{listItem}
+					</if>
+				</foreach>
+			GROUP BY
+			pc2.id
+		) a
+		LEFT JOIN sc_water_meter_replace_log pc ON a.id = pc.id
 
 	</select>