李进 1 рік тому
батько
коміт
87e352623d

+ 4 - 0
device-api-service/src/main/java/com/xy/job/DeviceAlgorithmChargingJob.java

@@ -44,6 +44,10 @@ public class DeviceAlgorithmChargingJob {
 
     private MercArrearageConfigService mercArrearageConfigService;
 
+    public static void main(String[] args) {
+
+    }
+
     /**
      * 算法费设备停机
      *

+ 2 - 3
device-api-service/src/main/java/com/xy/service/DeviceChargingHistoryServiceImpl.java

@@ -91,8 +91,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
         //查询数据
         List<String> attrNames = Arrays.asList(
                 LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getMercId),
-                "DATE_FORMAT(" + LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getCreateTime) + ", '%Y-%m')",
-                LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getMercId)
+                "DATE_FORMAT(" + LambdaUtils.getUnderlineCaseName(DeviceChargingHistory::getCreateTime) + ", '%Y-%m')"
         );
         List<String> selectNames = Arrays.asList(
                 attrNames.get(0),
@@ -140,7 +139,7 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
                 return null;
             }
             return Beans.copy(MoonCountData.class, data);
-        });
+        }).builder();
         //下载文件
         InputStream inputStream = IoUtils.inputStream(path).get();
         response.setHeader("Content-Disposition", "attachment; filename=" + "设备管理费月统计数据.xlsx");

+ 2 - 3
device-api-service/src/main/java/com/xy/service/DeviceSimChargeServiceImpl.java

@@ -92,8 +92,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
         //查询数据
         List<String> attrNames = Arrays.asList(
                 LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getMercId),
-                "DATE_FORMAT(" + LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getCreateTime) + ", '%Y-%m')",
-                LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getMercId)
+                "DATE_FORMAT(" + LambdaUtils.getUnderlineCaseName(DeviceSimCharge::getCreateTime) + ", '%Y-%m')"
         );
         List<String> selectNames = Arrays.asList(
                 attrNames.get(0),
@@ -141,7 +140,7 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
                 return null;
             }
             return Beans.copy(MoonCountData.class, data);
-        });
+        }).builder();
         //下载文件
         InputStream inputStream = IoUtils.inputStream(path).get();
         response.setHeader("Content-Disposition", "attachment; filename=" + "设备管理费月统计数据.xlsx");