diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index 703009a8..af6a57d4 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.renren.common.annotation.LogOperation; import io.renren.common.constant.Constant; import io.renren.common.utils.Result; +import io.renren.modules.date_snapshot.service.SysDateSnapshotService; import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.resource.dao.ResourceDao; import io.renren.modules.resource.excel.census.SelectApplyDeptDetailTypeCountListExcel; @@ -70,6 +71,9 @@ public class CensusController { @Autowired private JdbcTemplate jdbcTemplate; + @Autowired + private SysDateSnapshotService sysDateSnapshotService; + @Value("${census.type}") private String[] censusTypes; // 需要进行统计的资源类型 diff --git a/renren-admin/src/main/java/io/renren/modules/date_snapshot/dao/SysDateSnapshotDao.java b/renren-admin/src/main/java/io/renren/modules/date_snapshot/dao/SysDateSnapshotDao.java index ddd204ae..75eadf90 100644 --- a/renren-admin/src/main/java/io/renren/modules/date_snapshot/dao/SysDateSnapshotDao.java +++ b/renren-admin/src/main/java/io/renren/modules/date_snapshot/dao/SysDateSnapshotDao.java @@ -1,8 +1,10 @@ package io.renren.modules.date_snapshot.dao; import io.renren.common.dao.BaseDao; +import io.renren.modules.date_snapshot.dto.SysDateSnapshotDTO; import io.renren.modules.date_snapshot.entity.SysDateSnapshotEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 运行数据快照(资源数量、申请数量) @@ -13,4 +15,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysDateSnapshotDao extends BaseDao { + SysDateSnapshotDTO selectForFlag(@Param("type") Integer type); + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java index 4b4922cd..9b395b81 100644 --- a/renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java @@ -109,6 +109,6 @@ public class SysDateSnapshotServiceImpl extends CrudServiceImpl + + \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml index f98606e6..1a5bfbd4 100644 --- a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml +++ b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml @@ -73,6 +73,18 @@ and updateDate #{updateDate} + + and application_area in + + #{item} + + + + and area in + + #{item} + + group by tf.id ORDER BY ${orderField} ${orderType}