Quellcode durchsuchen

运营绩效功能,优化问题

zhaoxian vor 2 Jahren
Ursprung
Commit
4e2dbc6ba1

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -219,7 +220,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
     /**
      * 查询在职人员数据
      */
-    private List<JSONObject> getTtOnJobUserData(List<JSONObject> users, Map<String, String> dateMap, List<JSONObject> changeRoleDataList, List<JSONObject> offJobDataList) {
+    private List<JSONObject> getTtOnJobUserData(List<JSONObject> users, Map<String, String> dateMap, List<JSONObject> changeRoleDataList, List<JSONObject> offJobDataList) throws ParseException {
         List<JSONObject> data = new ArrayList<>();
         Integer startDate = DateUtils.getDateInteger(dateMap.get("startDate"));
         Integer endDate = DateUtils.getDateInteger(dateMap.get("endDate"));
@@ -359,7 +360,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
     /**
      * 查询离职人员数据
      */
-    private List<JSONObject> getTtOffJobUserData(List<JSONObject> users, Integer time, Map<String, String> dateMap) {
+    private List<JSONObject> getTtOffJobUserData(List<JSONObject> users, Integer time, Map<String, String> dateMap) throws ParseException {
         List<JSONObject> data = new ArrayList<>();
         Integer startDate = DateUtils.getDateInteger(dateMap.get("startDate"));
         Integer endDate = DateUtils.getDateInteger(dateMap.get("endDate"));
@@ -402,7 +403,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
         }
 
         for (JSONObject user : users) {
-            data.addAll(baseMapper.getTtQuarterlyOnJobOperatorsCharge(Arrays.asList(user.getString("userId")), startDate, DateUtils.getDateInteger(user.getString("quitTime"))));
+            data.addAll(baseMapper.getTtQuarterlyOnJobOperatorsCharge(Arrays.asList(user.getString("userId")), startDate, DateUtils.getDateInteger(DateUtils.formatDate(user.getString("quitTime"), "yyyy-MM-dd"))));
         }
 
         if (!Check.isNull(data)) {
@@ -415,7 +416,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
     /**
      * 整合头条数据
      */
-    private void consolidateTtData(List<JSONObject> data, Map<String, String> dateMap, JSONObject dates, String type) {
+    private void consolidateTtData(List<JSONObject> data, Map<String, String> dateMap, JSONObject dates, String type) throws ParseException {
         for (JSONObject datum : data) {
             String userId = datum.getString("userId");
             SysUser userEntity = sysUserService.getById(userId);
@@ -459,7 +460,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
             if (roleName.contains("经理")) {
                 BigDecimal managenCharge = null;
                 if ("off".equals(type)) {
-                    managenCharge = baseMapper.getTtManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(datum.getString("quitTime")));
+                    managenCharge = baseMapper.getTtManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(DateUtils.formatDate(datum.getString("quitTime"), "yyyy-MM-dd")));
                 } else {
                     if (Check.isNull(monthCount) || monthCount == 3) {
                         managenCharge = baseMapper.getTtManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
@@ -689,7 +690,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
     /**
      * 查询在职人员数据
      */
-    private List<JSONObject> getOnJobUserData(List<JSONObject> users, Map<String, String> dateMap, List<JSONObject> changeRoleDataList, List<JSONObject> offJobDataList) {
+    private List<JSONObject> getOnJobUserData(List<JSONObject> users, Map<String, String> dateMap, List<JSONObject> changeRoleDataList, List<JSONObject> offJobDataList) throws ParseException {
         List<JSONObject> data = new ArrayList<>();
         Integer startDate = DateUtils.getDateInteger(dateMap.get("startDate"));
         Integer endDate = DateUtils.getDateInteger(dateMap.get("endDate"));
@@ -841,7 +842,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
     /**
      * 查询离职人员数据
      */
-    private List<JSONObject> getOffJobUserData(List<JSONObject> users, Integer time, Map<String, String> dateMap) {
+    private List<JSONObject> getOffJobUserData(List<JSONObject> users, Integer time, Map<String, String> dateMap) throws ParseException {
         List<JSONObject> data = new ArrayList<>();
         Integer startDate = DateUtils.getDateInteger(dateMap.get("startDate"));
         Integer endDate = DateUtils.getDateInteger(dateMap.get("endDate"));
@@ -864,7 +865,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
         //单独计算助理数据
         if (!Check.isNull(assistantUsers)) {
             for (JSONObject user : assistantUsers) {
-                Set<JSONObject> charge = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(user.getString("userId")), startDate, DateUtils.getDateInteger(user.getString("quitTime")));
+                Set<JSONObject> charge = baseMapper.getKsQuarterlyOnJobOperatorsCharge(Arrays.asList(user.getString("userId")), startDate, DateUtils.getDateInteger(DateUtils.formatDate(user.getString("quitTime"), "yyyy-MM-dd")));
                 data.addAll(charge);
                 SysOperateRel rel = operateRelMapper.getOne(user.getString("userId"));
                 if (!Check.isNull(rel)) {
@@ -895,7 +896,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
     }
 
 
-    private void consolidateData(List<JSONObject> data, Map<String, String> dateMap, JSONObject dates, String type) {
+    private void consolidateData(List<JSONObject> data, Map<String, String> dateMap, JSONObject dates, String type) throws ParseException {
         for (JSONObject datum : data) {
             String userId = datum.getString("userId");
             SysUser userEntity = sysUserService.getById(userId);
@@ -950,7 +951,7 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
             if (roleName.contains("经理")) {
                 BigDecimal managenCharge = null;
                 if ("off".equals(type)) {
-                    managenCharge = baseMapper.getManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(datum.getString("quitTime")));
+                    managenCharge = baseMapper.getManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(DateUtils.formatDate(datum.getString("quitTime"), "yyyy-MM-dd")));
                 } else {
                     if (Check.isNull(monthCount) || monthCount == 3) {
                         managenCharge = baseMapper.getManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));