From f28a86dd82d459d006e364722a1c7d6581fb6556 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 21 Feb 2021 19:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E6=97=A5=E7=BB=9F=E8=AE=A1=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3v2:screen=5Fwork=5Frecord=5Forg=5Fmonthly?= =?UTF-8?q?=E3=80=81screen=5Fwork=5Frecord=5Forg=5Fdaily=E5=8E=BB=E6=8E=89?= =?UTF-8?q?parentId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenWorkRecordOrgDailyFormDTO.java | 5 ----- .../ScreenWorkRecordOrgMonthlyDTO.java | 5 ----- .../plugins/WorkRecordColController.java | 21 ------------------- .../ScreenWorkRecordOrgMonthlyEntity.java | 5 ----- .../migration/V0.0.8__add_plugins_table.sql | 2 -- .../plugins/ScreenWorkRecordOrgMonthlyDao.xml | 4 ---- 6 files changed, 42 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java index dda7253932..c80f1431a4 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgDailyFormDTO.java @@ -19,11 +19,6 @@ public class ScreenWorkRecordOrgDailyFormDTO implements Serializable { */ private String orgId; - /** - * 当前组织所属上级组织，如果是跟组织，此列为0 - */ - private String parentId; - /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java index 5b710a6586..202ce07a3c 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/plugins/ScreenWorkRecordOrgMonthlyDTO.java @@ -54,11 +54,6 @@ public class ScreenWorkRecordOrgMonthlyDTO implements Serializable { */ private String orgId; - /** - * 当前组织所属上级组织，如果是跟组织，此列为0 - */ - private String parentId; - /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java index 0abd5cbb42..cf6a10d8a9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java @@ -91,27 +91,6 @@ public class WorkRecordColController { return new Result(); } - - /** - * @Description 【工作日志】网格按日统计 累计值 - * @param customerId - * @param data - * @return com.epmet.commons.tools.utils.Result - * @author wangc - * @date 2021.02.04 16:16 - */ - @PostMapping("grid-daily") - public Result collectGridDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO data){ - if(StringUtils.isBlank(customerId) || CollectionUtils.isEmpty(data.getDataList()) || - StringUtils.isBlank(data.getDateId())) { - log.error("com.epmet.controller.plugins.WorkRecordColController.collectGridDaily,param:{}", JSON.toJSONString(data)); - throw new ValidateException("客户Id、上传数据列表、日期Id不可为空"); - } - //todo - // gridMonthlyService.collectGridDaily(customerId,data); - return new Result(); - } - /** * @Description 【工作日志】组织按日统计 累计值 * @param customerId diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java index f1cb99dad7..637ca82807 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/plugins/ScreenWorkRecordOrgMonthlyEntity.java @@ -50,11 +50,6 @@ public class ScreenWorkRecordOrgMonthlyEntity extends BaseEpmetEntity { */ private String orgId; - /** - * 当前组织所属上级组织，如果是跟组织，此列为0 - */ - private String parentId; - /** * 会议类型编码；对应screen_customer_work_record_dict的资源编码 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql index 7ca05ec922..5be4de5dea 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.8__add_plugins_table.sql @@ -116,7 +116,6 @@ CREATE TABLE `screen_work_record_org_monthly` ( `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id：yyyyMM', `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id', - `PARENT_ID` varchar(64) NOT NULL COMMENT '当前组织所属上级组织，如果是跟组织，此列为0', `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码；对应screen_customer_work_record_dict的资源编码', `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码；对应screen_customer_work_record_dict的资源编码', `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数', @@ -160,7 +159,6 @@ CREATE TABLE `screen_work_record_org_daily` ( `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', `DATE_ID` varchar(8) NOT NULL COMMENT '日期Id：yyyyMMdd', `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id', - `PARENT_ID` varchar(64) NOT NULL COMMENT '当前组织所属上级组织，如果是跟组织，此列为0', `MEETING_CODE` varchar(255) DEFAULT NULL COMMENT '会议类型编码；对应screen_customer_work_record_dict的资源编码', `TYPE_CODE` varchar(255) NOT NULL COMMENT '随手记类型编码；对应screen_customer_work_record_dict的资源编码', `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '组织次数', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml index 12a966d066..e930cb3b7c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml @@ -8,7 +8,6 @@ - @@ -31,7 +30,6 @@ customer_id, month_id, org_id, - parent_id, meeting_code, type_code, organize_total, @@ -55,8 +53,6 @@ #{item.orgId}, - #{item.parentId}, - #{item.meetingCode}, #{item.typeCode},