From 173ce4a0efee4d717546043d8ea17c1e1e135795 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 21 Dec 2021 10:44:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?resibuzz=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ResiBuzzIssueCategoryDTO.java | 21 +++++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 8 ++++ .../epmet/service/impl/IssueServiceImpl.java | 4 ++ .../src/main/resources/mapper/IssueDao.xml | 46 ++++++++++--------- 4 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzIssueCategoryDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzIssueCategoryDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzIssueCategoryDTO.java new file mode 100644 index 0000000000..59425a2b1c --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzIssueCategoryDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/12/20 5:14 下午 + * @DESC + */ +@Data +public class ResiBuzzIssueCategoryDTO implements Serializable { + + private static final long serialVersionUID = 5050318228251317747L; + + private String issueId; + + private List cn; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index a853364839..4fb4664534 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -262,4 +262,12 @@ public interface IssueDao extends BaseDao { */ List getProjectCountByGrid(@Param("orgId")String orgId,@Param("startDate")String startDate,@Param("endDate")String endDate); + /** + * @Description 根据issueIds查询分类名 + * @param issueIds + * @author zxc + * @date 2021/12/20 5:15 下午 + */ + List selectCategoryNameByIssueIds(@Param("issueIds")List issueIds); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index f433bd60ed..ce5dafdb9c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1594,6 +1594,10 @@ public class IssueServiceImpl extends BaseServiceImpl imp } List list = allList.stream().skip(formDTO.getPageSize() * (formDTO.getPageNo() - NumConstant.ONE)) .limit(formDTO.getPageSize()).collect(Collectors.toList()); + List names = baseDao.selectCategoryNameByIssueIds(allList.stream().map(m -> m.getIssueId()).collect(Collectors.toList())); + if (CollectionUtils.isNotEmpty(names)){ + list.forEach(l -> names.stream().filter(n -> l.getIssueId().equals(n.getIssueId())).forEach(n -> l.setCategoryName(n.getCn()))); + } AtomicReference no = new AtomicReference<>((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE); ResiBuzzResultDTO result = new ResiBuzzResultDTO(); UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 55648edcad..ecc7dd39f0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -580,21 +580,7 @@ - - - - - - - - - - - - - - - SELECT i.ID AS issueId, i.ISSUE_TITLE AS issueTitle, @@ -607,12 +593,9 @@ i.CREATED_TIME AS createdTime, s.SUPPORT_COUNT AS supportCount, s.OPPOSITION_COUNT AS oppositionCount, - CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount, - cd.CATEGORY_NAME as cn + CONCAT(s.SUPPORT_COUNT + s.OPPOSITION_COUNT,'/',s.VOTABLE_COUNT) AS voteAccount FROM issue i - LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0') - LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID) - LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID) + INNER JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0') WHERE i.DEL_FLAG = '0' AND i.ISSUE_STATUS = #{status} @@ -645,7 +628,7 @@ IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName, IFNULL(cd.color,'#0091ed') AS color FROM issue i - LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0') + INNER JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0') LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID) LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = LEFT(ic.CATEGORY_CODE,#{length}) AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = ic.CUSTOMER_ID) WHERE i.DEL_FLAG = '0' @@ -672,4 +655,25 @@ AND DATE_FORMAT(SHIFTED_TIME,'%Y-%m-%d') #{endDate} GROUP BY GRID_ID + + + + + + + + + \ No newline at end of file From 3f9d3fe3304d6100b020c1f91cf2c83c8c273a51 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 22 Dec 2021 10:45:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=97=B4=E9=9A=94=E6=94=B9=E4=B8=BA3?= =?UTF-8?q?=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index 7032e48a2b..4f661a07dc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -100,7 +100,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl Date: Wed, 22 Dec 2021 15:45:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0screen=5Fproject=5F*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ScreenCentralZoneDataFormDTO.java | 7 +++--- .../com/epmet/controller/DemoController.java | 23 +++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java index 3482e2cab9..d655b8608a 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java @@ -1,9 +1,6 @@ package com.epmet.dto.screen.form; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; import java.io.Serializable; @@ -26,4 +23,8 @@ public class ScreenCentralZoneDataFormDTO implements Serializable { * 时间维度 不一定是dateId 需要根据其格式进行判断维度的类型 * */ private String dateId; + + private String startDate; + + private String endDate; } 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 ef567e92f1..a1e61b2461 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 @@ -881,10 +881,17 @@ public class DemoController { */ @PostMapping("project-test") public Result project(@RequestBody ScreenCentralZoneDataFormDTO param) { - if(StringUtils.isBlank(param.getDateId())){ - //默认截止到昨天。 - param.setDateId(DateUtils.getBeforeNDay(1)); + List dateIds = new ArrayList<>(); + if ((StringUtils.isBlank(param.getStartDate()) && StringUtils.isBlank(param.getEndDate()))){ + if (StringUtils.isNotBlank(param.getDateId())){ + dateIds.add(param.getDateId()); + }else { + dateIds.add(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1))); + } + }else { + dateIds = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate()); } + List customerIds = new ArrayList(); if (StringUtils.isNotBlank(param.getCustomerId())) { customerIds.add(param.getCustomerId()); @@ -892,10 +899,12 @@ public class DemoController { customerIds = dimCustomerService.selectCustomerIdPage(1, 100); } for (String customerId : customerIds) { - ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO(); - formDTO.setCustomerId(customerId); - formDTO.setDateId(param.getDateId()); - screenProjectSettleService.extractScreenData(param); + dateIds.forEach(dateId -> { + ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO(); + formDTO.setCustomerId(customerId); + formDTO.setDateId(dateId); + screenProjectSettleService.extractScreenData(param); + }); } return new Result(); } From 266d75f719d8f90244bb58c087d26dc9db4b4189 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 22 Dec 2021 16:52:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0screen=5Fproject=5F*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/DemoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a1e61b2461..a6de8eb159 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 @@ -903,7 +903,7 @@ public class DemoController { ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO(); formDTO.setCustomerId(customerId); formDTO.setDateId(dateId); - screenProjectSettleService.extractScreenData(param); + screenProjectSettleService.extractScreenData(formDTO); }); } return new Result();