From 2bbecd100540b512f319c940b3a47ff2cfe4bebd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 8 Nov 2021 13:26:59 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/CategoryProjectListResultDTO.java | 15 +++++++++++++++ .../mapper/screen/ScreenProjectDataDao.xml | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java index c1e191b8bb..5250826a3c 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java @@ -45,6 +45,21 @@ public class CategoryProjectListResultDTO implements Serializable { */ private String projectId; + /** + * 上报人 + */ + private String linkName; + + /** + * 上报人电话 + */ + private String linkMobile; + + /** + * 事件地址 + */ + private String projectAddress; + @JsonIgnore private String orgId; diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 27681bacad..accf6111e4 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -168,7 +168,10 @@ DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime, ORG_ID, ORG_TYPE, - PROJECT_ID + PROJECT_ID, + LINK_NAME, + LINK_MOBILE, + PROJECT_ADDRESS FROM screen_project_data WHERE DEL_FLAG = '0' From ba7c4b141093653a0f5d3646d7068f032eefdf47 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 8 Nov 2021 13:38:52 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=88=B6=E7=BA=A7paren?= =?UTF-8?q?tCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/project/dto/result/ProjectCategoryResultDTO.java | 5 +++++ .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java index f94fe8cb40..379257551f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java @@ -23,6 +23,11 @@ public class ProjectCategoryResultDTO implements Serializable { */ private String categoryCode; + /** + * 分类code父级 + */ + private String parentCategoryCode; + /** * 分类名字 */ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index 96d06f7f93..f92fb1aade 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -94,9 +94,11 @@ + + From e975ac29eebe49bb1375344e57d41d630ba73ff8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 8 Nov 2021 14:41:18 +0800 Subject: [PATCH 05/38] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 3a3fe87591..a8ed528963 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -308,9 +308,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { result.forEach(r -> { finalEndCategoryList.stream().filter(e -> r.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> { r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio()); + r.setProjectTotal(e.getProjectTotal()); + r.setClosedProjectTotal(e.getClosedProjectTotal()); }); r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> { son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio()); + son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal()); })); }); // 排序 From 64698b1ebb04c1ab79795054f88b6de703535a95 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 8 Nov 2021 15:07:16 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/ScreenProjectController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 3a58d96d4c..87aa340fac 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -241,12 +241,12 @@ public class ScreenProjectController { * @date 2021/11/4 3:38 下午 */ @PostMapping("selectcategoryprojectlist/export") - public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO,/*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception { - tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); - tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO,@LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { + //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); + //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); formDTO.setIsPage(false); - formDTO.setStatus("all"); - formDTO.setCategoryCode("0102"); + //formDTO.setStatus("all"); + //formDTO.setCategoryCode("0102"); ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); PageCategoryProjectListResultDTO data = screenProjectService.selectCategoryProjectList(formDTO,tokenDto); String templatePath = "excel/project_temp.xlsx"; From 4b6481b5040c0a441ffc19105845cd54535513a1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 10:03:23 +0800 Subject: [PATCH 07/38] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/project/dto/result/ProjectCategoryResultDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java index 4d1a418b59..77dd74f719 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java @@ -67,8 +67,8 @@ public class ProjectCategoryResultDTO implements Serializable { this.categoryName = ""; this.projectTotal = NumConstant.ZERO; this.closedProjectTotal = NumConstant.ZERO; - this.totalRatio = ""; - this.closedRatio = ""; + this.totalRatio = "0.00%"; + this.closedRatio = "0.00%"; this.children = new ArrayList<>(); } } From 626bc410428168f29e47d7418971b83eb0fe3399 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 10:52:56 +0800 Subject: [PATCH 08/38] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/project/dto/result/ProjectCategoryResultDTO.java | 6 ++++++ .../screen/impl/ScreenProjectServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java index 77dd74f719..d51825c27b 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java @@ -48,6 +48,11 @@ public class ProjectCategoryResultDTO implements Serializable { */ private Integer closedProjectTotal; + /** + * 所有项目总数 + */ + private Integer allProjectTotal; + /** * 总数占比 */ @@ -70,5 +75,6 @@ public class ProjectCategoryResultDTO implements Serializable { this.totalRatio = "0.00%"; this.closedRatio = "0.00%"; this.children = new ArrayList<>(); + this.allProjectTotal = NumConstant.ZERO; } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index a8ed528963..19861641df 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -284,6 +284,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { endCategoryList.forEach(e -> { e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal)); e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal())); + e.setAllProjectTotal(finalTotal); }); }else { Integer endTotal = screenProjectOrgDailyDao.selectProjectTotalByAgency(customerId, endTime, orgId); @@ -302,6 +303,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { endCategoryList.forEach(e -> { e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal)); e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal())); + e.setAllProjectTotal(finalTotal); }); } List finalEndCategoryList = endCategoryList; From 357a95aac9ae0f7f9a63fd4087a565a05d97f5e1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 11:04:56 +0800 Subject: [PATCH 09/38] zongshu --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 19861641df..731e779758 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -312,10 +312,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio()); r.setProjectTotal(e.getProjectTotal()); r.setClosedProjectTotal(e.getClosedProjectTotal()); + r.setAllProjectTotal(e.getAllProjectTotal()); }); r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> { son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio()); son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal()); + son.setAllProjectTotal(e.getAllProjectTotal()); })); }); // 排序 From 3c1ee84dde8c2d665161d99b6b3c349906cdc1c7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 14:50:53 +0800 Subject: [PATCH 10/38] emm --- .../screen/impl/ScreenProjectOrgDailyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java index 9fbca67078..ec0377ab83 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java @@ -195,7 +195,7 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl { a.setDateId(dateId); projectOrgDaily.forEach(p -> { - if (a.getAreaCode().equals(p.getAreaCode())){ + if (a.getOrgId().equals(p.getOrgId())){ a.setBadTotal(p.getBadTotal() + a.getBadTotal()); a.setEvaluateTotal(p.getEvaluateTotal() + a.getEvaluateTotal()); a.setGoodTotal(p.getGoodTotal() + a.getGoodTotal()); From 6f5227ce0c93d9a21c28f5dad84f91703f7d50db Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 15:09:40 +0800 Subject: [PATCH 11/38] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml index 109c194e18..c2f3323cd7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -208,7 +208,7 @@ AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '') AND cd.EPMET_CATEGORY_CODE != '' - AND pd.PROJECT_STATUS_CODE = 'closed' + AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case') AND pd.ALL_PARENT_IDS LIKE CONCAT('%',(SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0'),'%') AND DATE_FORMAT(pd.project_create_time,'%Y%m%d') #{dateId} GROUP BY categoryCode From 7cda5354cc741c35cb1395f3183389ef33dc5a3c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 15:25:42 +0800 Subject: [PATCH 12/38] =?UTF-8?q?=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 731e779758..4c0833ba3e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -350,10 +350,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { if (denominator == NumConstant.ZERO){ return "0.00%"; } - BigDecimal bigDecimalMolecule = new BigDecimal(molecule); + BigDecimal bigDecimalMolecule = new BigDecimal(molecule * NumConstant.ONE_HUNDRED); BigDecimal bigDecimalDenominator = new BigDecimal(denominator); BigDecimal divide = bigDecimalMolecule.divide(bigDecimalDenominator, NumConstant.TWO, BigDecimal.ROUND_HALF_UP); - return divide.multiply(NumConstant.ONE_HUNDRED_DECIMAL)+"%"; + return divide+"%"; } /** From b27c14afedacfd5a2ff4f7250e70747d586173ff Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 9 Nov 2021 16:37:32 +0800 Subject: [PATCH 13/38] =?UTF-8?q?=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/DemoController.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index c053346087..6fefc845b6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -943,9 +943,25 @@ public class DemoController { @Autowired private ScreenProjectCategoryOrgDailyService screenProjectCategoryOrgDailyService; - @PostMapping("orgdaily") - public Result orgDaily(@RequestParam("customerId")String customerId,@RequestParam("dateId")String dateId){ - screenProjectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId); + @PostMapping("gridandorgdaily") + public Result orgDaily(@RequestParam("customerId")String customerId,@RequestParam("dateId")String dateId, + @RequestParam(name = "startDate",required = false)String startDate, + @RequestParam(name = "endDate",required = false)String endDate + ){ + long start = System.currentTimeMillis(); + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ + List daysBetween = DateUtils.getDaysBetween(startDate, endDate); + daysBetween.forEach(d -> { + projectCategoryGridDailyService.extractProjectCategoryData(customerId,d); + screenProjectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,d); + }); + }else { + projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId); + screenProjectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId); + } + long end = System.currentTimeMillis(); + long l = (end - start) / 1000; + log.info("gridAndOrgDaily耗时" + l+ "s"); return new Result(); } From b3ea311e1348214183b799da2a5df9cb0337c0aa Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Nov 2021 19:00:41 +0800 Subject: [PATCH 14/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9report=20=E5=86=85?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/deploy/docker-compose-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index fa6f9d7f73..c07cfe618a 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./data-report.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./data-report.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 600M + memory: 1600M From 66a7322337c9872a8c4e8f5fbfa63b2a6b5bdebc Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Nov 2021 23:47:51 +0800 Subject: [PATCH 15/38] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E5=A4=A7=E6=95=B0=E6=8D=AE=E6=B5=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20=E8=AF=A5=E7=94=A8easyExcel=20=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E5=86=99=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/ExcelUtils.java | 11 ++- .../result/CategoryProjectListResultDTO.java | 10 +++ .../data-report/data-report-server/pom.xml | 6 ++ .../screen/ScreenProjectController.java | 72 ++++++++++++------ .../screen/impl/ScreenProjectServiceImpl.java | 12 ++- .../excel/project_temp_easy_excel.xlsx | Bin 0 -> 9188 bytes 6 files changed, 81 insertions(+), 30 deletions(-) create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/excel/project_temp_easy_excel.xlsx diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java index 773291dfcc..6dae6eb249 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java @@ -19,8 +19,8 @@ import org.springframework.util.CollectionUtils; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.OutputStream; import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -121,5 +121,14 @@ public class ExcelUtils { out.flush(); out.close(); } + public static OutputStream getOutputStream(String fileName, HttpServletResponse response) throws Exception { + fileName = URLEncoder.encode(fileName, "UTF-8"); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf8"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.addHeader("Access-Control-Expose-Headers", "Content-disposition"); + + return response.getOutputStream(); + } } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java index 5250826a3c..ec8694fd1b 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java @@ -25,6 +25,11 @@ public class CategoryProjectListResultDTO implements Serializable { */ private String projectStatus; + /** + * 项目状态:待处理 pending，结案closed + */ + private String projectStatusDesc; + /** * 项目标题 */ @@ -69,8 +74,13 @@ public class CategoryProjectListResultDTO implements Serializable { public CategoryProjectListResultDTO() { this.category = ""; this.projectStatus = ""; + this.projectStatusDesc = ""; this.projectTitle = ""; this.gridName = ""; this.createTime = ""; } + + public String getProjectStatusDesc() { + return "closed".equals(projectStatus)?"已结案":"处理中"; + } } diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 15936771b6..25a8220b54 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -100,6 +100,12 @@ 2.0.0 compile + + com.alibaba + easyexcel + 3.0.3 + compile + diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 87aa340fac..81babdb9ce 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -2,12 +2,17 @@ package com.epmet.datareport.controller.screen; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectOrgDailyService; @@ -241,30 +246,53 @@ public class ScreenProjectController { * @date 2021/11/4 3:38 下午 */ @PostMapping("selectcategoryprojectlist/export") - public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO,@LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { - //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); - //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - formDTO.setIsPage(false); - //formDTO.setStatus("all"); - //formDTO.setCategoryCode("0102"); - ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); - PageCategoryProjectListResultDTO data = screenProjectService.selectCategoryProjectList(formDTO,tokenDto); - String templatePath = "excel/project_temp.xlsx"; + public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { + ExcelWriter excelWriter = null; + try { + //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); + //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - Map mapData = new HashMap<>(); - mapData.put("list",data.getList()); - mapData.put("orgName",staffInfo.getAgencyName()); - mapData.put("exportDate",getExportDateStr(formDTO.getStartTime(),formDTO.getEndTime())); - mapData.put("categoryName", formDTO.getCategoryName()); - if (StringUtils.isNotBlank(formDTO.getParentCategoryName())){ - mapData.put("categoryName", formDTO.getParentCategoryName().concat(StrConstant.HYPHEN).concat(formDTO.getCategoryName())); - } + formDTO.setIsPage(false); + ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); - Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData); - response.setHeader("content-Type", "application/vnd.ms-excel"); - response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目统计.xls", "UTF-8")); - workbook.write(response.getOutputStream()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + Map mapData = new HashMap<>(); + mapData.put("orgName", staffInfo == null ? StrConstant.EPMETY_STR : staffInfo.getAgencyName()); + mapData.put("exportDate", getExportDateStr(formDTO.getStartTime(), formDTO.getEndTime())); + mapData.put("categoryName", formDTO.getCategoryName()); + if (StringUtils.isNotBlank(formDTO.getParentCategoryName())) { + mapData.put("categoryName", formDTO.getParentCategoryName().concat(StrConstant.HYPHEN).concat(formDTO.getCategoryName())); + } + + String templatePath = "/excel/project_temp_easy_excel.xlsx"; + String template = this.getClass().getResource(templatePath).getPath(); + String fileName = "项目统计.xls"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(template).build(); + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + excelWriter.fill(mapData, writeSheet); + + formDTO.setPageSize(NumConstant.ONE); + PageCategoryProjectListResultDTO data = null; + do { + data = screenProjectService.selectCategoryProjectList(formDTO, tokenDto); + if (data.getList().isEmpty()) { + break; + } + formDTO.setPageNo(formDTO.getPageNo() + 1); + excelWriter.fill(data.getList(), writeSheet); + } while (data.getList().size() == formDTO.getPageSize()); + +// String templatePath = "excel/project_temp.xlsx"; +// Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData); +// response.setHeader("content-Type", "application/vnd.ms-excel"); +// response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目统计.xls", "UTF-8")); +// workbook.write(response.getOutputStream()); + + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } } @NotNull diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 4c0833ba3e..bc23641267 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -375,13 +375,11 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { } PageCategoryProjectListResultDTO result = new PageCategoryProjectListResultDTO(); List list; - if (formDTO.getIsPage()){ - PageInfo objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus())); - list = objectPageInfo.getList(); - result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal()))); - }else { - list = screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus()); - } + PageInfo objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus())); + list = objectPageInfo.getList(); + result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal()))); + if (!CollectionUtils.isEmpty(list)){ list.forEach(l -> { if (l.getOrgType().equals(FactConstant.AGENCY)){ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/excel/project_temp_easy_excel.xlsx b/epmet-module/data-report/data-report-server/src/main/resources/excel/project_temp_easy_excel.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..41f27c780cc850023910d8d0b2cc94decb68fe93 GIT binary patch literal 9188 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 literal 0 HcmV?d00001 From 1c13d642a78fed37da6fafd4ba39172c063a89b5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Nov 2021 23:58:04 +0800 Subject: [PATCH 16/38] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datareport/controller/screen/ScreenProjectController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 81babdb9ce..e57f56e433 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -266,7 +266,7 @@ public class ScreenProjectController { String templatePath = "/excel/project_temp_easy_excel.xlsx"; String template = this.getClass().getResource(templatePath).getPath(); - String fileName = "项目统计.xls"; + String fileName = "项目统计.xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(template).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); excelWriter.fill(mapData, writeSheet); From e7fc91aab611efc94ad40618db64213f0f5890f4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Nov 2021 00:46:00 +0800 Subject: [PATCH 17/38] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/ScreenProjectController.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index e57f56e433..7f74cb1e5c 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -246,11 +247,11 @@ public class ScreenProjectController { * @date 2021/11/4 3:38 下午 */ @PostMapping("selectcategoryprojectlist/export") - public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { + public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, /*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception { ExcelWriter excelWriter = null; try { - //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); - //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); + tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); formDTO.setIsPage(false); ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); @@ -264,8 +265,11 @@ public class ScreenProjectController { mapData.put("categoryName", formDTO.getParentCategoryName().concat(StrConstant.HYPHEN).concat(formDTO.getCategoryName())); } - String templatePath = "/excel/project_temp_easy_excel.xlsx"; - String template = this.getClass().getResource(templatePath).getPath(); + String templatePath = "excel/project_temp_easy_excel.xlsx"; + ClassPathResource classPathResource = new ClassPathResource(templatePath); + String template = classPathResource.getPath(); + + //String template = this.getClass().getResource(templatePath).getPath(); String fileName = "项目统计.xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(template).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); From 41b598e51e5152661601a1a0e023a84cd3556db9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Nov 2021 00:56:25 +0800 Subject: [PATCH 18/38] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/data-report/data-report-server/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 25a8220b54..a0c7d72136 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -138,6 +138,9 @@ true ${basedir}/src/main/resources + + **/* + From ecb416d87d50247017b347fb594a3a997b867841 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Nov 2021 01:03:44 +0800 Subject: [PATCH 19/38] =?UTF-8?q?=E6=A8=A1=E7=89=88=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/ScreenProjectController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 7f74cb1e5c..2e419c5953 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -36,10 +36,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.ClassPathResource; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; @@ -266,12 +266,12 @@ public class ScreenProjectController { } String templatePath = "excel/project_temp_easy_excel.xlsx"; - ClassPathResource classPathResource = new ClassPathResource(templatePath); - String template = classPathResource.getPath(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath); + //String template = this.getClass().getResource(templatePath).getPath(); String fileName = "项目统计.xlsx"; - excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(template).build(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(inputStream).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); excelWriter.fill(mapData, writeSheet); From 9afe7c466d56dc9ac100048947d59246962284d1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Nov 2021 01:04:52 +0800 Subject: [PATCH 20/38] =?UTF-8?q?=E6=A8=A1=E7=89=88=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/data-report/data-report-server/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index a0c7d72136..25a8220b54 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -138,9 +138,6 @@ true ${basedir}/src/main/resources - - **/* - From 777c7dee86be1846d6d5bae919bd580716109c0e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 10 Nov 2021 01:12:08 +0800 Subject: [PATCH 21/38] =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=9F=A51000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/ScreenProjectController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 2e419c5953..66d088dd27 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -247,12 +247,13 @@ public class ScreenProjectController { * @date 2021/11/4 3:38 下午 */ @PostMapping("selectcategoryprojectlist/export") - public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, /*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception { + public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { ExcelWriter excelWriter = null; try { - tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); - tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - + //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); + //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.ONE_THOUSAND); formDTO.setIsPage(false); ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); @@ -275,7 +276,6 @@ public class ScreenProjectController { WriteSheet writeSheet = EasyExcel.writerSheet().build(); excelWriter.fill(mapData, writeSheet); - formDTO.setPageSize(NumConstant.ONE); PageCategoryProjectListResultDTO data = null; do { data = screenProjectService.selectCategoryProjectList(formDTO, tokenDto); From be28295c4cec260e170740d4061a102d9e37c853 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 Nov 2021 16:37:52 +0800 Subject: [PATCH 22/38] =?UTF-8?q?subagencyindexrank-py=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 8b4eed6642..8e29ff2cec 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -388,6 +388,9 @@ ROUND((ROUND(sy.govern_ablity,1) * sy.GOVERN_ABLITY_WEIGHT),1) AS governAbility, ROUND((ROUND(sy.party_dev_ablity,1) * sy.PARTY_DEV_WEIGHT),1) AS partyDevAbility, ROUND((ROUND(sy.service_ablity,1) * sy.SERVICE_ABLITY_WEIGHT),1) AS serviceAbility, + ROUND(sy.govern_ablity,1) AS originGovernAbility, + ROUND(sy.party_dev_ablity,1) AS originPartyDevAbility, + ROUND(sy.service_ablity,1) AS originServiceAbility, sy.ORG_ID as orgId, scg.area_code as areaCode FROM screen_customer_grid scg From 3d2831a3998db28e188539c3d1c3cb0f976fc4cd Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 10:57:43 +0800 Subject: [PATCH 23/38] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=9130=E5=A4=A9?= =?UTF-8?q?=E7=9A=84=20=E4=BA=8B=E4=BB=B6=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenProjectDataDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index accf6111e4..05753a7b3a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -135,7 +135,7 @@ AND pd.ORG_TYPE = 'agency' AND pd.PROJECT_LEVEL != 0 AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) UNION ALL (SELECT pd.PROJECT_LEVEL @@ -145,7 +145,7 @@ AND pd.ORG_TYPE = 'grid' AND pd.PROJECT_LEVEL != 0 AND scg.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) UNION ALL (SELECT pd.PROJECT_LEVEL @@ -155,7 +155,7 @@ AND pd.ORG_TYPE = 'department' AND pd.PROJECT_LEVEL != 0 AND scd.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) + AND UNIX_TIMESTAMP(pd.PROJECT_CREATE_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) From 6a752c6e94e70a96a1895d1a7cc9f58f63b22006 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 12:06:08 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E5=B1=9E?= =?UTF-8?q?=E8=A1=97=E9=81=93=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7id=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index bc23641267..ade6b21883 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -172,7 +172,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { List resultList = new ArrayList<>(); if (!CollectionUtils.isEmpty(resultDTOList)) { for (CategoryAnalysisResultDTO dto : resultDTOList) { - CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), dto.getCategoryOriginCustomerId()); + CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), customerId); if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) { log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", dto.getCategoryCode(), customerId)); continue; From 6ef25a305243750556b5ecc04be8f3c080f1c4a1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 13:16:09 +0800 Subject: [PATCH 25/38] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E5=B1=9E?= =?UTF-8?q?=E8=A1=97=E9=81=93=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0=20?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=20=E5=BE=85=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=E5=86=8D=E6=92=A4=E5=9B=9E=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index b9dfb3faaa..14d64c7460 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -29,6 +29,7 @@ created_time desc limit 1 ) + GROUP BY m.DATE_ID,m.CATEGORY_CODE,m.PROJECT_TOTAL ORDER BY M.PROJECT_TOTAL desc @@ -117,4 +118,4 @@ AND p2.CUSTOMER_ID = #{customerId} AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE - \ No newline at end of file + From c19cc7bfab3f3528b05c13fecf9b6190cbc409ad Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 12 Nov 2021 15:17:14 +0800 Subject: [PATCH 26/38] =?UTF-8?q?Revert=20"=E6=9F=A5=E8=AF=A2=E4=B8=8B?= =?UTF-8?q?=E5=B1=9E=E8=A1=97=E9=81=93=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0?= =?UTF-8?q?=20=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3=20=E5=BE=85=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=E5=86=8D=E6=92=A4=E5=9B=9E=20=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6ef25a30 --- .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index 14d64c7460..b9dfb3faaa 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -29,7 +29,6 @@ created_time desc limit 1 ) - GROUP BY m.DATE_ID,m.CATEGORY_CODE,m.PROJECT_TOTAL ORDER BY M.PROJECT_TOTAL desc @@ -118,4 +117,4 @@ AND p2.CUSTOMER_ID = #{customerId} AND p1.CATEGORY_CODE = p2.PARENT_CATEGORY_CODE - + \ No newline at end of file From a42b97a2a66c42bcd03c6b1e5043b93ebf5bcdb4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 15 Nov 2021 17:17:06 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88=E7=8E=87?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectLogDailyDao.xml | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 92dd3ee38a..3c9de3e83b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -488,30 +488,32 @@ + + + select + a.ID as id, + a.LABEL as label, + a.MANAGEMENT_ICON as managementIcon, + a.DATA_ICON as dataIcon, + a.HOUSE_SHOW_ICON as houseShowIcon, + a.`STATUS` as status, + a.SORT as sort , + b.LEVEL_1 as level1, + b.LEVEL_2 as level2, + b.LEVEL_3 as level3, + b.WARN + from + ic_resi_category_stats_config a + left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} + where a.DEL_FLAG = 0 and a.CUSTOMER_ID = #{customerId} + + AND b.WARN = CONCAT(#{isWarn},'') + + + AND b.LEVEL_1 IS NOT NULL + + + AND b.LEVEL_2 IS NOT NULL + + ORDER BY a.SORT + + + + \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml index 419adda97c..7fe3679b42 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml @@ -9,6 +9,7 @@ + From 41d1428f0297ac35eae21c7f4b067fd0644d29a6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Nov 2021 10:04:16 +0800 Subject: [PATCH 38/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResiCategoryStatsConfigServiceImpl.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java index 086b9b700f..e95f209aba 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java @@ -56,7 +56,7 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf if(CollectionUtils.isEmpty(icFormItemEntityList)){ return new ArrayList<>(); } - Set groupIds = icFormItemEntityList.stream().filter(item-> !"0".equals(item.getItemGroupId())).map(item->item.getItemGroupId()).collect(Collectors.toSet()); + Set groupIds = icFormItemEntityList.stream().filter(item-> !"0".equals(item.getItemGroupId())).map(IcFormItemEntity::getItemGroupId).collect(Collectors.toSet()); List icFormItemGroupEntityList = new ArrayList<>(); if(!CollectionUtils.isEmpty(groupIds)){ icFormItemGroupEntityList.addAll(icFormItemGroupDao.selectList(new QueryWrapper().lambda().eq(IcFormItemGroupEntity::getCustomerId,customerId).in(IcFormItemGroupEntity::getId, groupIds))); @@ -149,15 +149,11 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf } //4.返回数据 - List result = icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); - - return result; + return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); } @Override - @Transactional(rollbackFor = Exception.class) public IcResiCategoryStatsConfigResultDTO info(String id,String customerId) { - IcResiCategoryStatsConfigResultDTO result =new IcResiCategoryStatsConfigResultDTO(); return icResiCategoryStatsConfigDao.info(id,customerId); } @@ -228,7 +224,5 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf warnConfigEntity.setSort(collect.get(0).getSort()); } icResiCategoryWarnConfigService.updateBatchById(warnConfigEntityList); - - } }