diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerLoveHoursDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerLoveHoursDTO.java index 2eb831dc..96a90c67 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerLoveHoursDTO.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/ScreenVolunteerLoveHoursDTO.java @@ -78,4 +78,9 @@ public class ScreenVolunteerLoveHoursDTO implements Serializable { */ private String delFlag; + /** + * 名字 + */ + private String volunteerName; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/result/ScreenLabelValueDTO.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/result/ScreenLabelValueDTO.java new file mode 100755 index 00000000..fbfd8c4e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/src/main/java/com/elink/esua/epdc/dto/result/ScreenLabelValueDTO.java @@ -0,0 +1,48 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * label value 统计 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2023-07-05 + */ +@Data +public class ScreenLabelValueDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * label + */ + private String label; + + /** + * value + */ + private String value; + +} \ 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/controller/ScreenHouseClassCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.java index 1b0bc859..89bc8cd3 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.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.ScreenHouseClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.excel.ScreenHouseClassCensusExcel; import com.elink.esua.epdc.service.ScreenHouseClassCensusService; import org.springframework.beans.factory.annotation.Autowired; @@ -50,6 +51,12 @@ public class ScreenHouseClassCensusController { @Autowired private ScreenHouseClassCensusService screenHouseClassCensusService; + @GetMapping("census") + public Result> census(@RequestParam Map params){ + List list = screenHouseClassCensusService.census(params); + return new Result>().ok(list); + } + @GetMapping("list") public Result> list(@RequestParam Map params){ List list = screenHouseClassCensusService.list(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java index 6f0b88aa..a69c67fc 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.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.ScreenResiClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.excel.ScreenResiClassCensusExcel; import com.elink.esua.epdc.service.ScreenResiClassCensusService; import org.springframework.beans.factory.annotation.Autowired; @@ -56,6 +57,12 @@ public class ScreenResiClassCensusController { return new Result>().ok(list); } + @GetMapping("census") + public Result> census(@RequestParam Map params){ + List list = screenResiClassCensusService.census(params); + return new Result>().ok(list); + } + @GetMapping("page") public Result> page(@RequestParam Map params){ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenHouseClassCensusDao.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenHouseClassCensusDao.java index a56b26b2..1ce2eb76 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenHouseClassCensusDao.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenHouseClassCensusDao.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.ScreenHouseClassCensusEntity; 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 ScreenHouseClassCensusDao 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/dao/ScreenResiClassCensusDao.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenResiClassCensusDao.java index 9091daa3..fbbedff5 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenResiClassCensusDao.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenResiClassCensusDao.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.ScreenResiClassCensusEntity; 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 ScreenResiClassCensusDao 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/dao/ScreenVolunteerLoveHoursDao.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenVolunteerLoveHoursDao.java index 806d6ca8..a072185a 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenVolunteerLoveHoursDao.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/dao/ScreenVolunteerLoveHoursDao.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.ScreenVolunteerLoveHoursDTO; import com.elink.esua.epdc.entity.ScreenVolunteerLoveHoursEntity; 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 ScreenVolunteerLoveHoursDao extends BaseDao { - + + List listByMine(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/ScreenHouseClassCensusService.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenHouseClassCensusService.java index a06ecfab..9c2741a2 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenHouseClassCensusService.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenHouseClassCensusService.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.ScreenHouseClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenHouseClassCensusEntity; import java.util.List; @@ -92,4 +93,6 @@ public interface ScreenHouseClassCensusService 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/ScreenResiClassCensusService.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenResiClassCensusService.java index 79b60fef..b2b60207 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenResiClassCensusService.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/ScreenResiClassCensusService.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.ScreenResiClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenResiClassCensusEntity; import java.util.List; @@ -92,4 +93,6 @@ public interface ScreenResiClassCensusService 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/ScreenHouseClassCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.java index d03ec98f..f4fc59cc 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.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.ScreenHouseClassCensusDao; import com.elink.esua.epdc.dto.ScreenHouseClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenHouseClassCensusEntity; import com.elink.esua.epdc.redis.ScreenHouseClassCensusRedis; import com.elink.esua.epdc.service.ScreenHouseClassCensusService; @@ -108,4 +109,9 @@ public class ScreenHouseClassCensusServiceImpl 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/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java index 0e46fc56..8c9ae5cc 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.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.ScreenResiClassCensusDao; import com.elink.esua.epdc.dto.ScreenResiClassCensusDTO; +import com.elink.esua.epdc.dto.result.ScreenLabelValueDTO; import com.elink.esua.epdc.entity.ScreenResiClassCensusEntity; import com.elink.esua.epdc.redis.ScreenResiClassCensusRedis; import com.elink.esua.epdc.service.ScreenResiClassCensusService; @@ -107,4 +108,10 @@ public class ScreenResiClassCensusServiceImpl 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/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java index d48fb976..10edb3f1 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java @@ -75,6 +75,8 @@ public class ScreenVolunteerActivityServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); +// List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, ScreenVolunteerLoveHoursDTO.class); + List result = baseDao.listByMine(params); + + return result; } private QueryWrapper getWrapper(Map params){ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenHouseClassCensusDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenHouseClassCensusDao.xml index e2a045d8..0807c7b3 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenHouseClassCensusDao.xml +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenHouseClassCensusDao.xml @@ -15,6 +15,19 @@ + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenResiClassCensusDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenResiClassCensusDao.xml index 07b80cf6..3d197ae3 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenResiClassCensusDao.xml +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenResiClassCensusDao.xml @@ -15,6 +15,16 @@ + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerLoveHoursDao.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerLoveHoursDao.xml index 8ccd16e0..1dea9371 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerLoveHoursDao.xml +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerLoveHoursDao.xml @@ -14,6 +14,17 @@ + \ No newline at end of file