App总览-生产数据-本月本年近一年

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

@@ -37,8 +37,9 @@ public class AppPageReportController {
     private AppPageReportService appPageReportService;
 
     /**
-     * App生产总览数据-本月数据
-     * @param companyOrgId
+     * @Author wangbo
+     * @Description App生产总览数据-本月数据
+     * @param companyOrgId 公司ID
      * @return
      */
     @RequestMapping(value = "getProductionDataForSameMonth",method = RequestMethod.GET)
@@ -56,8 +57,9 @@ public class AppPageReportController {
     }
 
     /**
-     * App生产总览数据-本年数据
-     * @param companyOrgId
+     * @Author wangbo
+     * @Description App生产总览数据-本年数据
+     * @param companyOrgId 公司ID
      * @return
      */
     @RequestMapping(value = "getProductionDataForSameYear",method = RequestMethod.GET)
@@ -79,8 +81,9 @@ public class AppPageReportController {
 
 
     /**
-     * App生产总览数据-近一年数据
-     * @param companyOrgId
+     * @Author wangbo
+     * @Description App生产总览数据-近一年数据
+     * @param companyOrgId 公司ID
      * @return
      */
     @RequestMapping(value = "getProductionDataFor12Month",method = RequestMethod.GET)
@@ -98,6 +101,13 @@ public class AppPageReportController {
         return new AjaxMessage<>(ResultStatus.OK,map);
     }
 
+    /**
+     * @Author wangbo
+     * @Description 计算产销差
+     * @param makingWaterList 制水量数据
+     * @param sellerWaterList 售水量数据
+     * @return
+     */
     private BigDecimal CalculationNrw( List<DeviceWaterSupply> makingWaterList,List<DeviceWaterSupply> sellerWaterList){
         BigDecimal makingWaterAmount = new BigDecimal("0");
         BigDecimal sellerWaterAmount = new BigDecimal("0");