diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventClassCensusDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventClassCensusDTO.java index 6acf5044..914e8210 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventClassCensusDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenEventClassCensusDTO.java @@ -44,11 +44,11 @@ public class ScreenEventClassCensusDTO implements Serializable { private Integer count; /** - * 类型 -1:城市管理2:环境保护3:安全监管 + * 类型 +1:城市管理2:环境保护3:安全监管 4:民政5:建设管理6:文化执法7:社区治安综治8:食品药品监管9:市场监管10:公安交通管理11:消防安全12:卫生计生监督执法 */ - private Integer type; + private String type; /** * 创建人 diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenHouseClassCensusDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenHouseClassCensusDTO.java index 6cb081d6..bf41cb39 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenHouseClassCensusDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenHouseClassCensusDTO.java @@ -56,7 +56,7 @@ public class ScreenHouseClassCensusDTO implements Serializable { /** * 类型 */ - private Integer type; + private String type; /** * 创建人 diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenResiClassCensusDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenResiClassCensusDTO.java index 601af88c..7a2673d3 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenResiClassCensusDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenResiClassCensusDTO.java @@ -56,7 +56,7 @@ public class ScreenResiClassCensusDTO implements Serializable { /** * 类型 */ - private Integer type; + private String type; /** * 创建人 diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java index 382cf74d..0b5ad6c0 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenEventClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.excel.ScreenEventClassCensusExcel; import com.elink.esua.epdc.service.ScreenEventClassCensusService; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +52,12 @@ public class ScreenEventClassCensusController { private ScreenEventClassCensusService screenEventClassCensusService; + @GetMapping("census") + public Result> census(@RequestParam Map params){ + List list = screenEventClassCensusService.census(params); + return new Result>().ok(list); + } + @GetMapping("list") public Result> list(@RequestParam Map params){ List list = screenEventClassCensusService.list(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenEventClassCensusDao.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenEventClassCensusDao.java index b346edd1..049f0ed4 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenEventClassCensusDao.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenEventClassCensusDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenEventClassCensusEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 事件分类统计 * @@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScreenEventClassCensusDao extends BaseDao { - + + List census(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventClassCensusEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventClassCensusEntity.java index 77658547..2c3d6ca2 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventClassCensusEntity.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenEventClassCensusEntity.java @@ -44,10 +44,10 @@ public class ScreenEventClassCensusEntity extends BaseEpdcEntity { private Integer count; /** - * 类型 -1:城市管理2:环境保护3:安全监管 + * 类型 +1:城市管理2:环境保护3:安全监管 4:民政5:建设管理6:文化执法7:社区治安综治8:食品药品监管9:市场监管10:公安交通管理11:消防安全12:卫生计生监督执法 */ - private Integer type; + private String type; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenHouseClassCensusEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenHouseClassCensusEntity.java index c3f928a0..68aba322 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenHouseClassCensusEntity.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenHouseClassCensusEntity.java @@ -56,6 +56,6 @@ public class ScreenHouseClassCensusEntity extends BaseEpdcEntity { /** * 类型 */ - private Integer type; + private String type; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenResiClassCensusEntity.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenResiClassCensusEntity.java index cd6622e7..2085c302 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenResiClassCensusEntity.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/entity/ScreenResiClassCensusEntity.java @@ -56,6 +56,6 @@ public class ScreenResiClassCensusEntity extends BaseEpdcEntity { /** * 类型 */ - private Integer type; + private String type; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenEventClassCensusService.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenEventClassCensusService.java index 655e5f74..358ba906 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenEventClassCensusService.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenEventClassCensusService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.ScreenEventClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenEventClassCensusEntity; import java.util.List; @@ -92,4 +93,6 @@ public interface ScreenEventClassCensusService extends BaseService census(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventClassCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventClassCensusServiceImpl.java index 782666ae..154fef58 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventClassCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenEventClassCensusServiceImpl.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.ScreenEventClassCensusDao; import com.elink.esua.epdc.dto.ScreenEventClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenEventClassCensusEntity; import com.elink.esua.epdc.redis.ScreenEventClassCensusRedis; import com.elink.esua.epdc.service.ScreenEventClassCensusService; @@ -101,4 +102,9 @@ public class ScreenEventClassCensusServiceImpl extends BaseServiceImpl census(Map params) { + return baseDao.census(params); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenEventClassCensusDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenEventClassCensusDao.xml index 49c45aa7..a005a292 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenEventClassCensusDao.xml +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenEventClassCensusDao.xml @@ -13,6 +13,11 @@ - - + \ No newline at end of file