|
@@ -86,9 +86,9 @@ public class FirstDeliveryValidController {
|
|
|
|
|
|
@GetMapping(value = "/getDesignData")
|
|
@GetMapping(value = "/getDesignData")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public Result<Object> getDesignData(String date,Integer pageSize,Integer pageNo,Integer designRole) {
|
|
|
|
|
|
+ public Result<Object> getDesignData(String date, Integer pageSize, Integer pageNo, Integer designRole) {
|
|
try {
|
|
try {
|
|
- return firstDeliveryValidService.getDesignData(date,pageSize,pageNo,designRole);
|
|
|
|
|
|
+ return firstDeliveryValidService.getDesignData(date, pageSize, pageNo, designRole);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
return Result.error("导入EXCEL失败," + e.getMessage());
|
|
return Result.error("导入EXCEL失败," + e.getMessage());
|
|
@@ -122,11 +122,12 @@ public class FirstDeliveryValidController {
|
|
Integer month = Integer.valueOf(split[1]);
|
|
Integer month = Integer.valueOf(split[1]);
|
|
List<JSONObject> projectInfo = firstDeliveryValidService.getDataForProject(year, month.toString());
|
|
List<JSONObject> projectInfo = firstDeliveryValidService.getDataForProject(year, month.toString());
|
|
//剪辑
|
|
//剪辑
|
|
- List<JSONObject> clipInfo = firstDeliveryValidService.getDataForUserType(year, month.toString(), "clip_id");
|
|
|
|
- //拍摄
|
|
|
|
- List<JSONObject> shotInfo = firstDeliveryValidService.getDataForUserType(year, month.toString(), "shot_id");
|
|
|
|
- //编导
|
|
|
|
- List<JSONObject> planInfo = firstDeliveryValidService.getDataForUserType(year, month.toString(), "plan_id");
|
|
|
|
|
|
+ List<JSONObject> clipInfo = firstDeliveryValidService.getDesignDataExport(date, 1);
|
|
|
|
+ // 拍摄
|
|
|
|
+ List<JSONObject> shotInfo = firstDeliveryValidService.getDesignDataExport(date, 2);
|
|
|
|
+ // 编导
|
|
|
|
+ List<JSONObject> planInfo = firstDeliveryValidService.getDesignDataExport(date, 3);
|
|
|
|
+
|
|
try {
|
|
try {
|
|
List<List<Object>> projectExcelList = new ArrayList<>();
|
|
List<List<Object>> projectExcelList = new ArrayList<>();
|
|
List<List<Object>> clipExcelList = new ArrayList<>();
|
|
List<List<Object>> clipExcelList = new ArrayList<>();
|
|
@@ -160,8 +161,8 @@ public class FirstDeliveryValidController {
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
String[] titles = {"项目名称", "项目设计负责人", "项目运营负责人", "政策类型", "一级行业", "二级行业", "素材首投量",
|
|
String[] titles = {"项目名称", "项目设计负责人", "项目运营负责人", "政策类型", "一级行业", "二级行业", "素材首投量",
|
|
"有效素材首投量", "有效率", "媒体考核有效率"};
|
|
"有效素材首投量", "有效率", "媒体考核有效率"};
|
|
- String[] overtimeTitles = {"项目名称", "项目设计负责人", "项目运营负责人", "剪辑", "拍摄", "编导", "设计leader", "政策类型", "一级行业",
|
|
|
|
- "二级行业", "素材首投量", "有效素材首投量", "有效率", "媒体考核有效率"};
|
|
|
|
|
|
+ String[] overtimeTitles = {"项目名称", "项目设计负责人", "项目运营负责人", "设计leader", "设计", "政策类型", "一级行业", "二级行业", "首投素材量",
|
|
|
|
+ "有效首投素材量", "有效率", "媒体考核有效率"};
|
|
eeu.exportExcelForFirstDelivery(workbook, 0, "分项目", titles, projectExcelList);
|
|
eeu.exportExcelForFirstDelivery(workbook, 0, "分项目", titles, projectExcelList);
|
|
eeu.exportExcelForFirstDelivery(workbook, 1, "分剪辑", overtimeTitles, clipExcelList);
|
|
eeu.exportExcelForFirstDelivery(workbook, 1, "分剪辑", overtimeTitles, clipExcelList);
|
|
eeu.exportExcelForFirstDelivery(workbook, 2, "分拍摄", overtimeTitles, shotExcelList);
|
|
eeu.exportExcelForFirstDelivery(workbook, 2, "分拍摄", overtimeTitles, shotExcelList);
|
|
@@ -180,21 +181,32 @@ public class FirstDeliveryValidController {
|
|
info.forEach(data -> {
|
|
info.forEach(data -> {
|
|
List<Object> temp = new ArrayList<>();
|
|
List<Object> temp = new ArrayList<>();
|
|
temp.add(data.getString("projectName"));
|
|
temp.add(data.getString("projectName"));
|
|
|
|
+ temp.add(data.getString("projectDesignLeaderName"));
|
|
|
|
+ temp.add(data.getString("projectLeaderName"));
|
|
temp.add(data.getString("leaderName"));
|
|
temp.add(data.getString("leaderName"));
|
|
- temp.add(data.getString("projectLeader"));
|
|
|
|
- temp.add(data.getString("clipName"));
|
|
|
|
- temp.add(data.getString("shotName"));
|
|
|
|
- temp.add(data.getString("planName"));
|
|
|
|
- temp.add(data.getString("designLeader"));
|
|
|
|
|
|
+ temp.add(data.getString("designName"));
|
|
temp.add(data.getString("rebateType"));
|
|
temp.add(data.getString("rebateType"));
|
|
temp.add(data.getString("settlement1l"));
|
|
temp.add(data.getString("settlement1l"));
|
|
temp.add(data.getString("settlement2l"));
|
|
temp.add(data.getString("settlement2l"));
|
|
- temp.add(data.getBigDecimal("materialCount"));
|
|
|
|
- temp.add(data.getBigDecimal("validMaterials"));
|
|
|
|
- if (data.getBigDecimal("validRatioValue").compareTo(data.getBigDecimal("materialValidRatioValue")) < 0) {
|
|
|
|
- temp.add(data.getString("validRatio") + "-GREEN");
|
|
|
|
|
|
+ temp.add(data.getString("materialNum"));
|
|
|
|
+ temp.add(data.getString("effMaterialNum"));
|
|
|
|
+ temp.add(data.getString("effRate"));
|
|
|
|
+ if (!Check.isNull(data.getBigDecimal("effRate"))) {
|
|
|
|
+ String str = "";
|
|
|
|
+ str = data.getString("effRate") + "%";
|
|
|
|
+ if (data.getBigDecimal("effRate").compareTo(data.getBigDecimal("mediaEffRate")) < 0) {
|
|
|
|
+ temp.add(str + "-GREEN");
|
|
|
|
+ } else {
|
|
|
|
+ temp.add(str + "-G");
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ temp.add("-" + "-G");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!Check.isNull(data.getString("mediaEffRate"))) {
|
|
|
|
+ temp.add(data.getString("mediaEffRate") + "%");
|
|
} else {
|
|
} else {
|
|
- temp.add(data.getString("validRatio") + "-G");
|
|
|
|
|
|
+ temp.add("-");
|
|
}
|
|
}
|
|
temp.add(data.getString("materialValidRatio"));
|
|
temp.add(data.getString("materialValidRatio"));
|
|
excelList.add(temp);
|
|
excelList.add(temp);
|