diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java index 12f4f9690e..d1cb54fa7c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java @@ -1,6 +1,15 @@ 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.screencoll.ScreenCollFormDTO; +import com.epmet.service.evaluationindex.indexcoll.*; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,4 +23,66 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("project") public class ScreenProjectDataCollController { + + @Autowired + private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService; + @Autowired + private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService; + @Autowired + private ScreenProjectGridDailyService projectGridDailyService; + @Autowired + private ScreenProjectOrgDailyService projectOrgDailyService; + @Autowired + private ScreenProjectQuantityGridMonthlyService projectQuantityGridMonthlyService; + @Autowired + private ScreenProjectQuantityOrgMonthlyService projectQuantityOrgMonthlyService; + + @RequestMapping("category-grid-daily") + public Result categoryGridDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO param){ + if(null == param || CollectionUtils.isEmpty(param.getDataList())) + throw new ValidateException("传入数据不可为空"); + projectCategoryGridDailyService.collect(customerId,param); + return new Result(); + } + + @RequestMapping("category-org-daily") + public Result categoryOrgDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO param){ + if(null == param || CollectionUtils.isEmpty(param.getDataList())) + throw new ValidateException("传入数据不可为空"); + projectCategoryOrgDailyService.collect(customerId,param); + return new Result(); + } + + @RequestMapping("quantity-grid-monthly") + public Result quantityGridMonthly(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO param){ + if(null == param || CollectionUtils.isEmpty(param.getDataList())) + throw new ValidateException("传入数据不可为空"); + projectQuantityGridMonthlyService.collect(customerId,param); + return new Result(); + } + + @RequestMapping("quantity-org-monthly") + public Result quantityOrgMonthly(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO param){ + if(null == param || CollectionUtils.isEmpty(param.getDataList())) + throw new ValidateException("传入数据不可为空"); + projectQuantityOrgMonthlyService.collect(customerId,param); + return new Result(); + } + + @RequestMapping("project-grid-daily") + public Result projectGridDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO param){ + if(null == param || CollectionUtils.isEmpty(param.getDataList())) + throw new ValidateException("传入数据不可为空"); + projectGridDailyService.collect(customerId,param); + return new Result(); + } + + @RequestMapping("project-org-daily") + public Result projectOrgDaily(@RequestHeader("CustomerId")String customerId, @RequestBody ScreenCollFormDTO param){ + if(null == param || CollectionUtils.isEmpty(param.getDataList())) + throw new ValidateException("传入数据不可为空"); + projectOrgDailyService.collect(customerId,param); + return new Result(); + } + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java index 70e85574f7..9baea20ee5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.indexcoll; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目(事件)分类按网格_按天统计 @@ -29,5 +33,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenProjectCategoryGridDailyDao extends BaseDao { - + + void insertBatch(@Param("list") List list,@Param("customerId") String customerId,@Param("createdBy")String createdBy); + + void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java index 1c07640f10..e512e52e8d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.indexcoll; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目(事件)分类按组织_按天统计 @@ -29,5 +33,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenProjectCategoryOrgDailyDao extends BaseDao { - + + void insertBatch(@Param("list") List list,@Param("customerId") String customerId,@Param("createdBy")String createdBy); + + void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java index 2125c3bd0b..abc056a6a7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectGridDailyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.indexcoll; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目(事件)分析按网格_按天统计 @@ -29,5 +33,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenProjectGridDailyDao extends BaseDao { - + + + void insertBatch(@Param("list") List list,@Param("customerId") String customerId,@Param("createdBy")String createdBy); + + void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); + + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java index fa5a4a3dc4..4b073ba4dd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.indexcoll; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目(事件)分析按组织_按天统计 @@ -29,5 +33,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenProjectOrgDailyDao extends BaseDao { - + + + void insertBatch(@Param("list") List list,@Param("customerId") String customerId,@Param("createdBy")String createdBy); + + void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); + + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java index 808ce3e53c..d986014dce 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.indexcoll; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目(事件)数量分析按网格_按月统计 @@ -29,5 +33,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenProjectQuantityGridMonthlyDao extends BaseDao { - + + void insertBatch(@Param("list") List list,@Param("customerId") String customerId,@Param("createdBy")String createdBy); + + void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId); + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java index 63b4315d76..7cd0cb74d7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.java @@ -18,8 +18,12 @@ package com.epmet.dao.evaluationindex.indexcoll; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 项目(事件)数量分析按组织_按月统计 @@ -29,5 +33,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao { - + + + void insertBatch(@Param("list") List list,@Param("customerId") String customerId,@Param("createdBy")String createdBy); + + void deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId); + + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyService.java index 317eb15f74..c5d2eb30ef 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity; import java.util.List; @@ -92,4 +93,13 @@ public interface ScreenProjectCategoryGridDailyService extends BaseService data); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyService.java index f0515ae68c..4dd2d5c715 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity; import java.util.List; @@ -92,4 +93,14 @@ public interface ScreenProjectCategoryOrgDailyService extends BaseService data); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectDataCollService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectDataCollService.java deleted file mode 100644 index 07465008a1..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectDataCollService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.epmet.service.evaluationindex.indexcoll; - -/** - * @Description 事件/项目大屏数据采集service - * @author wangc - * @date 2021.01.27 17:19 -*/ -public interface ScreenProjectDataCollService { -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectGridDailyService.java index 3c7c41ecfb..51260645aa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectGridDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectGridDailyService.java @@ -20,7 +20,9 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity; +import javafx.stage.Screen; import java.util.List; import java.util.Map; @@ -92,4 +94,14 @@ public interface ScreenProjectGridDailyService extends BaseService data); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectOrgDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectOrgDailyService.java index e8a10429c0..4c51761e0d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectOrgDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectOrgDailyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity; import java.util.List; @@ -92,4 +93,14 @@ public interface ScreenProjectOrgDailyService extends BaseService data); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyService.java index 34c0890d15..81ba806027 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity; import java.util.List; @@ -92,4 +93,13 @@ public interface ScreenProjectQuantityGridMonthlyService extends BaseService data); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyService.java index 1ad6c888a4..d8e62061d7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyService.java @@ -20,6 +20,7 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity; import java.util.List; @@ -92,4 +93,14 @@ public interface ScreenProjectQuantityOrgMonthlyService extends BaseService data); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryGridDailyServiceImpl.java index 9d641d142a..a9ec67e0aa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryGridDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryGridDailyServiceImpl.java @@ -19,12 +19,17 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyDao; import com.epmet.dto.indexcollect.ScreenProjectCategoryGridDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyEntity; import com.epmet.service.evaluationindex.indexcoll.ScreenProjectCategoryGridDailyService; import org.apache.commons.lang3.StringUtils; @@ -97,4 +102,22 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl data) { + if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE)); + if(data.getIsFirst()){ + baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); + } + baseDao.insertBatch(data.getDataList(),customerId,"APP_USER"); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryOrgDailyServiceImpl.java index 037f4a56e7..52ebd193aa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectCategoryOrgDailyServiceImpl.java @@ -19,12 +19,17 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyDao; import com.epmet.dto.indexcollect.ScreenProjectCategoryOrgDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyEntity; import com.epmet.service.evaluationindex.indexcoll.ScreenProjectCategoryOrgDailyService; import org.apache.commons.lang3.StringUtils; @@ -96,4 +101,23 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl data) { + if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE)); + if(data.getIsFirst()){ + baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); + } + baseDao.insertBatch(data.getDataList(),customerId,"APP_USER"); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectDataCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectDataCollServiceImpl.java deleted file mode 100644 index 41c2cfde24..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectDataCollServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.service.evaluationindex.indexcoll.impl; - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.evaluationindex.indexcoll.*; -import com.epmet.service.evaluationindex.indexcoll.ScreenProjectDataCollService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Description - * @ClassName ScreenProjectDataCollServiceImpl - * @Auth wangc - * @Date 2021-01-27 17:20 - */ -@Slf4j -@Service -@DataSource(DataSourceConstant.EVALUATION_INDEX) -public class ScreenProjectDataCollServiceImpl implements ScreenProjectDataCollService { - - @Autowired - private ScreenProjectCategoryGridDailyDao categoryGridDailyDao; - - @Autowired - private ScreenProjectCategoryOrgDailyDao categoryOrgDailyDao; - - @Autowired - private ScreenProjectGridDailyDao gridDailyDao; - - @Autowired - private ScreenProjectOrgDailyDao orgDailyDao; - - @Autowired - private ScreenProjectQuantityGridMonthlyDao quantityGridMonthlyDao; - - @Autowired - private ScreenProjectQuantityOrgMonthlyDao quantityOrgMonthlyDao; - - -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectGridDailyServiceImpl.java index 8377b315df..9eadef0999 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectGridDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectGridDailyServiceImpl.java @@ -19,12 +19,17 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectGridDailyDao; import com.epmet.dto.indexcollect.ScreenProjectGridDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectGridDailyEntity; import com.epmet.service.evaluationindex.indexcoll.ScreenProjectGridDailyService; import org.apache.commons.lang3.StringUtils; @@ -97,4 +102,23 @@ public class ScreenProjectGridDailyServiceImpl extends BaseServiceImpl data) { + if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE)); + if(data.getIsFirst()){ + baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); + } + baseDao.insertBatch(data.getDataList(),customerId,"APP_USER"); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectOrgDailyServiceImpl.java index 16aeb8fd2d..2d98768ec1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectOrgDailyServiceImpl.java @@ -19,12 +19,17 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectOrgDailyDao; import com.epmet.dto.indexcollect.ScreenProjectOrgDailyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectOrgDailyEntity; import com.epmet.service.evaluationindex.indexcoll.ScreenProjectOrgDailyService; import org.apache.commons.lang3.StringUtils; @@ -97,4 +102,24 @@ public class ScreenProjectOrgDailyServiceImpl extends BaseServiceImpl data) { + if(StringUtils.isBlank(data.getDateId())) data.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE)); + if(data.getIsFirst()){ + baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); + } + baseDao.insertBatch(data.getDataList(),customerId,"APP_USER"); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java index 327351ccf2..4b797fa009 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityGridMonthlyServiceImpl.java @@ -19,12 +19,17 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyDao; import com.epmet.dto.indexcollect.ScreenProjectQuantityGridMonthlyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyEntity; import com.epmet.service.evaluationindex.indexcoll.ScreenProjectQuantityGridMonthlyService; import org.apache.commons.lang3.StringUtils; @@ -97,4 +102,23 @@ public class ScreenProjectQuantityGridMonthlyServiceImpl extends BaseServiceImpl baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * @Description 数据采集 + * @param customerId + * @param data + * @return void + * @author wangc + * @date 2021.01.28 09:33 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) + @Override + public void collect(String customerId, ScreenCollFormDTO data) { + if(StringUtils.isBlank(data.getMonthId())) data.setMonthId(DateUtils.getBeforeNMonth(NumConstant.ONE)); + if(data.getIsFirst()){ + baseDao.deleteByDateIdAndCustomerId(customerId,data.getMonthId()); + } + baseDao.insertBatch(data.getDataList(),customerId,"APP_USER"); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java index 663e018652..8a05d8f543 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java @@ -19,12 +19,17 @@ package com.epmet.service.evaluationindex.indexcoll.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyDao; import com.epmet.dto.indexcollect.ScreenProjectQuantityOrgMonthlyDTO; +import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyEntity; import com.epmet.service.evaluationindex.indexcoll.ScreenProjectQuantityOrgMonthlyService; import org.apache.commons.lang3.StringUtils; @@ -96,4 +101,23 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl< baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * @Description 数据采集 + * @param customerId + * @param data + * @return void + * @author wangc + * @date 2021.01.28 09:33 + */ + @Transactional(rollbackFor = Exception.class) + @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) + @Override + public void collect(String customerId, ScreenCollFormDTO data) { + if(StringUtils.isBlank(data.getMonthId())) data.setMonthId(DateUtils.getBeforeNMonth(NumConstant.ONE)); + if(data.getIsFirst()){ + baseDao.deleteByDateIdAndCustomerId(customerId,data.getMonthId()); + } + baseDao.insertBatch(data.getDataList(),customerId,"APP_USER"); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml index d7541618e9..8737b35d75 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryGridDailyDao.xml @@ -24,5 +24,76 @@ + + INSERT INTO screen_project_category_grid_daily + ( + id, + customer_id, + date_id, + grid_id, + pid, + pids, + epmet_category_code, + project_total, + pending_total, + closed_total, + un_resolved_total, + resolved_total, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{customerId}, + + #{item.dateId}, + + #{item.gridId}, + + #{item.pid}, + + #{item.pids}, + + #{item.epmetCategoryCode}, + + #{item.projectTotal}, + + #{item.pendingTotal}, + + #{item.closedTotal}, + + #{item.unResolvedTotal}, + + #{item.regIncr}, + + #{item.resolvedTotal}, + + '0', + + 0, + + #{createdBy}, + + now(), + + #{createdBy}, + + now() + ) + + + + + + delete from screen_project_category_grid_daily + where customer_id = #{customerId} + and date_id = #{dateId} + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml index 74aab67dd6..1d035693d8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectCategoryOrgDailyDao.xml @@ -25,5 +25,81 @@ + + INSERT INTO screen_project_category_org_daily + ( + id, + customer_id, + date_id, + org_id, + org_type, + pid, + pids, + epmet_category_code, + project_total, + pending_total, + closed_total, + un_resolved_total, + resolved_total, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{customerId}, + + #{item.dateId}, + + #{item.orgId}, + + #{item.orgType}, + + #{item.pid}, + + #{item.pids}, + + #{item.epmetCategoryCode}, + + #{item.projectTotal}, + + #{item.pendingTotal}, + + #{item.closedTotal}, + + #{item.unResolvedTotal}, + + #{item.regIncr}, + + #{item.resolvedTotal}, + + '0', + + 0, + + #{createdBy}, + + now(), + + #{createdBy}, + + now() + ) + + + + + + delete from screen_project_category_org_daily + where customer_id = #{customerId} + and date_id = #{dateId} + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml index 497787c124..c3b4d7ed82 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectGridDailyDao.xml @@ -26,5 +26,82 @@ + + INSERT INTO screen_project_grid_daily + ( + id, + customer_id, + date_id, + grid_id, + pid, + pids, + project_total, + resolved_num, + resolved_ratio, + evaluate_total, + good_total, + bad_total, + good_ratio, + bad_ratio, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{customerId}, + + #{item.dateId}, + + #{item.gridId}, + + #{item.pid}, + + #{item.pids}, + + #{item.projectTotal}, + + #{item.resolvedNum}, + + #{item.resolvedRatio}, + + #{item.evaluateTotal}, + + #{item.goodTotal}, + + #{item.badTotal}, + + #{item.goodRatio}, + + #{item.badRatio}, + + '0', + + 0, + + #{createdBy}, + + now(), + + #{createdBy}, + + now() + ) + + + + + + delete from screen_project_grid_daily + where customer_id = #{customerId} + and date_id = #{dateId} + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml index e7ec55db6b..24ff1c1445 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectOrgDailyDao.xml @@ -27,5 +27,84 @@ + + INSERT INTO screen_project_org_daily + ( + id, + customer_id, + date_id, + org_id, + org_type, + pid, + pids, + project_total, + resolved_num, + resolved_ratio, + evaluate_total, + good_total, + bad_total, + good_ratio, + bad_ratio, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{customerId}, + + #{item.dateId}, + + #{item.orgId}, + + #{item.orgType}, + + #{item.pid}, + + #{item.pids}, + + #{item.projectTotal}, + + #{item.resolvedNum}, + + #{item.resolvedRatio}, + + #{item.evaluateTotal}, + + #{item.goodTotal}, + + #{item.badTotal}, + + #{item.goodRatio}, + + #{item.badRatio}, + + '0', + + 0, + + #{createdBy}, + + now(), + + #{createdBy}, + + now() + ) + + + + + + delete from screen_project_org_daily + where customer_id = #{customerId} + and date_id = #{dateId} + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml index 424f17d977..de3a392748 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityGridMonthlyDao.xml @@ -23,5 +23,73 @@ + + INSERT INTO screen_project_quantity_grid_monthly + ( + id, + customer_id, + month_id, + grid_id, + pid, + pids, + project_incr, + project_total, + un_closed_total, + closed_total, + closed_incr, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{customerId}, + + #{item.monthId}, + + #{item.gridId}, + + #{item.pid}, + + #{item.pids}, + + #{item.projectIncr}, + + #{item.projectTotal}, + + #{item.unClosedTotal}, + + #{item.closedTotal}, + + #{item.closedIncr}, + + '0', + + 0, + + #{createdBy}, + + now(), + + #{createdBy}, + + now() + ) + + + + + + delete from screen_project_quantity_grid_monthly + where customer_id = #{customerId} + and date_id = #{monthId} + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml index ac8995ea27..6fed8b4603 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenProjectQuantityOrgMonthlyDao.xml @@ -25,4 +25,75 @@ + + INSERT INTO screen_project_quantity_org_monthly + ( + id, + customer_id, + month_id, + org_id, + org_type, + pid, + pids, + project_incr, + project_total, + un_closed_total, + closed_total, + closed_incr, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{customerId}, + + #{item.monthId}, + + #{item.orgId}, + + #{item.orgType}, + + #{item.pid}, + + #{item.pids}, + + #{item.projectIncr}, + + #{item.projectTotal}, + + #{item.unClosedTotal}, + + #{item.closedTotal}, + + #{item.closedIncr}, + + '0', + + 0, + + #{createdBy}, + + now(), + + #{createdBy}, + + now() + ) + + + + + + delete from screen_project_quantity_org_monthly + where customer_id = #{customerId} + and date_id = #{monthId} + + + \ No newline at end of file