|
@@ -65,22 +65,24 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
//运营助理
|
|
|
roleCode.add("operationAssistant");
|
|
|
//头条运营经理
|
|
|
+ roleCode.add("kuaishouOperationManager");
|
|
|
roleCode.add("touTiaoOperationManager");
|
|
|
//运营专员
|
|
|
roleCode.add("operator");
|
|
|
} else {
|
|
|
if ("manager".equals(role)) {
|
|
|
+ roleCode.add("kuaishouOperationManager");
|
|
|
roleCode.add("touTiaoOperationManager");
|
|
|
} else {
|
|
|
roleCode.add(role);
|
|
|
}
|
|
|
}
|
|
|
//查询岗位变动人员
|
|
|
- List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate, "1");
|
|
|
+ List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate);
|
|
|
//查询在职人员 1-在职
|
|
|
- List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds, "1");
|
|
|
+ List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds);
|
|
|
//查询离职人员 2-离职
|
|
|
- List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate, "1");
|
|
|
+ List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate);
|
|
|
JSONObject dates = new JSONObject();
|
|
|
int count = 1;
|
|
|
for (Integer month : monthInt) {
|
|
@@ -117,11 +119,13 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
//运营助理
|
|
|
roleCode.add("operationAssistant");
|
|
|
//头条运营经理
|
|
|
+ roleCode.add("kuaishouOperationManager");
|
|
|
roleCode.add("touTiaoOperationManager");
|
|
|
//运营专员
|
|
|
roleCode.add("operator");
|
|
|
} else {
|
|
|
if ("manager".equals(role)) {
|
|
|
+ roleCode.add("kuaishouOperationManager");
|
|
|
roleCode.add("touTiaoOperationManager");
|
|
|
} else {
|
|
|
roleCode.add(role);
|
|
@@ -129,11 +133,11 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
}
|
|
|
|
|
|
//查询岗位变动人员
|
|
|
- List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate, "1");
|
|
|
+ List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate);
|
|
|
//查询在职人员 1-在职
|
|
|
- List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds, "1");
|
|
|
+ List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds);
|
|
|
//查询离职人员 2-离职
|
|
|
- List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate, "1");
|
|
|
+ List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate);
|
|
|
JSONObject dates = new JSONObject();
|
|
|
|
|
|
List<JSONObject> dataList = new ArrayList<>();
|
|
@@ -666,22 +670,24 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
roleCode.add("operationAssistant");
|
|
|
//快手运营经理
|
|
|
roleCode.add("kuaishouOperationManager");
|
|
|
+ roleCode.add("touTiaoOperationManager");
|
|
|
//运营专员
|
|
|
roleCode.add("operator");
|
|
|
} else {
|
|
|
if ("manager".equals(role)) {
|
|
|
roleCode.add("kuaishouOperationManager");
|
|
|
+ roleCode.add("touTiaoOperationManager");
|
|
|
} else {
|
|
|
roleCode.add(role);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//查询岗位变动人员
|
|
|
- List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate, "2");
|
|
|
+ List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate);
|
|
|
//查询在职人员 1-在职
|
|
|
- List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds, "2");
|
|
|
+ List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds);
|
|
|
//查询离职人员 2-离职
|
|
|
- List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate, "2");
|
|
|
+ List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate);
|
|
|
JSONObject dates = new JSONObject();
|
|
|
int count = 1;
|
|
|
for (Integer month : monthInt) {
|
|
@@ -723,22 +729,24 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
|
roleCode.add("operationAssistant");
|
|
|
//快手运营经理
|
|
|
roleCode.add("kuaishouOperationManager");
|
|
|
+ roleCode.add("touTiaoOperationManager");
|
|
|
//运营专员
|
|
|
roleCode.add("operator");
|
|
|
} else {
|
|
|
if ("manager".equals(role)) {
|
|
|
roleCode.add("kuaishouOperationManager");
|
|
|
+ roleCode.add("touTiaoOperationManager");
|
|
|
} else {
|
|
|
roleCode.add(role);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//查询岗位变动人员
|
|
|
- List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate, "2");
|
|
|
+ List<JSONObject> changeRoleUserIds = sysUserService.getQuarterlyChangeRoleOperators(roleCode, userId, startDate, endDate);
|
|
|
//查询在职人员 1-在职
|
|
|
- List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds, "2");
|
|
|
+ List<JSONObject> onJobUserIds = sysUserService.getQuarterlyOnJobOperators(roleCode, userId, 1, changeRoleUserIds);
|
|
|
//查询离职人员 2-离职
|
|
|
- List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate, "2");
|
|
|
+ List<JSONObject> offJobUserIds = sysUserService.getQuarterlyOffJobOperators(roleCode, userId, 2, startDate, nextMonthEndDate);
|
|
|
JSONObject dates = new JSONObject();
|
|
|
|
|
|
List<JSONObject> dataList = new ArrayList<>();
|