Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -57,8 +57,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","1")
                         .eq("delete_flag","0"));
                 if(inContractReveExpeInfoList != null){
-                    inContractMoney = inContractMoney + reveExpeInfo1.getAmountMoney();
-                    reveExpeInfo1.setInContractMoney(inContractMoney);
+                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                        inContractMoney = inContractMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    }
+                        reveExpeInfo1.setInContractMoney(inContractMoney);
                 }
                 //定义合同支出
                 Double outContractMoney = 0.0;
@@ -68,8 +70,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","2")
                         .eq("delete_flag","0"));
                 if(outContractReveExpeInfoList != null){
-                    outContractMoney = outContractMoney + reveExpeInfo1.getAmountMoney();
-                    reveExpeInfo1.setOutContractMoney(outContractMoney);
+                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                        outContractMoney = outContractMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    }
+                        reveExpeInfo1.setInContractMoney(outContractMoney);
                 }
                 //定义仓库收入
                 Double inWarehouseMoney = 0.0;
@@ -79,8 +83,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","3")
                         .eq("delete_flag","0"));
                 if(inWarehouseReveExpeInfoList != null){
-                    inWarehouseMoney = inWarehouseMoney + reveExpeInfo1.getAmountMoney();
-                    reveExpeInfo1.setInWarehouseMoney(inWarehouseMoney);
+                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                        inWarehouseMoney = inWarehouseMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    }
+                        reveExpeInfo1.setInContractMoney(inWarehouseMoney);
                 }
                 //定义仓库支出
                 Double outWarehouseMoney = 0.0;
@@ -90,8 +96,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","4")
                         .eq("delete_flag","0"));
                 if(outWarehouseReveExpeInfoList != null){
-                    outWarehouseMoney = outWarehouseMoney + reveExpeInfo1.getAmountMoney();
-                    reveExpeInfo1.setOutWarehouseMoney(outWarehouseMoney);
+                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                        outWarehouseMoney = outWarehouseMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    }
+                        reveExpeInfo1.setInContractMoney(outWarehouseMoney);
                 }
                 //定义经营收入
                 Double inManageMoney = 0.0;
@@ -101,8 +109,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","5")
                         .eq("delete_flag","0"));
                 if(inManageReveExpeInfoList != null){
-                    inManageMoney = inManageMoney + reveExpeInfo1.getAmountMoney();
-                    reveExpeInfo1.setInManageMoney(inManageMoney);
+                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                        inManageMoney = inManageMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    }
+                        reveExpeInfo1.setInContractMoney(inManageMoney);
                 }
                 //定义经营支出
                 Double outManageMoney = 0.0;
@@ -112,8 +122,10 @@ public class ReveExpeInfoServiceImpl extends ServiceImpl<ReveExpeInfoMapper, Rev
                         .eq("reex_type_key","6")
                         .eq("delete_flag","0"));
                 if(outManageReveExpeInfoList != null){
-                    outManageMoney = outManageMoney + reveExpeInfo1.getAmountMoney();
-                    reveExpeInfo1.setOutManageMoney(outManageMoney);
+                    for(int i = 0;i<inContractReveExpeInfoList.size();i++){
+                        outManageMoney = outManageMoney + inContractReveExpeInfoList.get(i).getAmountMoney();
+                    }
+                        reveExpeInfo1.setInContractMoney(outManageMoney);
                 }
             }
         }