|
@@ -544,15 +544,23 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
String roleName = datum.getString("roleName");
|
|
|
if (roleName.contains("经理")) {
|
|
|
BigDecimal managenCharge = null;
|
|
|
- if ("off".equals(type)) {
|
|
|
- managenCharge = baseMapper.getTtManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(DateUtils.formatDate(datum.getString("quitTime"), "yyyy-MM-dd")));
|
|
|
+ //兰兰和李超 就这俩人定制化
|
|
|
+ if ("461857c245f54ba5813bcb5900a23092".equals(userId) ||
|
|
|
+ "f6a6843879c949618e4a859140c8a127".equals(userId)) {
|
|
|
+ List<String> managers = baseMapper.getTtManagers(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ managenCharge = baseMapper.getTtManageChargeCommission(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ managenCharge.add(baseMapper.getTtManageChargeCommission(managers, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate"))));
|
|
|
} else {
|
|
|
- if (Check.isNull(monthCount) || monthCount == 3) {
|
|
|
- managenCharge = baseMapper.getTtManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
- } else if (monthCount == 2) {
|
|
|
- managenCharge = baseMapper.getTtManageChargeCommission(userId, dates.getInteger("startDate2"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
- } else if (monthCount == 1) {
|
|
|
- managenCharge = baseMapper.getTtManageChargeCommission(userId, dates.getInteger("startDate3"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ if ("off".equals(type)) {
|
|
|
+ managenCharge = baseMapper.getTtManageChargeCommission(Arrays.asList(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(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ } else if (monthCount == 2) {
|
|
|
+ managenCharge = baseMapper.getTtManageChargeCommission(Arrays.asList(userId), dates.getInteger("startDate2"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ } else if (monthCount == 1) {
|
|
|
+ managenCharge = baseMapper.getTtManageChargeCommission(Arrays.asList(userId), dates.getInteger("startDate3"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//季度管理消耗
|
|
@@ -1131,15 +1139,23 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
String roleName = datum.getString("roleName");
|
|
|
if (roleName.contains("经理")) {
|
|
|
BigDecimal managenCharge = null;
|
|
|
- if ("off".equals(type)) {
|
|
|
- managenCharge = baseMapper.getManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(DateUtils.formatDate(datum.getString("quitTime"), "yyyy-MM-dd")));
|
|
|
+ //兰兰和李超 就这俩人定制化
|
|
|
+ if ("461857c245f54ba5813bcb5900a23092".equals(userId) ||
|
|
|
+ "f6a6843879c949618e4a859140c8a127".equals(userId)) {
|
|
|
+ List<String> managers = baseMapper.getManagers(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ managenCharge = baseMapper.getManageChargeCommission(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ managenCharge.add(baseMapper.getManageChargeCommission(managers, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate"))));
|
|
|
} else {
|
|
|
- if (Check.isNull(monthCount) || monthCount == 3) {
|
|
|
- managenCharge = baseMapper.getManageChargeCommission(userId, DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
- } else if (monthCount == 2) {
|
|
|
- managenCharge = baseMapper.getManageChargeCommission(userId, dates.getInteger("startDate2"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
- } else if (monthCount == 1) {
|
|
|
- managenCharge = baseMapper.getManageChargeCommission(userId, dates.getInteger("startDate3"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ if ("off".equals(type)) {
|
|
|
+ managenCharge = baseMapper.getManageChargeCommission(Arrays.asList(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(Arrays.asList(userId), DateUtils.getDateInteger(dateMap.get("startDate")), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ } else if (monthCount == 2) {
|
|
|
+ managenCharge = baseMapper.getManageChargeCommission(Arrays.asList(userId), dates.getInteger("startDate2"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ } else if (monthCount == 1) {
|
|
|
+ managenCharge = baseMapper.getManageChargeCommission(Arrays.asList(userId), dates.getInteger("startDate3"), DateUtils.getDateInteger(dateMap.get("endDate")));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//季度管理消耗
|