diff --git a/src/main/java/cn/palmte/work/controller/backend/BusinessController.java b/src/main/java/cn/palmte/work/controller/backend/BusinessController.java new file mode 100644 index 0000000..25fc325 --- /dev/null +++ b/src/main/java/cn/palmte/work/controller/backend/BusinessController.java @@ -0,0 +1,45 @@ +package cn.palmte.work.controller.backend; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.Map; + +@Controller +@RequestMapping("/business") +public class BusinessController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(ProjectController.class); + + @RequestMapping("/bak1") + public String bak1(Map model) { + + return "/admin/bak1"; + } + + @RequestMapping("/bak2") + public String bak2(Map model) { + + return "/admin/bak2"; + } + + @RequestMapping("/bak3") + public String bak3(Map model) { + + return "/admin/bak3"; + } + + @RequestMapping("/bak4") + public String bak4(Map model) { + + return "/admin/bak4"; + } + + @RequestMapping("/bak5") + public String bak5(Map model) { + + return "/admin/bak5"; + } +} diff --git a/src/main/java/cn/palmte/work/service/SpaceService.java b/src/main/java/cn/palmte/work/service/SpaceService.java index 174cf2e..c38ba0c 100644 --- a/src/main/java/cn/palmte/work/service/SpaceService.java +++ b/src/main/java/cn/palmte/work/service/SpaceService.java @@ -141,10 +141,10 @@ public class SpaceService { public SpaceVO getListData() { - String sql = "SELECT count(id) as sum, certainty, certainty_str as name FROM project WHERE approve_status_estimate >= 1 and approve_status_estimate <= 2 and dept_name = '销售管理部' GROUP BY certainty"; + String sql = "SELECT count(id) as sum, certainty, certainty_str as name FROM project WHERE certainty >= 1 and approve_status_estimate >= 1 and approve_status_estimate <= 2 and dept_name = '销售管理部' GROUP BY certainty"; List pie = pagination.find(sql); - String sql2 = "SELECT sum(IFNULL(IF(pe.is_budget = 1, pe.contract_amount, p.contract_amount),0)) AS sum, avg(IFNULL(IF(pe.is_budget = 1, pe.gross_profit_margin, p.gross_profit_margin),0)) AS average, p.certainty, p.certainty_str as name, pe.is_budget FROM project p LEFT JOIN project_extend pe ON p.id = pe.project_id WHERE p.approve_status_estimate >= 1 AND p.approve_status_estimate <= 2 AND p.dept_name = '销售管理部' GROUP BY p.certainty"; + String sql2 = "SELECT sum(IFNULL(IF(pe.is_budget = 1, pe.contract_amount, p.contract_amount),0)) AS sum, avg(IFNULL(IF(pe.is_budget = 1, pe.gross_profit_margin, p.gross_profit_margin),0)) AS average, p.certainty, p.certainty_str as name, pe.is_budget FROM project p LEFT JOIN project_extend pe ON p.id = pe.project_id WHERE p.certainty >= 1 and p.approve_status_estimate >= 1 AND p.approve_status_estimate <= 2 AND p.dept_name = '销售管理部' GROUP BY p.certainty"; List bar = pagination.find(sql2); return combineData(pie, bar); } diff --git a/src/main/resources/templates/admin/bak1.ftl b/src/main/resources/templates/admin/bak1.ftl new file mode 100644 index 0000000..8a81544 --- /dev/null +++ b/src/main/resources/templates/admin/bak1.ftl @@ -0,0 +1,76 @@ + +
+

页面规划中...敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/bak2.ftl b/src/main/resources/templates/admin/bak2.ftl new file mode 100644 index 0000000..8a81544 --- /dev/null +++ b/src/main/resources/templates/admin/bak2.ftl @@ -0,0 +1,76 @@ + +
+

页面规划中...敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/bak3.ftl b/src/main/resources/templates/admin/bak3.ftl new file mode 100644 index 0000000..8a81544 --- /dev/null +++ b/src/main/resources/templates/admin/bak3.ftl @@ -0,0 +1,76 @@ + +
+

页面规划中...敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/bak4.ftl b/src/main/resources/templates/admin/bak4.ftl new file mode 100644 index 0000000..8a81544 --- /dev/null +++ b/src/main/resources/templates/admin/bak4.ftl @@ -0,0 +1,76 @@ + +
+

页面规划中...敬请期待

+<#-- --> +
+ diff --git a/src/main/resources/templates/admin/bak5.ftl b/src/main/resources/templates/admin/bak5.ftl new file mode 100644 index 0000000..8a81544 --- /dev/null +++ b/src/main/resources/templates/admin/bak5.ftl @@ -0,0 +1,76 @@ + +
+

页面规划中...敬请期待

+<#-- --> +
+