From d8bca58feee22e721c6261d287bb8ee529a6ab00 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 10:24:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=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 --- .../src/main/resources/mapper/govproject/ProjectDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 4b51beae89..29e53ff04b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -470,6 +470,9 @@ AND GRID_ID = #{orgId} + + AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%') + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} @@ -492,6 +495,9 @@ AND GRID_ID = #{orgId} + + AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%') + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} From 3621a34f4ec66b1f5ea131fd2f730b6263cf2fc7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 14:49:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E4=B8=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index f0fcfceefc..2741c72b45 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -524,7 +524,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { From 0bd762d55d6434886dbb60cc71adfab3b0260ac8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 15:36:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E4=B8=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/DataReportingServiceImpl.java | 1 - .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 6d76dfd175..c2a93796bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -386,7 +386,6 @@ public class DataReportingServiceImpl implements DataReportingService { case ProjectConstant.PENDING: return "01"; case ProjectConstant.CLOSED: - return "02"; case ProjectConstant.CLOSED_CASE: return "03"; default: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2741c72b45..4d992085e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -524,8 +524,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { @@ -537,6 +536,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { + if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + } + } } if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) { From 8a5f74a6cf88a7bd15eb52f5627305e94cbfdbff Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 17 Aug 2022 15:51:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=B0=83=E6=95=B4=20=E5=8A=9E=E7=BB=93?= =?UTF-8?q?=E5=92=8C=E5=8C=96=E8=A7=A3=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/entity/EventreportPingyinEntity.java | 7 ++++++- .../service/impl/EventreportPingyinServiceImpl.java | 6 ++++-- .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java index 1298790b7c..79c2064f9d 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java @@ -91,10 +91,15 @@ public class EventreportPingyinEntity { private String waysOfResolving; /** - * 是否办结，填写Y、N（Y 是 N 否） + * 必填 是否化解，填写Y、N（Y 是 N 否） */ private String successfulOrNo; + /** + * 必填 是否办结，填写Y、N（Y 是 N 否） + */ + private String successfulDefuse; + /** * 办结层级，符合《标准》10.21 */ diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java index 380df961e4..0fe4ff1620 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java @@ -67,7 +67,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl> record = epmetUserOpenFeignClient.getPatrolRoutineWorkListV2(midPatrolFormDTO); if (record == null || !record.success()) { - log.error("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO)); + log.warn("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO)); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); } data = record.getData(); if (CollectionUtils.isEmpty(data)) { //数据已被删除了 - //暂时设置error 用于排错 - log.error("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO)); + log.warn("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO)); int effectRow = baseDao.deleteById(patrolRecordForm.getId()); log.warn("del effectRow:{}", effectRow); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());