范各庄电--代码提交

ruoyi-wages/src/main/java/com/ruoyi/system/model/power/dto/PowerDisplayDto.java

@@ -49,6 +49,10 @@ public class PowerDisplayDto {
     private String levelThreeClassification;
     // 基本电费
     private String basicElectricityTariff;
+    //照明
+    private String lighting;
+    //动力
+    private String motivation;
 
     public String getDateColumn() {
         return dateColumn;
@@ -217,4 +221,20 @@ public class PowerDisplayDto {
     public void setBasicElectricityTariff(String basicElectricityTariff) {
         this.basicElectricityTariff = basicElectricityTariff;
     }
+
+    public String getLighting() {
+        return lighting;
+    }
+
+    public void setLighting(String lighting) {
+        this.lighting = lighting;
+    }
+
+    public String getMotivation() {
+        return motivation;
+    }
+
+    public void setMotivation(String motivation) {
+        this.motivation = motivation;
+    }
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java

@@ -263,14 +263,14 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
     }
 
     @Override
-    public AjaxResult save(List<NewRuleRequestModel> powerDisplayDtoList) {
-        if (!CollectionUtils.isEmpty(powerDisplayDtoList)) {
-            String mineid = powerDisplayDtoList.get(0).getMineid();
+    public AjaxResult save(List<NewRuleRequestModel> newRuleRequestModelList) {
+        if (!CollectionUtils.isEmpty(newRuleRequestModelList)) {
+            String mineid = newRuleRequestModelList.get(0).getMineid();
             if (StringUtils.equals("011702", mineid)) {
-                saveLJTPowerData(powerDisplayDtoList);
+                saveLJTPowerData(newRuleRequestModelList);
             }
             if (StringUtils.equals("011701", mineid)) {
-                saveFGZPowerData(powerDisplayDtoList);
+                saveFGZPowerData(newRuleRequestModelList);
             }
         } else {
             return AjaxResult.error();
@@ -403,6 +403,8 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
             existingData.setLevelTwoClassification(StringUtils.isEmpty(existingData.getLevelTwoClassification()) ? newData.getLevelTwoClassification() : existingData.getLevelTwoClassification());
             existingData.setLevelThreeClassification(StringUtils.isEmpty(existingData.getLevelThreeClassification()) ? newData.getLevelThreeClassification() : existingData.getLevelThreeClassification());
             existingData.setBasicElectricityTariff(StringUtils.isEmpty(existingData.getBasicElectricityTariff()) ? newData.getBasicElectricityTariff() : existingData.getBasicElectricityTariff());
+            existingData.setLighting(StringUtils.isEmpty(existingData.getLighting()) ? newData.getLighting() : existingData.getLighting());
+            existingData.setMotivation(StringUtils.isEmpty(existingData.getMotivation()) ? newData.getMotivation() : existingData.getMotivation());
             return existingData;
         }), map -> map.values().iterator().next()));
     }

ruoyi-wages/src/main/resources/mapper/system/PowerDisplayMapper.xml

@@ -9,7 +9,7 @@
         power_total, power_tip, power_peak, power_flat, power_valley,
         electricity_total, electricity_tip, electricity_peak, electricity_flat, electricity_valley,
         electricity_price_tip, electricity_price_peak, electricity_price_flat, electricity_price_valley,
-        level_three_classification, basic_electricity_tariff)
+        level_three_classification, basic_electricity_tariff,lighting,motivation)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.dateColumn}, #{item.mindId}, #{item.levelOneClassification}, #{item.levelTwoClassification},
@@ -18,7 +18,8 @@
             , #{item.electricityTotal}, #{item.electricityTip}, #{item.electricityPeak}, #{item.electricityFlat},
             #{item.electricityValley}
             , #{item.electricityPriceTip}, #{item.electricityPricePeak}, #{item.electricityPriceFlat},
-            #{item.electricityPriceValley}, #{item.levelThreeClassification}, #{item.basicElectricityTariff})
+            #{item.electricityPriceValley}, #{item.levelThreeClassification},
+            #{item.basicElectricityTariff},#{item.lighting},#{item.motivation})
         </foreach>
     </insert>
     <update id="update">