From a0ba787b3d6d21e92172b4ecf5ddf2a63b7c2864 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 14:32:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E4=BA=BA=E6=98=AF=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=87=AA=E5=B7=B1=E8=89=BE=E7=89=B9=E4=BA=86?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=EF=BC=8C=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=9C=AA=E8=AF=BB=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B7=B2=E8=AF=BB?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/ResiEventMentionDao.java | 2 ++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 5 +++-- .../src/main/resources/mapper/ResiEventMentionDao.xml | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java index 15062a1385..76aaeb9162 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java @@ -65,4 +65,6 @@ public interface ResiEventMentionDao extends BaseDao { * @date 2021/8/4 17:41 */ int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId); + + ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index b102b84c85..ebeda707f1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -120,8 +120,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl AND DEL_FLAG = '0' + + \ No newline at end of file From 232ed3c0e67bb0614e37084764747d828b5d1b3a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 14:46:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E5=8F=AF=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=8F=AA=E8=A6=81=E5=8A=9E=E7=BB=93=E6=88=96?= =?UTF-8?q?=E8=80=85=E7=AB=8B=E9=A1=B9=E4=BA=86=EF=BC=8C=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/UserMentionResultDTO.java | 6 ++++++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java index 95ac2e2527..48bb9583ba 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java @@ -52,4 +52,10 @@ public class UserMentionResultDTO implements Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date showTime; + + /** + * true:显示回复；false：不显示回复按钮 + */ + private String replyButtonFlag; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index ebeda707f1..285448dec6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -507,6 +507,14 @@ public class ResiEventServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(), formDTO.getReadFlag())); + result.getList().forEach(dto->{ + if(dto.getShiftProject()||dto.getStatus().equals(EventConstant.EVENT_STATUS_CLOSED_CASE)){ + // 立项和办结了不能回复哈。 + dto.setReplyButtonFlag("false"); + }else{ + dto.setReplyButtonFlag("true"); + } + }); return result.getList(); } From 6660fd483800c1560fde1b8b6791476a458e27b3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 14:51:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AD=94=E6=9D=91=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E6=8E=89=E5=85=9A=E6=80=BB=E6=94=AF=20=E5=B9=B6=E7=BB=99?= =?UTF-8?q?=E5=AD=94=E6=9D=91=E9=95=87=20=E9=99=8D=E7=BA=A7=E4=B8=BA?= =?UTF-8?q?=E8=A1=97=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/AgencyServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 6f191c2fc5..170ca1c811 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -50,10 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; /** * 组织相关api @@ -536,14 +533,21 @@ public class AgencyServiceImpl implements AgencyService { } while (true); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); - //孔村降级处理 + //孔村降级处理 且移除掉 党总支级别 String KONG_CUN_AGENCY_ID = "1234085031077498881"; - agencyNodeDTOS.forEach(e->{ + Iterator iterator = agencyNodeDTOS.iterator(); + while (iterator.hasNext()){ + ScreenCustomerAgencyDTO e = iterator.next(); if (e.getPids().contains(KONG_CUN_AGENCY_ID)){ - e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + if (OrgLevelEnum.STREET.getCode().equals(e.getLevel())){ + iterator.remove(); + } + if (KONG_CUN_AGENCY_ID.equals(e.getAgencyId())){ + e.setLevel(OrgLevelEnum.getSubOrgLevel(e.getLevel())); + } } convertOrgTreeNode(nodeList, e); - }); + } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } //只有一个根节点的树 所以返回一个 From 70c6f091ec4e1ed555dc31c0de1154ac8ed4e874 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 14:57:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=B7=B2?= =?UTF-8?q?=E8=AF=BB=E3=80=82=E6=8A=A5=E4=BA=8B=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=BA=BA=E5=A4=A7=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ResiEventReportOrgDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 285448dec6..632887c34f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -297,8 +297,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl UPDATE resi_event_report_org - SET READ_FLAG = 'read', + SET ORG_READ = 'read', UPDATED_BY = #{userId}, UPDATED_TIME = NOW() WHERE From 1d9b07a87f835d46edf191f2b0cbf98481ee15f5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 5 Aug 2021 15:02:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=89=93=E4=B8=AA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=81=94=E8=B0=83=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/AgencyServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 170ca1c811..041f5e7bfd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -505,7 +505,7 @@ public class AgencyServiceImpl implements AgencyService { //todo 暂不处理 有时间再说 }else { ScreenCustomerAgencyDTO parentAgencyDTO = null; - String subAgencyAreaCode = staffAgencyDTO.getParentAreaCode(); + String parentAreaCode = staffAgencyDTO.getParentAreaCode(); List nodeList = new ArrayList<>(); /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); @@ -521,7 +521,7 @@ public class AgencyServiceImpl implements AgencyService { convertOrgTreeNode(nodeList, currentAgency);*/ //多客户 获取所有直线上级 do { - parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(subAgencyAreaCode); + parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(parentAreaCode); if (parentAgencyDTO == null){ break; } @@ -529,8 +529,9 @@ public class AgencyServiceImpl implements AgencyService { if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ break; } - subAgencyAreaCode = parentAgencyDTO.getAreaCode(); + parentAreaCode = parentAgencyDTO.getAreaCode(); } while (true); + log.debug("查询所有上级为:{}",JSON.toJSONString(nodeList)); //多客户 获取所有下级 List agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode()); //孔村降级处理 且移除掉 党总支级别 @@ -550,6 +551,7 @@ public class AgencyServiceImpl implements AgencyService { } nodes = TreeUtils.buildTreeByAreaCode(nodeList); } + log.debug("查询所有上级树结构为:{}",JSON.toJSONString(nodes)); //只有一个根节点的树 所以返回一个 return nodes.get(0); }