Browse Source

运营绩效功能,大改

zhaoxian 2 năm trước cách đây
mục cha
commit
cd211aa332

+ 24 - 24
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouOperationReportServiceImpl.java

@@ -659,13 +659,13 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             String month3 = DateUtils.getMonth("yyyyMMdd", dates.getString("startDate3"));
                             if (month.equals(month1)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate1"), dates.getInteger("endDate1"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month2)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -685,13 +685,13 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             if (month.equals(month1)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
                                 //有效助理数据
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month2)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -722,10 +722,10 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             String month3 = DateUtils.getMonth("yyyyMMdd", dates.getString("startDate3"));
                             if (month.equals(month2)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -746,14 +746,14 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             if (month.equals(month1)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
                                 //有效助理数据
-                                validAssistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                validAssistantCharge = validAssistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month2)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -782,7 +782,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             String month3 = DateUtils.getMonth("yyyyMMdd", dates.getString("startDate3"));
                             if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -803,15 +803,15 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             if (month.equals(month1)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
                                 //有效助理数据
-                                validAssistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                validAssistantCharge = validAssistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month2)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
-                                validAssistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                validAssistantCharge = validAssistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -869,13 +869,13 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                             String month3 = DateUtils.getMonth("yyyyMMdd", dates.getString("startDate3"));
                             if (month.equals(month1)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate1"), dates.getInteger("endDate1"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month2)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), dates.getInteger("endDate2"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             } else if (month.equals(month3)) {
                                 Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), dates.getInteger("endDate3"));
-                                assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                                assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                             }
                         }
                     }
@@ -942,21 +942,21 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
                                 endDate = quitTime;
                             }
                             Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate1"), endDate);
-                            assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                            assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                         } else if (month.equals(month2)) {
                             Integer endDate = dates.getInteger("endDate2");
                             if (quitTimeStr.equals(month2)) {
                                 endDate = quitTime;
                             }
                             Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate2"), endDate);
-                            assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                            assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                         } else if (month.equals(month3)) {
                             Integer endDate = dates.getInteger("endDate3");
                             if (quitTimeStr.equals(month3)) {
                                 endDate = quitTime;
                             }
                             Set<JSONObject> AssistantData = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(rel.getAssistantId()), dates.getInteger("startDate3"), endDate);
-                            assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
+                            assistantCharge = assistantCharge.add(AssistantData.iterator().next().getBigDecimal("FWCharge"));
                         }
                     }
                 }