修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -1096,6 +1096,125 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleTitle);
         rownum++;
 
+
+        Double waterContentTotal = 0d;//水分合计
+        Double impurityTotal = 0d;//杂质合计
+        Double mildewGrainTotal = 0d;//霉变粒合计
+        Double imperfectGrainTotal = 0d;//不完善粒合计
+        Double bulkDensityTotal = 0d;//容重合计
+        Double jiaorenliTotal = 0d;//热损伤合计
+        Double netWeightTotal = 0d;//净重合计
+        Double amountIngPayableTotal = 0d;//应收合计
+        for (int i = 0; i < paymentManagement.getPaymentManagementList().size(); i++) {
+            PaymentManagement paymentManagement1 = paymentManagement.getPaymentManagementList().get(i);
+            paymentManagement1.setIdentityAuthenticationInfo(iIdentityAuthenticationInfoService.selectById(paymentManagement1.getIdentityId()));
+            paymentManagement1.setQualityInspectionManagement(qualityInspectionManagementService.selectOne(
+                    new EntityWrapper<QualityInspectionManagement>()
+                            .eq("relation_id", paymentManagement1.getRelationId())
+                            .eq("comp_id", paymentManagement1.getCompId())
+            ));
+            paymentManagement1.setWeighingManagement(weighingManagementService.selectOne(
+                    new EntityWrapper<WeighingManagement>()
+                            .eq("relation_id", paymentManagement1.getRelationId())
+                            .eq("comp_id", paymentManagement1.getCompId())
+            ));
+            //水分累计和
+            waterContentTotal = waterContentTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getWaterContent()!=null?paymentManagement1.getQualityInspectionManagement().getWaterContent():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+            impurityTotal = impurityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getImpurity()!=null?paymentManagement1.getQualityInspectionManagement().getImpurity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+            mildewGrainTotal = mildewGrainTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getMildewGrain()!=null?paymentManagement1.getQualityInspectionManagement().getMildewGrain():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+            imperfectGrainTotal = imperfectGrainTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getImperfectGrain()!=null?paymentManagement1.getQualityInspectionManagement().getImperfectGrain():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+            bulkDensityTotal = bulkDensityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getBulkDensity()!=null?paymentManagement1.getQualityInspectionManagement().getBulkDensity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+            jiaorenliTotal = jiaorenliTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getJiaorenli()!=null?paymentManagement1.getQualityInspectionManagement().getJiaorenli():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+//                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(paymentManagement1.getTidalGrainPrice())));
+            netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight())));
+            amountIngPayableTotal = amountIngPayableTotal + paymentManagement1.getAmountIngPayable();
+        }
+
+        HSSFRow rowp = sheet.createRow((int)(rownum));
+        rowp.setHeightInPoints(20);
+        cell = rowp.createCell(1);
+        cell.setCellValue("平均值/合计");
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(2);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(3);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(4);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(5);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(6);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(7);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(8);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(9);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(10);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(11);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(12);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(13);
+        cell.setCellStyle(styleDetail);
+        //水分平均值
+        cell = rowp.createCell(14);
+        cell.setCellValue(waterContentTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(15);
+        cell.setCellValue(impurityTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(16);
+        cell.setCellValue(mildewGrainTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(17);
+        cell.setCellValue(imperfectGrainTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(18);
+        cell.setCellValue(bulkDensityTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(19);
+        cell.setCellValue(jiaorenliTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(20);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(21);
+        cell.setCellValue(paymentManagement.getPaymentManagementList().size());
+        cell.setCellStyle(styleDetail1);
+        cell = rowp.createCell(22);
+        cell.setCellValue(amountIngPayableTotal/netWeightTotal);
+        cell.setCellStyle(contextstyle1);
+        cell = rowp.createCell(23);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(24);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(25);
+        cell.setCellStyle(styleDetail);
+        //净重合计
+        cell = rowp.createCell(26);
+        cell.setCellValue(netWeightTotal);
+        cell.setCellStyle(styleDetail1);
+        cell = rowp.createCell(27);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(28);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(29);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(30);
+        cell.setCellValue(amountIngPayableTotal);
+        cell.setCellStyle(styleDetail1);
+        cell = rowp.createCell(31);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(32);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(33);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(34);
+        cell.setCellStyle(styleDetail);
+        rownum++;
+
         HSSFRow row1 = sheet.createRow((int) rownum);
         row1.setHeightInPoints(30);
         cell = row1.createCell(1);
@@ -1207,14 +1326,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 
         // 详情信息
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(paymentManagement.getPaymentManagementList())) {
-            Double waterContentTotal = 0d;//水分合计
-            Double impurityTotal = 0d;//杂质合计
-            Double mildewGrainTotal = 0d;//霉变粒合计
-            Double imperfectGrainTotal = 0d;//不完善粒合计
-            Double bulkDensityTotal = 0d;//容重合计
-            Double jiaorenliTotal = 0d;//热损伤合计
-            Double netWeightTotal = 0d;//净重合计
-            Double amountIngPayableTotal = 0d;//应收合计
+
 
             for (int i = 0; i < paymentManagement.getPaymentManagementList().size(); i++) {
                 PaymentManagement paymentManagement1 = paymentManagement.getPaymentManagementList().get(i);
@@ -1339,102 +1451,20 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit() + "-" +paymentManagement1.getIdentityAuthenticationInfo().getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);
 
-                //水分累计和
-                waterContentTotal = waterContentTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getWaterContent()!=null?paymentManagement1.getQualityInspectionManagement().getWaterContent():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
-                impurityTotal = impurityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getImpurity()!=null?paymentManagement1.getQualityInspectionManagement().getImpurity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
-                mildewGrainTotal = mildewGrainTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getMildewGrain()!=null?paymentManagement1.getQualityInspectionManagement().getMildewGrain():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
-                imperfectGrainTotal = imperfectGrainTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getImperfectGrain()!=null?paymentManagement1.getQualityInspectionManagement().getImperfectGrain():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
-                bulkDensityTotal = bulkDensityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getBulkDensity()!=null?paymentManagement1.getQualityInspectionManagement().getBulkDensity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
-                jiaorenliTotal = jiaorenliTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getJiaorenli()!=null?paymentManagement1.getQualityInspectionManagement().getJiaorenli():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
-//                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(paymentManagement1.getTidalGrainPrice())));
-                netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight())));
-                amountIngPayableTotal = amountIngPayableTotal + paymentManagement1.getAmountIngPayable();
+//                //水分累计和
+//                waterContentTotal = waterContentTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getWaterContent()!=null?paymentManagement1.getQualityInspectionManagement().getWaterContent():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+//                impurityTotal = impurityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getImpurity()!=null?paymentManagement1.getQualityInspectionManagement().getImpurity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+//                mildewGrainTotal = mildewGrainTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getMildewGrain()!=null?paymentManagement1.getQualityInspectionManagement().getMildewGrain():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+//                imperfectGrainTotal = imperfectGrainTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getImperfectGrain()!=null?paymentManagement1.getQualityInspectionManagement().getImperfectGrain():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+//                bulkDensityTotal = bulkDensityTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getBulkDensity()!=null?paymentManagement1.getQualityInspectionManagement().getBulkDensity():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+//                jiaorenliTotal = jiaorenliTotal + ((Double.valueOf(String.valueOf(paymentManagement1.getQualityInspectionManagement().getJiaorenli()!=null?paymentManagement1.getQualityInspectionManagement().getJiaorenli():"0"))) * (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight()))));
+////                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(paymentManagement1.getTidalGrainPrice())));
+//                netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(paymentManagement1.getNetWeight())));
+//                amountIngPayableTotal = amountIngPayableTotal + paymentManagement1.getAmountIngPayable();
 
                 rownum++;
             }
-            HSSFRow rowp = sheet.createRow((int)(rownum));
-            rowp.setHeightInPoints(20);
-            cell = rowp.createCell(1);
-            cell.setCellValue("平均值/合计");
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(2);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(3);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(4);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(5);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(6);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(7);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(8);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(9);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(10);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(11);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(12);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(13);
-            cell.setCellStyle(styleDetail);
-            //水分平均值
-            cell = rowp.createCell(14);
-            cell.setCellValue(waterContentTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(15);
-            cell.setCellValue(impurityTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(16);
-            cell.setCellValue(mildewGrainTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(17);
-            cell.setCellValue(imperfectGrainTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(18);
-            cell.setCellValue(bulkDensityTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(19);
-            cell.setCellValue(jiaorenliTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(20);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(21);
-            cell.setCellValue(paymentManagement.getPaymentManagementList().size());
-            cell.setCellStyle(styleDetail1);
-            cell = rowp.createCell(22);
-            cell.setCellValue(amountIngPayableTotal/netWeightTotal);
-            cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(23);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(24);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(25);
-            cell.setCellStyle(styleDetail);
-            //净重合计
-            cell = rowp.createCell(26);
-            cell.setCellValue(netWeightTotal);
-            cell.setCellStyle(styleDetail1);
-            cell = rowp.createCell(27);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(28);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(29);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(30);
-            cell.setCellValue(amountIngPayableTotal);
-            cell.setCellStyle(styleDetail1);
-            cell = rowp.createCell(31);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(32);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(33);
-            cell.setCellStyle(styleDetail);
-            cell = rowp.createCell(34);
-            cell.setCellStyle(styleDetail);
+
         }