From b6bc63bb2a66adad7747bec17d182af984ac1dfd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Dec 2020 16:54:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?screen=5Fcpc=5Fbase=5Fdata=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8E=BB=E9=99=A4dateId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/evaluationindex/screen/ScreenCpcBaseDataDao.java | 3 +-- .../extract/toscreen/impl/PartyBaseInfoServiceImpl.java | 2 +- .../evaluationindex/screen/ScreenCpcBaseDataService.java | 3 +-- .../screen/impl/ScreenCpcBaseDataServiceImpl.java | 5 ++--- .../mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml | 1 - 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java index 716d9b2cfb..f33cd46393 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java @@ -69,12 +69,11 @@ public interface ScreenCpcBaseDataDao extends BaseDao { /** * @Description 删除旧的党员基本信息 * @param customerId - * @param dateId * @param orgIds * @author zxc * @date 2020/9/22 3:28 下午 */ - Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("dateId") String dateId,@Param("orgIds")List orgIds); + Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("orgIds")List orgIds); /** * @Description 查询党员信息【根据agencyId来查】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java index 90ccb5a0ed..f0999a4605 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java @@ -319,7 +319,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { } Integer delNum; do { - delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, dateId, orgIds); + delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, orgIds); }while (delNum > NumConstant.ZERO); List> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED); partition.forEach(p -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java index 314bd3181a..de2b431ded 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java @@ -43,12 +43,11 @@ public interface ScreenCpcBaseDataService extends BaseService orgIds); + Integer deleteOldPartyBaseInfo(String customerId, List orgIds); /** * @Description 查询党员信息【根据agencyId来查】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java index 7505476087..5c0ec9a676 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java @@ -51,14 +51,13 @@ public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl orgIds) { - return baseDao.deleteOldPartyBaseInfo(customerId, dateId,orgIds); + public Integer deleteOldPartyBaseInfo(String customerId, List orgIds) { + return baseDao.deleteOldPartyBaseInfo(customerId,orgIds); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml index 9de96650b5..e059bc271e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml @@ -187,7 +187,6 @@ delete from screen_cpc_base_data where CUSTOMER_ID = #{customerId} - and DATA_END_TIME = #{dateId} and ( From 5e625c6e2dd66054a3158e2ca74ecc0fc6d4a5b2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Dec 2020 17:36:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?selectDifficulty=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9EVENT=5FCATEGORY=5FNAME=E4=B8=BAnull=E8=BF=94=E5=9B=9E?= =?UTF-8?q?''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenDifficultyDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml index a342420f2d..dc1320fa4d 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml @@ -12,7 +12,7 @@ ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours, diff.EVENT_SOURCE AS gridName, diff.EVENT_IMG_URL AS imgUrl, - diff.EVENT_CATEGORY_NAME AS categoryName, + IFNULL(diff.EVENT_CATEGORY_NAME,'') AS categoryName, diff.EVENT_RE_ORG AS handleDepts, diff.EVENT_RE_ORG AS handleCount FROM From ca3d09ef98aeedb9e9a5f0f6f897d035fe9257f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Dec 2020 18:04:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=86=E5=B8=83=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 2 +- .../main/resources/mapper/screen/ScreenCustomerGridDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 8dd92ec0d1..9d5338ac65 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -73,7 +73,7 @@ SELECT sutd.org_id AS subId, - scg.center_mark AS centerMark, + IFNULL(scg.center_mark,'') AS centerMark, sutd.user_total AS totalNum, scg.area_marks AS areaMarks, scg.grid_name AS subName,