yumeng hai 1 ano
pai
achega
04f2b9ade0

+ 25 - 13
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/controller/FirstDeliveryValidController.java

@@ -119,8 +119,14 @@ public class FirstDeliveryValidController {
         }
         String[] split = date.split("-");
         String year = split[0];
-        Integer month = Integer.valueOf(split[1]);
-        List<JSONObject> projectInfo = firstDeliveryValidService.getDataForProject(year, month.toString());
+        String monthStr = split[1];
+        String month = "";
+        if ("10".equals(month)) {
+            month = "10";
+        } else {
+            month = monthStr.replace("0", "");
+        }
+        List<JSONObject> projectInfo = firstDeliveryValidService.getDataForProject(year, month);
         //剪辑
         List<JSONObject> clipInfo = firstDeliveryValidService.getDesignDataExport(date, 1);
         // 拍摄
@@ -137,19 +143,26 @@ public class FirstDeliveryValidController {
                 projectInfo.forEach(data -> {
                     List<Object> temp = new ArrayList<>();
                     temp.add(data.getString("projectName"));
-                    temp.add(data.getString("leaderName"));
-                    temp.add(data.getString("projectLeader"));
+                    temp.add(data.getString("projectLeaderName"));
+                    temp.add(data.getString("dessLeaderName"));
                     temp.add(data.getString("rebateType"));
                     temp.add(data.getString("settlement1l"));
                     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("effCount"));
+                    if (!Check.isNull(data.getInteger("color"))) {
+                        if (data.getInteger("color") == 2) {
+                            temp.add(data.getString("effRate") + "-GREEN");
+                        } else {
+                            temp.add(data.getString("effRate") + "-G");
+                        }
                     } else {
-                        temp.add(data.getString("validRatio") + "-G");
+                        temp.add("-");
                     }
-                    temp.add(data.getString("materialValidRatio"));
+                    temp.add(data.getString("mediaEffRate"));
+                    temp.add(data.getString("selfEffCount"));
+                    temp.add(data.getString("selfEffRate"));
+                    temp.add(data.getString("thirdEffCount"));
                     projectExcelList.add(temp);
                 });
             }
@@ -159,8 +172,8 @@ public class FirstDeliveryValidController {
             OutputStream os = response.getOutputStream();
             ExportExcelUtils eeu = new ExportExcelUtils();
             XSSFWorkbook workbook = new XSSFWorkbook();
-            String[] titles = {"项目名称", "项目设计负责人", "项目运营负责人", "政策类型", "一级行业", "二级行业", "素材首投量",
-                    "有效素材首投量", "有效率", "媒体考核有效率"};
+            String[] titles = {"项目", "运营负责人", "设计负责人", "政策类型", "一级行业", "二级行业", "素材量",
+                    "有效首投数", "有效首投率", "媒体考核有效率", "自产素材有效数", "自产素材有效占比", "三方素材有效数"};
             String[] overtimeTitles = {"项目名称", "项目设计负责人", "项目运营负责人", "设计leader", "设计", "政策类型", "一级行业", "二级行业", "首投素材量",
                     "有效首投素材量", "有效率", "媒体考核有效率"};
             eeu.exportExcelForFirstDelivery(workbook, 0, "分项目", titles, projectExcelList);
@@ -190,7 +203,6 @@ public class FirstDeliveryValidController {
                 temp.add(data.getString("settlement2l"));
                 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") + "%";

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/FirstDeliveryValidMapper.java

@@ -29,7 +29,6 @@ public interface FirstDeliveryValidMapper {
 
     List<JSONObject> getDataForProject(@Param("year") String year,@Param("month") String month);
 
-    List<JSONObject> getDataForClip(@Param("year") String year,@Param("month") String month);
 
     Integer getDesignDataTotal(@Param("year") String year, @Param("month") String month, @Param("designRole") Integer designRole);
 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 123 - 72
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/FirstDeliveryValidMapper.xml