fix:大屏相关接口修改

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;
+
 }

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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<List<ScreenLabelValueDTO>> census(@RequestParam Map<String, Object> params){
+        List<ScreenLabelValueDTO> list = screenHouseClassCensusService.census(params);
+        return new Result<List<ScreenLabelValueDTO>>().ok(list);
+    }
+
     @GetMapping("list")
     public Result<List<ScreenHouseClassCensusDTO>> list(@RequestParam Map<String, Object> params){
         List<ScreenHouseClassCensusDTO> list = screenHouseClassCensusService.list(params);

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<List<ScreenResiClassCensusDTO>>().ok(list);
     }
 
+    @GetMapping("census")
+    public Result<List<ScreenLabelValueDTO>> census(@RequestParam Map<String, Object> params){
+        List<ScreenLabelValueDTO> list = screenResiClassCensusService.census(params);
+        return new Result<List<ScreenLabelValueDTO>>().ok(list);
+    }
+
 
     @GetMapping("page")
     public Result<PageData<ScreenResiClassCensusDTO>> page(@RequestParam Map<String, Object> params){

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;
+
 /**
  * 房屋分类统计
  *
@@ -30,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenHouseClassCensusDao extends BaseDao<ScreenHouseClassCensusEntity> {
 
+    List<ScreenLabelValueDTO> census(Map<String, Object> params);
 }

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;
+
 /**
  * 居民分类统计
  *
@@ -30,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenResiClassCensusDao extends BaseDao<ScreenResiClassCensusEntity> {
 
+    List<ScreenLabelValueDTO> census(Map<String, Object> params);
 }

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;
+
 /**
  * 志愿者公益时长表
  *
@@ -30,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ScreenVolunteerLoveHoursDao extends BaseDao<ScreenVolunteerLoveHoursEntity> {
 
+    List<ScreenVolunteerLoveHoursDTO> listByMine(Map<String, Object> params);
 }

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<ScreenHouseCl
      * @date 2023-07-05
      */
     void delete(String[] ids);
+
+    List<ScreenLabelValueDTO> census(Map<String, Object> params);
 }

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<ScreenResiClas
      * @date 2023-07-05
      */
     void delete(String[] ids);
+
+    List<ScreenLabelValueDTO> census(Map<String, Object> params);
 }

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<ScreenHou
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<ScreenLabelValueDTO> census(Map<String, Object> params) {
+        return baseDao.census(params);
+    }
+
 }

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<ScreenResi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<ScreenLabelValueDTO> census(Map<String, Object> params) {
+
+        return baseDao.census(params);
+    }
+
 }

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<ScreenVo
         String type = (String)params.get("type");
         wrapper.eq(StringUtils.isNotBlank(type), "type", type);
 
+        wrapper.orderByAsc("count");
+
         return wrapper;
     }
 

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerLoveHoursServiceImpl.java

@@ -60,9 +60,11 @@ public class ScreenVolunteerLoveHoursServiceImpl extends BaseServiceImpl<ScreenV
 
     @Override
     public List<ScreenVolunteerLoveHoursDTO> list(Map<String, Object> params) {
-        List<ScreenVolunteerLoveHoursEntity> entityList = baseDao.selectList(getWrapper(params));
+//        List<ScreenVolunteerLoveHoursEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, ScreenVolunteerLoveHoursDTO.class);
+        List<ScreenVolunteerLoveHoursDTO> result = baseDao.listByMine(params);
+
+        return result;
     }
 
     private QueryWrapper<ScreenVolunteerLoveHoursEntity> getWrapper(Map<String, Object> params){

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenHouseClassCensusDao.xml

@@ -15,6 +15,19 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="census" resultType="com.elink.esua.epdc.dto.result.ScreenLabelValueDTO">
+
+        select TYPE as label,
+        COUNT as value
+        from screen_house_class_census
+        where
+        DEL_FLAG = 0
+        <if test="communityId!=null and communityId!=''">
+            and COMMUNITY_ID = #{communityId}
+        </if>
+
+
+    </select>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenResiClassCensusDao.xml

@@ -15,6 +15,16 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="census" resultType="com.elink.esua.epdc.dto.result.ScreenLabelValueDTO">
+        select TYPE as label,
+               COUNT as value
+        from screen_resi_class_census
+        where
+            DEL_FLAG = 0
+        <if test="communityId!=null and communityId!=''">
+            and COMMUNITY_ID = #{communityId}
+        </if>
+    </select>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/mapper/ScreenVolunteerLoveHoursDao.xml

@@ -14,6 +14,17 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="listByMine" resultType="com.elink.esua.epdc.dto.ScreenVolunteerLoveHoursDTO">
+
+            select  lover.*,volunteer.NAME as volunteerName
+            from screen_volunteer_love_hours lover
+            left join screen_volunteer volunteer on volunteer.ID = lover.VOLUNTEER_ID
+            where lover.DEL_FLAG = 0
+            <if test="type!=null and type !=''">
+                and lover.TYPE = #{type}
+            </if>
+            order by lover.HOURS desc
+    </select>
 
 
 </mapper>