From e9ed18d0820ff5becb15259faf135c2935ea7e60 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 19 Aug 2022 11:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8A=98=E5=8F=A0,=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=80=BB=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProjectController.java | 6 +++--- src/main/java/cn/palmte/work/model/ProjectRepository.java | 3 +++ src/main/java/cn/palmte/work/service/ProjectService.java | 8 ++++++++ src/main/resources/templates/admin/project_list.ftl | 2 +- .../resources/templates/admin/project_list_approve.ftl | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 2d0b7ae..d6439ea 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -95,7 +95,7 @@ public class ProjectController extends BaseController { model.put("admin", InterfaceUtil.getAdmin()); model.put("deptList", deptService.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); - model.putIfAbsent("extend", "0"); + model.putIfAbsent("extend", "1"); Page page = projectService.list(searchInfo, pageNumber, pageSize); List list = page.getList(); if(CollectionUtil.isNotEmpty(list)){ @@ -142,7 +142,7 @@ public class ProjectController extends BaseController { */ @RequestMapping("/exportAll") public void exportAll(HttpServletResponse response, Integer id) throws IOException { - Project project = projectRepository.findOne(id); + Project project = projectService.findById(id); response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName())).getBytes(), StandardCharsets.ISO_8859_1))); response.setHeader("Connection", "close"); response.setHeader("Content-Type", "application/vnd.ms-excel"); @@ -522,7 +522,7 @@ public class ProjectController extends BaseController { model.put("admin", InterfaceUtil.getAdmin()); model.put("deptList", deptService.findAll()); ConcurrentHashMap searchInfo = getSearchInfo(keywords, model); - model.putIfAbsent("extend", "0"); + model.putIfAbsent("extend", "1"); Page page = projectService.list(searchInfo, pageNumber, pageSize); List list = page.getList(); if(CollectionUtil.isNotEmpty(list)){ diff --git a/src/main/java/cn/palmte/work/model/ProjectRepository.java b/src/main/java/cn/palmte/work/model/ProjectRepository.java index 1c78da0..39a7590 100644 --- a/src/main/java/cn/palmte/work/model/ProjectRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectRepository.java @@ -26,4 +26,7 @@ public interface ProjectRepository extends JpaRepository { @Transactional(rollbackOn = Exception.class) @Query(value = "update project set project_no = ?1 where id = ?2", nativeQuery = true) int updateProjectNo(String projectNo, int id); + + @Query(value = "SELECT p.*, FORMAT(p.contract_amount,2) as contractRound, FORMAT(p.huazhi_product_amount,2) as huazhiRound, FORMAT(p.huizhi_product_amount,2) as huizhiRound, FORMAT(p.huasan_product_amount,2) as huasanRound, FORMAT(p.ziguang_other_amount,2) as ziguangRound, FORMAT(p.gross_profit,2) as grossProfitRound, FORMAT(p.gross_profit_margin,2) as grossProfitMarginRound, FORMAT(p.advance_interest_amount,2) as advanceInterestAmountRound, FORMAT(p.advance_peak_amount,2) as advancePeakAmountRound from project p where id = ?1 limit 1", nativeQuery = true) + Project findById(int id); } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 24a4368..c7c9eee 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -517,4 +517,12 @@ public class ProjectService { } projectRepository.save(project); } + + public Project findById(Integer id) { + QueryHelper queryHelper = new QueryHelper("SELECT p.*, FORMAT(p.contract_amount,2) as contractRound, FORMAT(p.huazhi_product_amount,2) as huazhiRound, FORMAT(p.huizhi_product_amount,2) as huizhiRound, FORMAT(p.huasan_product_amount,2) as huasanRound, FORMAT(p.ziguang_other_amount,2) as ziguangRound" + + ", FORMAT(p.gross_profit,2) as grossProfitRound, FORMAT(p.gross_profit_margin,2) as grossProfitMarginRound, FORMAT(p.advance_interest_amount,2) as advanceInterestAmountRound, FORMAT(p.advance_peak_amount,2) as advancePeakAmountRound","project","p"); + queryHelper.addCondition("p.id=?", id); + Project first = pagination.findFirst(queryHelper.getSql(), Project.class); + return first; + } } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 18d429a..434f822 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -249,7 +249,7 @@
<@shiro.hasPermission name="PROJECT_QUERY"> <@shiro.hasPermission name="APPROVE_QUERY">