工作日志新增按日统计采集接口v2:screen_work_record_org_monthly、screen_work_record_org_daily去掉parentId

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的资源编码
      */

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的资源编码
      */

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<ScreenWorkRecordGridDailyFormDTO> 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

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的资源编码
      */

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 '组织次数',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -8,7 +8,6 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="monthId" column="MONTH_ID"/>
         <result property="orgId" column="ORG_ID"/>
-        <result property="parentId" column="PARENT_ID"/>
         <result property="meetingCode" column="MEETING_CODE"/>
         <result property="typeCode" column="TYPE_CODE"/>
         <result property="organizeTotal" column="ORGANIZE_TOTAL"/>
@@ -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},