修改营收空值数据

sms_water/src/main/java/com/huaxu/controller/RevenueController.java

@@ -187,6 +187,7 @@ public class RevenueController {
             //修改售水数据
             for (MonthSellwaterEntity entity : monthRevenueDto.getMonthSellList()) {
                 entity.setUpdateBy(loginUser.getUsername());
+                entity.setCollectDate(sdf.parse(monthRevenueDto.getCollectDateString()));
                 if(entity.getWaterUsage() != null){
                     entity.setWaterUsage(entity.getWaterUsage()/10000);
                 }
@@ -194,7 +195,6 @@ public class RevenueController {
                     entity.setTenantId(loginUser.getTenantId());
                     entity.setCreateBy(loginUser.getUsername());
                     entity.setCompanyOrgId(monthRevenueDto.getCompanyOrgId());
-                    entity.setCollectDate(sdf.parse(monthRevenueDto.getCollectDateString()));
                     revenueService.insertSellWater(entity);
                 }else{
                     revenueService.updateSellWater(entity);

sms_water/src/main/resources/mapper/RevenueMapper.xml

@@ -244,9 +244,7 @@
             <if test="meterReadingCount != null">
                 meter_reading_count  = #{meterReadingCount},
             </if>
-            <if test="meterReadingUsage != null">
-                meter_reading_usage  = #{meterReadingUsage},
-            </if>
+            meter_reading_usage  = #{meterReadingUsage},
             <if test="chargingUsage != null">
                 charging_usage  = #{chargingUsage},
             </if>
@@ -259,36 +257,24 @@
             <if test="meterReadingErrorRate != null">
                 meter_reading_error_rate  = #{meterReadingErrorRate},
             </if>
-            <if test="receivableTotalAmount != null">
-                receivable_total_amount  = #{receivableTotalAmount},
-            </if>
-            <if test="receivedTotalAmount != null">
-                received_total_amount  = #{receivedTotalAmount},
-            </if>
+            receivable_total_amount  = #{receivableTotalAmount},
+            received_total_amount  = #{receivedTotalAmount},
             <if test="invoicedTotalAmount != null">
                 invoiced_total_amount  = #{invoicedTotalAmount},
             </if>
             <if test="arrearsTotalAmount != null">
                 arrears_total_amount  = #{arrearsTotalAmount},
             </if>
-            <if test="generalUserUsage != null">
-                general_user_usage  = #{generalUserUsage},
-            </if>
-            <if test="bigUserUsage != null">
-                big_user_usage  = #{bigUserUsage},
-            </if>
+            general_user_usage  = #{generalUserUsage},
+            big_user_usage  = #{bigUserUsage},
             <if test="remark != null">
                 remark  = #{remark},
             </if>
             <if test="updateBy != null">
                 update_by  = #{updateBy},
             </if>
-            <if test="generalUserUsageReceived != null">
-                general_user_usage_received  = #{generalUserUsageReceived},
-            </if>
-            <if test="bigUserUsageReceived != null">
-                big_user_usage_received  = #{bigUserUsageReceived},
-            </if>
+            general_user_usage_received  = #{generalUserUsageReceived},
+            big_user_usage_received  = #{bigUserUsageReceived},
         </set>
         where id  = #{id}
     </update>
@@ -299,9 +285,7 @@
             <if test="collectDate != null">
                 collect_date  = #{collectDate},
             </if>
-            <if test="waterUsage != null">
-                water_usage  = #{waterUsage},
-            </if>
+            water_usage  = #{waterUsage},
             <if test="remark != null">
                 remark  = #{remark},
             </if>