From 0db0ff81e2926288a542cc300a24a419485a6401 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 19 Aug 2020 17:27:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screencoll/form/CpcBaseDataFormDTO.java | 5 - .../form/CustomerAgencyFormDTO.java | 5 - .../screencoll/form/CustomerDeptFormDTO.java | 5 - .../screencoll/form/CustomerGridFormDTO.java | 5 - .../form/DifficultyDataFormDTO.java | 10 +- .../dto/screencoll/form/EventDataFormDTO.java | 10 +- .../form/GovernRankDataFormDTO.java | 5 - .../form/IndexDataMonthlyFormDTO.java | 5 - .../form/IndexDataYearlyFormDTO.java | 5 - .../screencoll/form/OrgRankDataFormDTO.java | 5 - .../form/PartyBranchDataFormDTO.java | 5 - .../form/PartyLinkMassesDataFormDTO.java | 5 - .../screencoll/form/PioneerDataFormDTO.java | 5 - .../dto/screencoll/form/UserJoinFormDTO.java | 5 - .../screencoll/form/UserTotalDataFormDTO.java | 5 - .../java/com/epmet/DataStatsApplication.java | 4 + .../controller/ScreenCollController.java | 93 ++++++++++++------ .../dao/screen/ScreenCpcBaseDataDao.java | 3 +- .../dao/screen/ScreenCustomerAgencyDao.java | 3 +- .../dao/screen/ScreenCustomerDeptDao.java | 3 +- .../dao/screen/ScreenCustomerGridDao.java | 3 +- .../dao/screen/ScreenDifficultyDataDao.java | 16 ++-- .../epmet/dao/screen/ScreenEventDataDao.java | 14 +-- .../dao/screen/ScreenGovernRankDataDao.java | 3 +- .../dao/screen/ScreenIndexDataMonthlyDao.java | 3 +- .../dao/screen/ScreenIndexDataYearlyDao.java | 3 +- .../dao/screen/ScreenOrgRankDataDao.java | 3 +- .../dao/screen/ScreenPartyBranchDataDao.java | 3 +- .../screen/ScreenPartyLinkMassesDataDao.java | 3 +- .../dao/screen/ScreenPioneerDataDao.java | 3 +- .../epmet/dao/screen/ScreenUserJoinDao.java | 3 +- .../dao/screen/ScreenUserTotalDataDao.java | 3 +- .../service/screen/ScreenCollService.java | 48 ++++++---- .../screen/impl/ScreenCollServiceImpl.java | 94 +++++++++---------- .../mapper/screen/ScreenCpcBaseDataDao.xml | 4 +- .../mapper/screen/ScreenCustomerAgencyDao.xml | 4 +- .../mapper/screen/ScreenCustomerDeptDao.xml | 4 +- .../mapper/screen/ScreenCustomerGridDao.xml | 4 +- .../mapper/screen/ScreenDifficultyDataDao.xml | 10 +- .../mapper/screen/ScreenEventDataDao.xml | 10 +- .../mapper/screen/ScreenGovernRankDataDao.xml | 4 +- .../screen/ScreenIndexDataMonthlyDao.xml | 4 +- .../screen/ScreenIndexDataYearlyDao.xml | 4 +- .../mapper/screen/ScreenOrgRankDataDao.xml | 4 +- .../screen/ScreenPartyBranchDataDao.xml | 4 +- .../screen/ScreenPartyLinkMassesDataDao.xml | 4 +- .../mapper/screen/ScreenPioneerDataDao.xml | 4 +- .../mapper/screen/ScreenUserJoinDao.xml | 4 +- .../mapper/screen/ScreenUserTotalDataDao.xml | 4 +- 49 files changed, 236 insertions(+), 229 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java index 0efee2a896..3ff8c4446a 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java @@ -14,11 +14,6 @@ public class CpcBaseDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java index 7baff54308..de5dc8abdd 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java @@ -14,11 +14,6 @@ public class CustomerAgencyFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织id */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java index 5566ea3ad7..19f5f3fecd 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java @@ -14,11 +14,6 @@ public class CustomerDeptFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 部门id */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java index 13345ffaad..8935eaa156 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java @@ -14,11 +14,6 @@ public class CustomerGridFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 网格id */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java index 3053fe955a..14ef258fb8 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java @@ -14,11 +14,6 @@ public class DifficultyDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ @@ -88,4 +83,9 @@ public class DifficultyDataFormDTO implements Serializable { * 事件状态描述 */ private String eventStatusDesc; + + /** + * 最近一次操作说明 eg: 转项目，结案，流转 + */ + private String latestOperateDesc; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java index 81800701c8..5be17787cf 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java @@ -17,11 +17,6 @@ public class EventDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ @@ -116,4 +111,9 @@ public class EventDataFormDTO implements Serializable { * 事件状态key */ private String eventStatusCode; + + /** + * 最近一次操作说明 eg: 转项目，结案，流转 + */ + private String latestOperateDesc; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java index 3976647f24..f12e196ab7 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java @@ -15,11 +15,6 @@ public class GovernRankDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 年Id ：yyyy */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java index 5b3699f82b..9c9ca798a5 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java @@ -14,11 +14,6 @@ public class IndexDataMonthlyFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * yyyy */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java index 6c44c9411a..bd360a63fa 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java @@ -14,11 +14,6 @@ public class IndexDataYearlyFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * yyyy */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java index 37386fcc6b..8b0a753839 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java @@ -15,11 +15,6 @@ public class OrgRankDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 年Id ：yyyy */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java index f05bd7bc80..21144c89ab 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java @@ -14,11 +14,6 @@ public class PartyBranchDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 年Id ：yyyy */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java index bacca22874..8d1ae654a9 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java @@ -14,11 +14,6 @@ public class PartyLinkMassesDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java index bde79f0baf..cdad61be67 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java @@ -14,11 +14,6 @@ public class PioneerDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java index d474115972..48802ff6d1 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java @@ -14,11 +14,6 @@ public class UserJoinFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java index 3cf171e6f7..42722f7111 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java @@ -14,11 +14,6 @@ public class UserTotalDataFormDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ - private String customerId; - /** * 组织类别 agency：组织；部门：department；网格：grid */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java index ad4e2110fa..3b93ce39a3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java @@ -3,8 +3,12 @@ package com.epmet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; +@EnableDiscoveryClient +@EnableFeignClients @SpringBootApplication (exclude = {DataSourceAutoConfiguration.class}) @EnableAsync public class DataStatsApplication { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java index 981c056313..ae770d75fa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java @@ -29,6 +29,7 @@ public class ScreenCollController { /** * 9、党建引领|基层治理-居民（党员）积分排行榜 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong @@ -37,112 +38,128 @@ public class ScreenCollController { @ExternalAppRequestAuth @PostMapping("partyuserrankdata") public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { - screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId()); + screenCollService.insertPartyUserRankData(formDTO, externalAppRequestParam.getCustomerId()); return new Result(); } /** * 8、党建引领-党员联系群众数据 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("partylinkmassesdata") - public Result partyLinkMassesData(@RequestBody List formDTO) { - return screenCollService.insertPartyLinkMassesData(formDTO); + public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 7、基层党建-建设情况数据（支部、联建、志愿） * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("meetdata") - public Result meetData(@RequestBody List formDTO) { - return screenCollService.insertPartyBranchData(formDTO); + public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 6、党建引领-组织排行 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("orgrankdata") - public Result orgRankData(@RequestBody List formDTO) { - return screenCollService.insertOrgRankData(formDTO); + public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 5、基层治理-治理能力数据 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("governrankdata") - public Result governRankData(@RequestBody List formDTO) { - return screenCollService.insertGovernRankData(formDTO); + public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 4、事件数据 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("eventdata") - public Result eventData(@RequestBody List formDTO) { - return screenCollService.insertEventData(formDTO); + public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 3、难点赌点 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("difficultydata") - public Result difficultyData(@RequestBody List formDTO) { - return screenCollService.insertDifficultyData(formDTO); + public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 2、党员基本情况 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("cpcbasedata") - public Result cpcbaseData(@RequestBody List formDTO) { - return screenCollService.insertCpcbaseData(formDTO); + public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 1、指数_按月统计 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("indexdatamonthly") - public Result indexDataMonthly(@RequestBody List formDTO) { - return screenCollService.insertIndexDataMonthly(formDTO); + public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId()); } // -- @@ -150,91 +167,105 @@ public class ScreenCollController { /** * 17、指数_按年统计 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("indexdatayearly") - public Result indexDataYearly(@RequestBody List formDTO) { - return screenCollService.insertIndexDataYearly(formDTO); + public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId()); } /** * 16、部门信息上传 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("customerdept") - public Result customerDept(@RequestBody List formDTO) { - return screenCollService.insertCustomerDept(formDTO); + public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId()); } /** * 15、网格信息上传 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("customergrid") - public Result customerGrid(@RequestBody List formDTO) { - return screenCollService.insertCustomerGrid(formDTO); + public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId()); } /** * 14、组织层级 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("customeragency") - public Result customerAgency(@RequestBody List formDTO) { - return screenCollService.insertCustomerAgency(formDTO); + public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId()); } /** * 12、中央区各类总数 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("usertotaldata") - public Result userTotalData(@RequestBody List formDTO) { - return screenCollService.insertUserTotalData(formDTO); + public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId()); } /** * 11、基层治理-公众参与 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("userjoin") - public Result userJoin(@RequestBody List formDTO) { - return screenCollService.insertUserJoin(formDTO); + public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId()); } /** * 10、党建引领-先锋模范数据 * + * @param externalAppRequestParam * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ + @ExternalAppRequestAuth @PostMapping("pioneerdata") - public Result pioneerData(@RequestBody List formDTO) { - return screenCollService.insertPioneerData(formDTO); + public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List formDTO) { + return screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId()); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java index fa30fdef44..12271b8e3c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java @@ -51,8 +51,9 @@ public interface ScreenCpcBaseDataDao extends BaseDao { * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertCpcBaseData(@Param("list") List list); + void batchInsertCpcBaseData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java index 240c48e041..d7851cd754 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java @@ -51,8 +51,9 @@ public interface ScreenCustomerAgencyDao extends BaseDao list); + void batchInsertCustomerAgency(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java index 84e641b47b..53f37049a3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java @@ -51,8 +51,9 @@ public interface ScreenCustomerDeptDao extends BaseDao * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertCustomerDept(@Param("list") List list); + void batchInsertCustomerDept(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java index cfc0c7092c..3925d0ad6e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java @@ -50,8 +50,9 @@ public interface ScreenCustomerGridDao extends BaseDao * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertCustomerGrid(@Param("list") List list); + void batchInsertCustomerGrid(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java index 503f070506..5379eeb893 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java @@ -36,23 +36,25 @@ public interface ScreenDifficultyDataDao extends BaseDao list); + void batchInsertDifficultyData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java index 20250bc7ff..ec80809c55 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java @@ -36,23 +36,25 @@ public interface ScreenEventDataDao extends BaseDao { /** * 4、事件数据 * 1) 根据CUSTOMER_ID、EVENT_ID、ORG_ID进行查询，如果有数据，则先进行物理删除 - * CUSTOMER_ID 一 - * EVENT_ID 多 - * ORG_ID 多 * - * @param list + * @param customerId 一 + * @param eventId 多 + * @param orgId 多 * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void deleteEventData(EventDataFormDTO list); + void deleteEventData(@Param("customerId")String customerId, + @Param("eventId")String eventId, + @Param("orgId")String orgId); /** * 4、事件数据 * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertEventData(@Param("list") List list); + void batchInsertEventData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java index 295538b085..ea3d67aa68 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java @@ -54,8 +54,9 @@ public interface ScreenGovernRankDataDao extends BaseDao list); + void batchInsertGovernRankData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java index ec102d2499..e97406febf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java @@ -55,8 +55,9 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao list); + void batchInsertIndexDataMonthly(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java index 6c27ae9e70..4ca64f6944 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java @@ -53,8 +53,9 @@ public interface ScreenIndexDataYearlyDao extends BaseDao list); + void batchInsertIndexDataYearly(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java index 110d37c618..4eabfd508a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java @@ -54,8 +54,9 @@ public interface ScreenOrgRankDataDao extends BaseDao { * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertOrgRankData(@Param("list") List list); + void batchInsertOrgRankData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java index 00b9f0df8d..3cae4a160d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java @@ -54,8 +54,9 @@ public interface ScreenPartyBranchDataDao extends BaseDao list); + void batchInsertPartyBranchData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java index d100742ec8..276b08e356 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java @@ -51,8 +51,9 @@ public interface ScreenPartyLinkMassesDataDao extends BaseDao list); + void batchInsertPartyLinkMassesData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java index ba6bfa532a..202fc4aa59 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java @@ -51,8 +51,9 @@ public interface ScreenPioneerDataDao extends BaseDao { * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertPioneerData(@Param("list") List list); + void batchInsertPioneerData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java index 0b6f09f58c..46d19682ea 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java @@ -55,8 +55,9 @@ public interface ScreenUserJoinDao extends BaseDao { * 2) 在批量新增 * * @param list + * @param customerId * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void batchInsertUserJoin(@Param("list") List list); + void batchInsertUserJoin(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java index ef7543555a..ec449f1352 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java @@ -51,8 +51,9 @@ public interface ScreenUserTotalDataDao extends BaseDao list); + void batchInsertUserTotalData(@Param("list") List list, @Param("customerId")String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java index d2bc9d0bdb..4670c31fa1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java @@ -13,11 +13,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - void insertPartyUserRankData(List formDTO,String customerId); + void insertPartyUserRankData(List formDTO, String customerId); /** * 8、党建引领-党员联系群众数据 @@ -25,11 +26,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertPartyLinkMassesData(List formDTO); + Result insertPartyLinkMassesData(List formDTO, String customerId); /** * 7、基层党建-建设情况数据（支部、联建、志愿） @@ -37,11 +39,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertPartyBranchData(List formDTO); + Result insertPartyBranchData(List formDTO, String customerId); /** * 6、党建引领-组织排行 @@ -49,11 +52,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertOrgRankData(List formDTO); + Result insertOrgRankData(List formDTO, String customerId); /** * 5、基层治理-治理能力数据 @@ -61,11 +65,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertGovernRankData(List formDTO); + Result insertGovernRankData(List formDTO, String customerId); /** * 4、事件数据 @@ -73,11 +78,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertEventData(List formDTO); + Result insertEventData(List formDTO, String customerId); /** * 3、难点赌点 @@ -85,11 +91,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertDifficultyData(List formDTO); + Result insertDifficultyData(List formDTO, String customerId); /** * 2、党员基本情况 @@ -97,11 +104,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertCpcbaseData(List formDTO); + Result insertCpcbaseData(List formDTO, String customerId); /** * 1、指数_按月统计 @@ -109,11 +117,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertIndexDataMonthly(List formDTO); + Result insertIndexDataMonthly(List formDTO, String customerId); /** * 17、指数_按年统计 @@ -121,11 +130,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertIndexDataYearly(List formDTO); + Result insertIndexDataYearly(List formDTO, String customerId); /** * 16、部门信息上传 @@ -133,11 +143,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertCustomerDept(List formDTO); + Result insertCustomerDept(List formDTO, String customerId); /** * 15、网格信息上传 @@ -145,11 +156,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertCustomerGrid(List formDTO); + Result insertCustomerGrid(List formDTO, String customerId); /** * 14、组织层级 @@ -157,11 +169,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertCustomerAgency(List formDTO); + Result insertCustomerAgency(List formDTO, String customerId); /** * 12、中央区各类总数 @@ -169,11 +182,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertUserTotalData(List formDTO); + Result insertUserTotalData(List formDTO, String customerId); /** * 11、基层治理-公众参与 @@ -181,11 +195,12 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertUserJoin(List formDTO); + Result insertUserJoin(List formDTO, String customerId); /** * 10、党建引领-先锋模范数据 @@ -193,9 +208,10 @@ public interface ScreenCollService { * 2) 在新增 * * @param formDTO + * @param customerId * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 10:52 2020-08-18 **/ - Result insertPioneerData(List formDTO); + Result insertPioneerData(List formDTO, String customerId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java index 3f2a95ae03..f96ece5527 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java @@ -91,81 +91,82 @@ public class ScreenCollServiceImpl implements ScreenCollService { @Override @Transactional(rollbackFor = Exception.class) - public Result insertPartyLinkMassesData(List formDTO) { + public Result insertPartyLinkMassesData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenPartyLinkMassesDataDao.deletePartyLinkMassesData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds); + screenPartyLinkMassesDataDao.deletePartyLinkMassesData(customerId, orgIds); - screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO); + screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO, customerId); } return new Result(); } @Override - public Result insertPartyBranchData(List formDTO) { + @Transactional(rollbackFor = Exception.class) + public Result insertPartyBranchData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenPartyBranchDataDao.deletePartyBranchData(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenPartyBranchDataDao.deletePartyBranchData(customerId, formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO); + screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertOrgRankData(List formDTO) { + public Result insertOrgRankData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenOrgRankDataDao.deleteOrgRankData(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenOrgRankDataDao.deleteOrgRankData(customerId, formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenOrgRankDataDao.batchInsertOrgRankData(formDTO); + screenOrgRankDataDao.batchInsertOrgRankData(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertGovernRankData(List formDTO) { + public Result insertGovernRankData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenGovernRankDataDao.deleteGovernRankData(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenGovernRankDataDao.deleteGovernRankData(customerId, formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenGovernRankDataDao.batchInsertGovernRankData(formDTO); + screenGovernRankDataDao.batchInsertGovernRankData(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertEventData(List formDTO) { + public Result insertEventData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ - screenEventDataDao.deleteEventData(formDTO.get(i)); + screenEventDataDao.deleteEventData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId()); } - screenEventDataDao.batchInsertEventData(formDTO); + screenEventDataDao.batchInsertEventData(formDTO, customerId); for (int i = NumConstant.ZERO; i < formDTO.size(); i++) { if (null != formDTO.get(i).getImgDataList() && formDTO.get(i).getImgDataList().size() > NumConstant.ZERO) { @@ -187,157 +188,156 @@ public class ScreenCollServiceImpl implements ScreenCollService { @Override @Transactional(rollbackFor = Exception.class) - public Result insertDifficultyData(List formDTO) { + public Result insertDifficultyData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ - screenDifficultyDataDao.deleteDifficultyData(formDTO.get(i)); + screenDifficultyDataDao.deleteDifficultyData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId()); } - screenDifficultyDataDao.batchInsertDifficultyData(formDTO); + screenDifficultyDataDao.batchInsertDifficultyData(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertCpcbaseData(List formDTO) { + public Result insertCpcbaseData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenCpcBaseDataDao.deleteCpcBaseData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds); + screenCpcBaseDataDao.deleteCpcBaseData(customerId, orgIds); - screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO); + screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertIndexDataMonthly(List formDTO) { + public Result insertIndexDataMonthly(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenIndexDataMonthlyDao.deleteIndexDataMonthly(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId, formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO); + screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO, customerId); } return new Result(); } @Override - public Result insertIndexDataYearly(List formDTO) { + @Transactional(rollbackFor = Exception.class) + public Result insertIndexDataYearly(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenIndexDataYearlyDao.deleteIndexDataYearly(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenIndexDataYearlyDao.deleteIndexDataYearly(customerId, formDTO.get(NumConstant.ZERO).getYearId(), orgIds); - screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO); + screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertCustomerDept(List formDTO) { + public Result insertCustomerDept(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] deptIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ deptIds[i] = formDTO.get(i).getDeptId(); } - screenCustomerDeptDao.deleteCustomerDept(formDTO.get(NumConstant.ZERO).getCustomerId(), deptIds); + screenCustomerDeptDao.deleteCustomerDept(customerId, deptIds); - screenCustomerDeptDao.batchInsertCustomerDept(formDTO); + screenCustomerDeptDao.batchInsertCustomerDept(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertCustomerGrid(List formDTO) { + public Result insertCustomerGrid(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] gridIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ gridIds[i] = formDTO.get(i).getGridId(); } - screenCustomerGridDao.deleteCustomerGrid(formDTO.get(NumConstant.ZERO).getCustomerId(), gridIds); + screenCustomerGridDao.deleteCustomerGrid(customerId, gridIds); - screenCustomerGridDao.batchInsertCustomerGrid(formDTO); + screenCustomerGridDao.batchInsertCustomerGrid(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertCustomerAgency(List formDTO) { + public Result insertCustomerAgency(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] agencyIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ agencyIds[i] = formDTO.get(i).getAgencyId(); } - screenCustomerAgencyDao.deleteCustomerAgency(formDTO.get(NumConstant.ZERO).getCustomerId(), agencyIds); + screenCustomerAgencyDao.deleteCustomerAgency(customerId, agencyIds); - screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO); + screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertUserTotalData(List formDTO) { + public Result insertUserTotalData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenUserTotalDataDao.deleteUserTotalData(formDTO.get(NumConstant.ZERO).getCustomerId(), - orgIds); + screenUserTotalDataDao.deleteUserTotalData(customerId, orgIds); - screenUserTotalDataDao.batchInsertUserTotalData(formDTO); + screenUserTotalDataDao.batchInsertUserTotalData(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertUserJoin(List formDTO) { + public Result insertUserJoin(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(), + screenUserJoinDao.deleteUserJoin(customerId, formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getMonthId(), orgIds); - screenUserJoinDao.batchInsertUserJoin(formDTO); + screenUserJoinDao.batchInsertUserJoin(formDTO, customerId); } return new Result(); } @Override @Transactional(rollbackFor = Exception.class) - public Result insertPioneerData(List formDTO) { + public Result insertPioneerData(List formDTO, String customerId) { if (null != formDTO && formDTO.size() > NumConstant.ZERO){ String[] orgIds = new String[formDTO.size()]; for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ orgIds[i] = formDTO.get(i).getOrgId(); } - screenPioneerDataDao.deletePioneerData(formDTO.get(NumConstant.ZERO).getCustomerId(), - orgIds); + screenPioneerDataDao.deletePioneerData(customerId, orgIds); - screenPioneerDataDao.batchInsertPioneerData(formDTO); + screenPioneerDataDao.batchInsertPioneerData(formDTO, customerId); } return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml index de6f379dc4..a0adcc3b70 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_cpc_base_data ( ID, @@ -40,7 +40,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.orgType}, #{item.orgId}, #{item.parentId}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index c01c3dcc95..923a8410f0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -12,7 +12,7 @@ - + insert into screen_customer_agency ( ID, @@ -37,7 +37,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.agencyId}, #{item.agencyName}, #{item.pid}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml index 267a118cd8..627b3b39c1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml @@ -12,7 +12,7 @@ - + insert into screen_customer_dept ( ID, @@ -33,7 +33,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.deptId}, #{item.deptName}, #{item.parentAgencyId}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml index 5c96ed4ae8..7a36507ce7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml @@ -12,7 +12,7 @@ - + insert into screen_customer_grid ( ID, @@ -33,7 +33,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.gridId}, #{item.gridName}, #{item.parentAgencyId}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml index 5ec18b6c7b..517d2efaa0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml @@ -8,7 +8,7 @@ where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId} - + insert into screen_difficulty_data ( ID, @@ -32,12 +32,13 @@ CREATED_BY, CREATED_TIME, UPDATED_BY, - UPDATED_TIME + UPDATED_TIME, + LATEST_OPERATE_DESC ) values ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.orgType}, #{item.orgId}, #{item.parentId}, @@ -57,7 +58,8 @@ 'APP_USER', now(), 'APP_USER', - now() + now(), + #{latestOperateDesc} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml index a6cdd87a2e..f0c84a1e8a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml @@ -8,7 +8,7 @@ where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId} - + insert into screen_event_data ( ID, @@ -36,12 +36,13 @@ UPDATED_BY, UPDATED_TIME, EVENT_STATUS_CODE, - EVENT_STATUS_DESC + EVENT_STATUS_DESC, + LATEST_OPERATE_DESC ) values ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.orgType}, #{item.orgId}, #{item.parentId}, @@ -65,7 +66,8 @@ 'APP_USER', now(), #{item.eventStatusCode}, - #{item.eventStatusDesc} + #{item.eventStatusDesc}, + #{latestOperateDesc} ) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index 48d98970ce..9a6e6c3c44 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_govern_rank_data ( ID, @@ -39,7 +39,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.monthId}, #{item.orgType}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 182ea29161..721c4e0af3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -12,7 +12,7 @@ - + insert into screen_index_data_monthly ( ID, @@ -37,7 +37,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.monthId}, #{item.orgType}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml index 2fb2faae43..8747e1219a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml @@ -12,7 +12,7 @@ - + insert into screen_index_data_yearly ( ID, @@ -36,7 +36,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.orgType}, #{item.orgId}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml index be2ff1fb67..4ebe5e2c28 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_org_rank_data ( ID, @@ -40,7 +40,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.monthId}, #{item.orgType}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml index 05c5d92066..afeaca9651 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_party_branch_data ( ID, @@ -39,7 +39,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.monthId}, #{item.type}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml index b5f7770bfd..01a63f3a53 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_party_link_masses_data ( ID, @@ -33,7 +33,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.orgType}, #{item.orgId}, #{item.parentId}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml index c31c51fe78..73e703ae25 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_pioneer_data ( ID, @@ -36,7 +36,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.orgType}, #{item.orgId}, #{item.parentId}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml index b09c3e6690..db7b626e27 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml @@ -12,7 +12,7 @@ - + insert into screen_user_join ( ID, @@ -36,7 +36,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.yearId}, #{item.monthId}, #{item.orgType}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml index 51257d5837..a582bedbb7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml @@ -12,7 +12,7 @@ - + insert into screen_user_total_data ( ID, @@ -37,7 +37,7 @@ ( (SELECT REPLACE(UUID(), '-', '') AS id), - #{item.customerId}, + #{customerId}, #{item.orgType}, #{item.orgId}, #{item.parentId},