Merge remote-tracking branch 'origin/master'

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

@@ -38,8 +38,8 @@
             a.staffName,
             a.gridId,
             a.pid AS agencyId,
-            SUM(a.projectCount) as projectCount,
+            '0' as projectCount,
-            SUM(a.projectIncr)projectIncr,
+            0 as projectIncr,
             SUM(a.issueToProjectCount)issueToProjectCount,
             SUM(a.issueToProjectIncr)issueToProjectIncr,
             SUM(a.closedIssueCount)closedIssueCount,

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -428,6 +428,18 @@ public class ApiAppUserController {
         return appUserService.listOfVolunteerTags();
     }
 
+    /**
+    * @describe: 志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:52
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    @GetMapping("volunteer/tagsList")
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return appUserService.getVolunteerTagList();
+    }
+
     /**
      * 志愿者部门
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -692,4 +692,14 @@ public interface UserFeignClient {
      */
     @PostMapping(value = "app-user/vlounteerteamrealation/joinTeam", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result joinTeam(VolunteerTeamFormDTO formDto);
+
+    /**
+    * @describe: 志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:55
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    @GetMapping("app-user/epdc-app/volunteerinfo/tagList")
+    Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList();
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -337,4 +337,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result joinTeam(VolunteerTeamFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "joinTeam", formDto);
     }
+
+    @Override
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerTagList", null);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -435,4 +435,13 @@ public interface AppUserService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.PopulationInfoOverviewDTO>
      **/
     Result<PopulationInfoOverviewDTO> getPopulationInfoOverviewForScreen(String communityId);
+
+    /**
+    * @describe:  志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:53
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList();
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1777,4 +1777,9 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.getPopulationInfoOverviewForScreen(communityId);
     }
 
+    @Override
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return userFeignClient.getVolunteerTagList();
+    }
+
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java

@@ -170,7 +170,7 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
             list.add(entity);
         }
         updateBatchById(list);
-        pointsFeignClient.deletePointsByTopic(formDto.getIds());
+//        pointsFeignClient.deletePointsByTopic(formDto.getIds());
         return new Result();
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerTagDTO.java

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -88,4 +89,9 @@ public class VolunteerTagDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+    /**
+     * 类别：1服务团 2服务队
+     */
+    private String categoryType;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/VolunteerTagsSumResultDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 志愿者标签
+ *
+ * @author Liuchuang
+ * @since 2021/1/25 15:01
+ */
+@Data
+public class VolunteerTagsSumResultDTO implements Serializable {
+    private static final long serialVersionUID = 8355829005926490150L;
+
+
+
+    /**
+     * 类别名称
+     */
+    private String typeName;
+
+    private List<VolunteerTagsResultDTO> lists;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java

@@ -111,6 +111,18 @@ public class EpdcAppVolunteerInfoController {
         return new Result<List<VolunteerTagsResultDTO>>().ok(data);
     }
 
+    /**
+    * @describe: 志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:56
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    @GetMapping("tagList")
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return volunteerTagService.getVolunteerTags();
+    }
+
     /**
      * 志愿者部门列表
      *

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerTagDao.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO;
 import com.elink.esua.epdc.entity.VolunteerTagEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -41,4 +42,13 @@ public interface VolunteerTagDao extends BaseDao<VolunteerTagEntity> {
      * @since 2021/1/25 15:11
      */
     List<VolunteerTagsResultDTO> selectListOfVolunteerTags();
+
+    /**
+    * @describe: 通过类别查询标签
+    * @author wangtong
+    * @date 2022/7/21 9:54
+    * @params [categoryType]
+    * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO>
+    */
+    List<VolunteerTagsResultDTO> selectListByCategory(@Param("categoryType") String categoryType);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerTagEntity.java

@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 志愿者标签表
  *
@@ -58,4 +55,9 @@ public class VolunteerTagEntity extends BaseEpdcEntity {
      */
 	private String enableFlag;
 
-}
+	/**
+	 * 类别：1服务团 2服务队
+	 */
+	private String categoryType;
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerTagService.java

@@ -19,8 +19,10 @@ 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.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.VolunteerTagDTO;
 import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO;
 import com.elink.esua.epdc.entity.VolunteerTagEntity;
 
 import java.util.List;
@@ -102,4 +104,13 @@ public interface VolunteerTagService extends BaseService<VolunteerTagEntity> {
      * @since 2021/1/25 15:09
      */
     List<VolunteerTagsResultDTO> listOfVolunteerTags();
+
+    /**
+    * @describe: 志愿者标签
+    * @author wangtong
+    * @date 2022/7/21 9:33
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    Result<List<VolunteerTagsSumResultDTO>> getVolunteerTags();
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagServiceImpl.java

@@ -23,15 +23,18 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.VolunteerTagDao;
 import com.elink.esua.epdc.dto.VolunteerTagDTO;
 import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO;
 import com.elink.esua.epdc.entity.VolunteerTagEntity;
 import com.elink.esua.epdc.service.VolunteerTagService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -103,4 +106,21 @@ public class VolunteerTagServiceImpl extends BaseServiceImpl<VolunteerTagDao, Vo
         return baseDao.selectListOfVolunteerTags();
     }
 
+    @Override
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTags() {
+        List<VolunteerTagsSumResultDTO> result = new ArrayList<>();
+
+        VolunteerTagsSumResultDTO firstCtegory = new VolunteerTagsSumResultDTO();
+        firstCtegory.setTypeName("服务团");
+        firstCtegory.setLists(baseDao.selectListByCategory("1"));
+        result.add(firstCtegory);
+
+        VolunteerTagsSumResultDTO secondCtegory = new VolunteerTagsSumResultDTO();
+        secondCtegory.setTypeName("服务队");
+        secondCtegory.setLists(baseDao.selectListByCategory("2"));
+        result.add(secondCtegory);
+
+        return new Result<List<VolunteerTagsSumResultDTO>>().ok(result);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml

@@ -17,8 +17,18 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="selectListOfVolunteerTags" resultType="com.elink.esua.epdc.entity.VolunteerTagEntity">
+    <select id="selectListOfVolunteerTags" resultType="com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO">
         SELECT ID, TAG_NAME, DESCRIPTION, SORT FROM epdc_volunteer_tag WHERE DEL_FLAG = '0' AND ENABLE_FLAG = '1' ORDER BY SORT
     </select>
+    <select id="selectListByCategory" resultType="com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO">
+        SELECT ID, TAG_NAME, DESCRIPTION, SORT
+        FROM epdc_volunteer_tag
+        WHERE DEL_FLAG = '0'
+              AND ENABLE_FLAG = '1'
+                <if test="categoryType != null and categoryType != ''">
+                    and CATEGORY_TYPE=#{categoryType}
+                </if>
+        ORDER BY SORT
+    </select>
 
 </mapper>