事件、项目移动文件夹

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryGridDailyDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java

@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dto.indexcollect;
+package com.epmet.dto.screen;
+
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectCategoryOrgDailyDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java

@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dto.indexcollect;
+package com.epmet.dto.screen;
+
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectGridDailyDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectGridDailyDTO.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dto.indexcollect;
+package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 项目(事件)分析按网格_按天统计

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectOrgDailyDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectOrgDailyDTO.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dto.indexcollect;
+package com.epmet.dto.screen;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 项目(事件)分析按组织_按天统计

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityGridMonthlyDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectQuantityGridMonthlyDTO.java

@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dto.indexcollect;
+package com.epmet.dto.screen;
+
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/ScreenProjectQuantityOrgMonthlyDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectQuantityOrgMonthlyDTO.java

@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dto.indexcollect;
+package com.epmet.dto.screen;
+
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java

@@ -2,9 +2,9 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.indexcollect.*;
+import com.epmet.dto.screen.*;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.service.evaluationindex.indexcoll.*;
+import com.epmet.service.evaluationindex.screen.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.indexcoll;
+package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity;
+import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,7 +34,7 @@ import java.util.List;
 @Mapper
 public interface ScreenProjectCategoryGridDailyDao extends BaseDao<ScreenProjectCategoryGridDailyEntity> {
 
-	void insertBatch(@Param("list") List<ScreenProjectCategoryGridDailyDTO> list,@Param("customerId") String customerId,@Param("createdBy")String createdBy);
+	void insertBatch(@Param("list") List<ScreenProjectCategoryGridDailyDTO> list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId);
 
-	void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+	int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.indexcoll;
+package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity;
+import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,8 +34,8 @@ import java.util.List;
 @Mapper
 public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectCategoryOrgDailyEntity> {
 
-	void insertBatch(@Param("list") List<ScreenProjectCategoryOrgDailyDTO> list,@Param("customerId") String customerId,@Param("createdBy")String createdBy);
+	void insertBatch(@Param("list") List<ScreenProjectCategoryOrgDailyDTO> list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId);
 
-	void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+	int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectGridDailyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.indexcoll;
+package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity;
+import com.epmet.dto.screen.ScreenProjectGridDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectGridDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,9 +35,9 @@ import java.util.List;
 public interface ScreenProjectGridDailyDao extends BaseDao<ScreenProjectGridDailyEntity> {
 
 
-	void insertBatch(@Param("list") List<ScreenProjectGridDailyDTO> list,@Param("customerId") String customerId,@Param("createdBy")String createdBy);
+	void insertBatch(@Param("list") List<ScreenProjectGridDailyDTO> list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId);
 
-	void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+	int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectOrgDailyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.indexcoll;
+package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity;
+import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectOrgDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,9 +35,9 @@ import java.util.List;
 public interface ScreenProjectOrgDailyDao extends BaseDao<ScreenProjectOrgDailyEntity> {
 
 
-	void insertBatch(@Param("list") List<ScreenProjectOrgDailyDTO> list,@Param("customerId") String customerId,@Param("createdBy")String createdBy);
+	void insertBatch(@Param("list") List<ScreenProjectOrgDailyDTO> list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId);
 
-	void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+	int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectQuantityGridMonthlyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.indexcoll;
+package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity;
+import com.epmet.dto.screen.ScreenProjectQuantityGridMonthlyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityGridMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,8 +34,8 @@ import java.util.List;
 @Mapper
 public interface ScreenProjectQuantityGridMonthlyDao extends BaseDao<ScreenProjectQuantityGridMonthlyEntity> {
 
-	void insertBatch(@Param("list") List<ScreenProjectQuantityGridMonthlyDTO> list,@Param("customerId") String customerId,@Param("createdBy")String createdBy);
+	void insertBatch(@Param("list") List<ScreenProjectQuantityGridMonthlyDTO> list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId);
 
-	void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId);
+	int deleteByMonthIdAndCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.indexcoll;
+package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity;
+import com.epmet.dto.screen.ScreenProjectQuantityOrgMonthlyDTO;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,9 +35,9 @@ import java.util.List;
 public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao<ScreenProjectQuantityOrgMonthlyEntity> {
 
 
-	void insertBatch(@Param("list") List<ScreenProjectQuantityOrgMonthlyDTO> list,@Param("customerId") String customerId,@Param("createdBy")String createdBy);
+	void insertBatch(@Param("list") List<ScreenProjectQuantityOrgMonthlyDTO> list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId);
 
-	void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId);
+	int deleteByMonthIdAndCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java

@@ -15,16 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.indexcoll;
+package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目(事件)分类按网格_按天统计
  *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java

@@ -15,16 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.indexcoll;
+package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目(事件)分类按组织_按天统计
  *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectGridDailyEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectGridDailyEntity.java

@@ -15,16 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.indexcoll;
+package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 项目(事件)分析按网格_按天统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectOrgDailyEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectOrgDailyEntity.java

@@ -15,16 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.indexcoll;
+package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 项目(事件)分析按组织_按天统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectQuantityGridMonthlyEntity.java

@@ -15,16 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.indexcoll;
+package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目(事件)数量分析按网格_按月统计
  *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyEntity.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyEntity.java

@@ -15,16 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.indexcoll;
+package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 项目(事件)数量分析按组织_按月统计
  *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO;
+import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity;
 
 import java.util.List;
 import java.util.Map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO;
+import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
 
 import java.util.List;
 import java.util.Map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectGridDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectGridDailyService.java

@@ -15,14 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO;
+import com.epmet.dto.screen.ScreenProjectGridDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity;
-import javafx.stage.Screen;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectGridDailyEntity;
 
 import java.util.List;
 import java.util.Map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectOrgDailyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectOrgDailyService.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO;
+import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectOrgDailyEntity;
 
 import java.util.List;
 import java.util.Map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectQuantityGridMonthlyService.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO;
+import com.epmet.dto.screen.ScreenProjectQuantityGridMonthlyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityGridMonthlyEntity;
 
 import java.util.List;
 import java.util.Map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyService.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyService.java

@@ -15,13 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll;
+package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO;
+import com.epmet.dto.screen.ScreenProjectQuantityOrgMonthlyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyEntity;
 
 import java.util.List;
 import java.util.Map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryGridDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.screen.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyDao;
-import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao;
+import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity;
-import com.epmet.service.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyService;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryGridDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,9 +112,12 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> data) {
         if(data.getIsFirst()){
-            baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+           int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+           while(affectedRows > 0){
+               affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
            }
-        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER");
+        }
+        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER",data.getDateId());
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryOrgDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.screen.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyDao;
-import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
+import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity;
-import com.epmet.service.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyService;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryOrgDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,9 +112,12 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> data) {
         if(data.getIsFirst()){
-            baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            while(affectedRows > 0){
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
             }
-        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER");
+        }
+        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER",data.getDateId());
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectGridDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectGridDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.screen.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectGridDailyDao;
-import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectGridDailyDao;
+import com.epmet.dto.screen.ScreenProjectGridDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity;
-import com.epmet.service.evaluationindex.indexcoll.ScreenProjectGridDailyService;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectGridDailyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectGridDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,9 +113,12 @@ public class ScreenProjectGridDailyServiceImpl extends BaseServiceImpl<ScreenPro
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectGridDailyDTO> data) {
         if(data.getIsFirst()){
-            baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            while(affectedRows > 0){
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
             }
-        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER");
+        }
+        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER",data.getDateId());
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectOrgDailyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectOrgDailyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.screen.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectOrgDailyDao;
-import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectOrgDailyDao;
+import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity;
-import com.epmet.service.evaluationindex.indexcoll.ScreenProjectOrgDailyService;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectOrgDailyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectOrgDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -114,9 +114,12 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl<ScreenProj
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectOrgDailyDTO> data) {
         if(data.getIsFirst()){
-            baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
+            while(affectedRows > 0){
+                affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId());
             }
-        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER");
+        }
+        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER",data.getDateId());
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.screen.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyDao;
-import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectQuantityGridMonthlyDao;
+import com.epmet.dto.screen.ScreenProjectQuantityGridMonthlyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity;
-import com.epmet.service.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyService;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityGridMonthlyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityGridMonthlyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,9 +113,12 @@ public class ScreenProjectQuantityGridMonthlyServiceImpl extends BaseServiceImpl
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityGridMonthlyDTO> data) {
         if(data.getIsFirst()){
-            baseDao.deleteByDateIdAndCustomerId(customerId,data.getMonthId());
+            int affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
+            while(affectedRows > 0){
+                affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
             }
-        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER");
+        }
+        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER",data.getMonthId());
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.service.evaluationindex.indexcoll.impl;
+package com.epmet.service.evaluationindex.screen.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +25,11 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyDao;
-import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyDao;
+import com.epmet.dto.screen.ScreenProjectQuantityOrgMonthlyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
-import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity;
-import com.epmet.service.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyService;
+import com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyEntity;
+import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,9 +112,12 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
     @Override
     public void collect(String customerId, ScreenCollFormDTO<ScreenProjectQuantityOrgMonthlyDTO> data) {
         if(data.getIsFirst()){
-            baseDao.deleteByDateIdAndCustomerId(customerId,data.getMonthId());
+            int affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
+            while(affectedRows > 0){
+                affectedRows = baseDao.deleteByMonthIdAndCustomerId(customerId,data.getMonthId());
             }
-        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER");
+        }
+        baseDao.insertBatch(data.getDataList(),customerId,"APP_USER",data.getMonthId());
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyDao">
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity" id="screenProjectCategoryGridDailyMap">
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity" id="screenProjectCategoryGridDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="dateId" column="DATE_ID"/>
@@ -52,7 +52,7 @@
 
             #{customerId},
 
-            #{item.dateId},
+            #{timeId},
 
             #{item.gridId},
 
@@ -94,6 +94,7 @@
     delete from screen_project_category_grid_daily
     where customer_id = #{customerId}
     and date_id = #{dateId}
+    limit 1000
     </delete>
 
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyDao">
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity" id="screenProjectCategoryOrgDailyMap">
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity" id="screenProjectCategoryOrgDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="dateId" column="DATE_ID"/>
@@ -54,7 +54,7 @@
 
             #{customerId},
 
-            #{item.dateId},
+            #{timeId},
 
             #{item.orgId},
 
@@ -98,6 +98,7 @@
     delete from screen_project_category_org_daily
     where customer_id = #{customerId}
     and date_id = #{dateId}
+    limit 1000
     </delete>
 
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectGridDailyDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.indexcoll.ScreenProjectGridDailyDao">
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectGridDailyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity" id="screenProjectGridDailyMap">
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectGridDailyEntity" id="screenProjectGridDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="dateId" column="DATE_ID"/>
@@ -56,7 +56,7 @@
 
             #{customerId},
 
-            #{item.dateId},
+            #{timeId},
 
             #{item.gridId},
 
@@ -100,6 +100,7 @@
     delete from screen_project_grid_daily
     where customer_id = #{customerId}
     and date_id = #{dateId}
+    limit 1000
     </delete>
 
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectOrgDailyDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.indexcoll.ScreenProjectOrgDailyDao">
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectOrgDailyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity" id="screenProjectOrgDailyMap">
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectOrgDailyEntity" id="screenProjectOrgDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="dateId" column="DATE_ID"/>
@@ -58,7 +58,7 @@
 
             #{customerId},
 
-            #{item.dateId},
+            #{timeId},
 
             #{item.orgId},
 
@@ -104,6 +104,7 @@
     delete from screen_project_org_daily
     where customer_id = #{customerId}
     and date_id = #{dateId}
+    limit 1000
     </delete>
 
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectQuantityGridMonthlyDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyDao">
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectQuantityGridMonthlyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity" id="screenProjectQuantityGridMonthlyMap">
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityGridMonthlyEntity" id="screenProjectQuantityGridMonthlyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="monthId" column="MONTH_ID"/>
@@ -50,7 +50,7 @@
 
             #{customerId},
 
-            #{item.monthId},
+            #{timeId},
 
             #{item.gridId},
 
@@ -84,10 +84,11 @@
     </insert>
 
 
-    <delete id="deleteByDateIdAndCustomerId">
+    <delete id="deleteByMonthIdAndCustomerId">
     delete from screen_project_quantity_grid_monthly
     where customer_id = #{customerId}
     and date_id = #{monthId}
+    limit 1000
     </delete>
 
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml → epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectQuantityOrgMonthlyDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyDao">
+<mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity" id="screenProjectQuantityOrgMonthlyMap">
+    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyEntity" id="screenProjectQuantityOrgMonthlyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="monthId" column="MONTH_ID"/>
@@ -53,7 +53,7 @@
 
             #{customerId},
 
-            #{item.monthId},
+            #{timeId},
 
             #{item.orgId},
 
@@ -89,10 +89,11 @@
     </insert>
 
 
-    <delete id="deleteByDateIdAndCustomerId">
+    <delete id="deleteByMonthIdAndCustomerId">
     delete from screen_project_quantity_org_monthly
     where customer_id = #{customerId}
     and date_id = #{monthId}
+    limit 1000
     </delete>