yumeng 1 年之前
父節點
當前提交
f8d05b8208

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

@@ -85,6 +85,18 @@ public class FirstDeliveryValidController {
     }
 
 
+    @GetMapping(value = "/getDesignData")
+    @ResponseBody
+    public Result<Object> getDesignData(String date,Integer pageSize,Integer pageNo,Integer designRole) {
+        try {
+            return firstDeliveryValidService.getDesignData(date,pageSize,pageNo,designRole);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("导入EXCEL失败," + e.getMessage());
+        }
+    }
+
+
     @GetMapping(value = "/getTotalData")
     @ResponseBody
     public Result<Object> getTotalData(String date,Integer pageSize,Integer pageNo) {
@@ -97,7 +109,6 @@ public class FirstDeliveryValidController {
     }
 
 
-
     /**
      * 导出数据
      */

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

@@ -30,4 +30,8 @@ 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);
+
+    List<JSONObject> getDesignData(@Param("year") String year, @Param("month") String month, @Param("designRole") Integer designRole);
 }

文件差異過大導致無法顯示
+ 91 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/FirstDeliveryValidMapper.xml


+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/service/FirstDeliveryValidService.java

@@ -19,4 +19,6 @@ public interface FirstDeliveryValidService {
     List<JSONObject> getDataForProject(String year, String month);
 
     List<JSONObject> getDataForClip(String year, String month);
+
+    Result<Object> getDesignData(String date, Integer pageSize, Integer pageNo,Integer designRole);
 }

+ 20 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/FirstDeliveryValidServiceImpl.java

@@ -114,6 +114,26 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
     }
 
     @Override
+    public Result<Object> getDesignData(String date, Integer pageSize, Integer pageNo,Integer designRole) {
+        String[] split = date.split("-");
+        String year = split[0];
+        String monthStr = split[1];
+        String month = "";
+        if ("10".equals(month)) {
+            month = "10";
+        } else {
+            month = monthStr.replace("0", "");
+        }
+        Integer total = deliveryValidMapper.getDesignDataTotal(year, month,designRole);
+        PageHelper.startPage(pageNo, pageSize, true);
+        List<JSONObject> data = deliveryValidMapper.getDesignData(year, month,designRole);
+        PageInfo<JSONObject> page = new PageInfo<>();
+        page.setList(data);
+        page.setTotal(total);
+        return Result.OK(page);
+    }
+
+    @Override
     public Result<Object> projectData(String date, Integer pageSize, Integer pageNo) {
         String[] split = date.split("-");
         String year = split[0];