Merge branch 'dev_personal_center' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MyPubIssuesAuditingFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -16,10 +17,10 @@ public class MyPubIssuesAuditingFormDTO implements Serializable {
 
     public interface MyPubIssuesAuditing{}
 
-    @NotBlank(message = "页码不能为空",groups = MyPubIssuesAuditing.class)
+    @NotNull(message = "页码不能为空",groups = MyPubIssuesAuditing.class)
     private Integer pageNo;
 
-    @NotBlank(message = "每页数量不能为空",groups = MyPubIssuesAuditing.class)
+    @NotNull(message = "每页数量不能为空",groups = MyPubIssuesAuditing.class)
     private Integer pageSize;
 
     private String userId;

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -2,7 +2,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.MyPartIssuesFormDTO;
+import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
+import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
@@ -31,4 +33,14 @@ public interface GovIssueOpenFeignClient {
     @PostMapping("/gov/issue/issuevotestatistical/mypartissues")
     Result<List<MyPartIssuesResultDTO>> myPartIssues(@RequestBody MyPartIssuesFormDTO myPartIssuesFormDTO);
 
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param tokenDto
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    @PostMapping("/gov/issue/issue/mypubissuesauditing")
+    Result<List<MyPubIssuesAuditingResultDTO>> myPubIssuesAuditing(@RequestBody MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO);
+
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -4,7 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.MyPartIssuesFormDTO;
+import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
+import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -22,4 +24,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
     public Result<List<MyPartIssuesResultDTO>> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER,"myPartIssues",myPartIssuesFormDTO);
     }
+
+    @Override
+    public Result<List<MyPubIssuesAuditingResultDTO>> myPubIssuesAuditing(MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER,"myPubIssuesAuditing",myPubIssuesAuditingFormDTO);
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -1,6 +1,8 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -151,5 +153,17 @@ public class IssueController {
         return new Result<Integer>().ok(issueService.checkTopicShiftIssue(formDTO));
     }
 
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    @PostMapping("mypubissuesauditing")
+    public Result<List<MyPubIssuesAuditingResultDTO>> myPubIssuesAuditing(@RequestBody MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO){
+        return new Result<List<MyPubIssuesAuditingResultDTO>>().ok(issueService.myPubIssuesAuditing(myPubIssuesAuditingFormDTO));
+    }
+
+
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -144,4 +144,12 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author zxc
      */
     Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO);
+
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    List<MyPubIssuesAuditingResultDTO> myPubIssuesAuditing(@Param("userId")String userId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -2,7 +2,6 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.CloseIssueFormDTO;
 import com.epmet.dto.form.DepartmentStaffListFormDTO;
@@ -14,15 +13,10 @@ import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.CloseIssueFormDTO;
-import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.CommonIssueListFormDTO;
-import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.result.*;
 import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
 import com.epmet.entity.IssueEntity;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -232,4 +226,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @author zxc
      */
     Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO);
+
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    List<MyPubIssuesAuditingResultDTO> myPubIssuesAuditing(MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.IssueConstant;
+import com.epmet.constant.OrgInfoConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
@@ -34,21 +35,27 @@ import com.epmet.entity.IssueProjectRelationEntity;
 import com.epmet.feign.*;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
+import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
 import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueProcessService;
 import com.epmet.service.IssueProjectRelationService;
 import com.epmet.service.IssueService;
 import com.epmet.service.IssueVoteStatisticalService;
 import com.epmet.utils.ModuleConstants;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -78,6 +85,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 	private IssueProjectRelationDao issueProjectRelationDao;
 	@Autowired
     private IssueVoteDetailRedis issueVoteDetailRedis;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
 
     protected static final Logger logger = LoggerFactory.getLogger(IssueServiceImpl.class);
 
@@ -841,4 +852,30 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return baseDao.checkTopicShiftIssue(formDTO);
     }
 
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    @Override
+    public List<MyPubIssuesAuditingResultDTO> myPubIssuesAuditing(MyPubIssuesAuditingFormDTO form) {
+        List<MyPubIssuesAuditingResultDTO> list = new ArrayList<>();
+        PageInfo<MyPubIssuesAuditingResultDTO> result = PageHelper.startPage(form.getPageNo(),form.getPageSize()).doSelectPageInfo(() -> baseDao.myPubIssuesAuditing(form.getUserId()));
+        if (!CollectionUtils.isEmpty(result.getList())){
+            list = result.getList();
+            Result<List<OrgInfoResultDTO>> gridNameList = govOrgOpenFeignClient.selectOrgInfo(new OrgInfoFormDTO(OrgInfoConstant.GRID, list.stream().map(m -> m.getGridId()).collect(Collectors.toList())));
+            if (!gridNameList.success()){
+                throw new RenException("查询议题来源网格名称失败......");
+            }
+            list.forEach(l -> gridNameList.getData().stream().filter(o -> l.getGridId().equals(o.getOrgId())).forEach(o -> l.setTopicReleaseGridName(o.getOrgName())));
+            Result<List<GroupInfoResultDTO>> groupNameList = resiGroupOpenFeignClient.selectGroupInfo(new GroupInfoFormDTO(list.stream().map(m -> m.getTopicId()).collect(Collectors.toList())));
+            if (!groupNameList.success()){
+                throw new RenException("查询议题来源小组名称失败......");
+            }
+            list.forEach(l -> groupNameList.getData().stream().filter(g -> l.getTopicId().equals(g.getTopicId())).forEach(g -> l.setTopicReleaseGroupName(g.getTopicGroupName())));
+        }
+        return list;
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -378,4 +378,19 @@
             AND source_id = #{topicId}
     </select>
 
+    <!-- 个人中心-我发起的议题列表-表决中 -->
+    <select id="myPubIssuesAuditing" resultType="com.epmet.dto.result.MyPubIssuesAuditingResultDTO">
+        SELECT
+            i.ID AS issueId,
+            i.SUGGESTION,
+            i.ISSUE_TITLE,
+            i.SOURCE_ID AS topicId,
+            i.GRID_ID AS gridId,
+            UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime
+        FROM issue i
+        WHERE i.DEL_FLAG = '0'
+            AND i.ISSUE_STATUS = 'voting'
+            AND i.CREATED_BY = #{userId}
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgInfoFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,6 +11,7 @@ import java.util.List;
  * @DateTime 2020/11/10 2:13 下午
  */
 @Data
+@AllArgsConstructor
 public class OrgInfoFormDTO implements Serializable {
 
     private static final long serialVersionUID = 4480485864711053393L;
@@ -24,4 +26,6 @@ public class OrgInfoFormDTO implements Serializable {
      */
     private List<String> orgIds;
 
+    public OrgInfoFormDTO() {
+    }
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupInfoFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/11 1:30 下午
+ */
+@Data
+@AllArgsConstructor
+public class GroupInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7940077760343241658L;
+
+    private List<String> topicIds;
+
+    public GroupInfoFormDTO() {
+    }
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupInfoResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/11 1:31 下午
+ */
+@Data
+public class GroupInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5508197256307317314L;
+
+    private String topicId;
+
+    private String topicGroupName;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -1,6 +1,8 @@
 package com.epmet.resi.group.feign;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.commons.tools.utils.Result;
@@ -14,6 +16,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +40,15 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping(value = "/resi/group/comment/topictoissuelist")
     Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO);
 
+    /**
+     * @Description  查询话题所属小组名
+     * @Param groupInfoFormDTO
+     * @author zxc
+     * @date 2020/11/11 1:36 下午
+     */
+    @PostMapping("resi/group/group/groupinfo")
+    Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO);
+
 
 
     @PostMapping("/resi/group/group/gov-edit-auditing-list")

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -11,6 +11,8 @@ import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
@@ -46,4 +48,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result govAuditEdit(GroupEditionAuditFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govAuditEdit", param);
     }
+    @Override
+    public Result<List<GroupInfoResultDTO>> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectGroupInfo", groupInfoFormDTO);
+    }
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -422,4 +422,15 @@ public class ResiGroupController {
         return new Result();
     }
 
+
+    /**
+     * @Description  查询话题所属小组名
+     * @Param groupInfoFormDTO
+     * @author zxc
+     * @date 2020/11/11 1:36 下午
+     */
+    @PostMapping("groupinfo")
+    public Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO){
+        return new Result<List<GroupInfoResultDTO>>().ok(resiGroupService.selectGroupInfo(groupInfoFormDTO));
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@@ -202,4 +202,12 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	int countExistsGroupNameBeforeEdit(@Param("groupId") String groupId,
 									   @Param("gridId") String gridId,
 									   @Param("groupName") String groupName);
+
+	/**
+	 * @Description  查询话题所属小组名
+	 * @Param groupInfoFormDTO
+	 * @author zxc
+	 * @date 2020/11/11 1:36 下午
+	 */
+	List<GroupInfoResultDTO> selectGroupInfo(@Param("topicIds")List<String> userIds);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@@ -324,4 +324,12 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @date 2020.11.03 16:02
 	*/
 	void auditEdit(GroupEditionAuditFormDTO param);
+
+	/**
+	 * @Description  查询话题所属小组名
+	 * @Param groupInfoFormDTO
+	 * @author zxc
+	 * @date 2020/11/11 1:36 下午
+	 */
+	List<GroupInfoResultDTO> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -609,6 +609,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if(!epmetMessageFeignClient.saveUserMessage(userMessageFormDTO).success()){
 			logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName())));
 		}
+		//发送微信订阅消息
+		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
+		wxSubscribeMessageFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+		wxSubscribeMessageFormDTO.setUserId(resiGroupDTO.getCreatedBy());
+		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
+		wxSubscribeMessageFormDTO.setGridId(resiGroupDTO.getGridId());
+		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_CREATE_GROUP_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
+		wxSubscribeMessageFormDTO.setMessageTime(new Date());
+		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
+		msgList.add(wxSubscribeMessageFormDTO);
+		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
 		//更新政府端:工作-基层治理-党员认证reddot
 		resiGroupRedis.subtractWorkGrassrootsPartyAuthRedDotValue(resiGroupDTO.getGridId());
 		return new Result();
@@ -1040,6 +1052,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 	}
 
+	/**
+	 * @Description  查询话题所属小组名
+	 * @Param groupInfoFormDTO
+	 * @author zxc
+	 * @date 2020/11/11 1:36 下午
+	 */
+	@Override
+	public List<GroupInfoResultDTO> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) {
+		return baseDao.selectGroupInfo(groupInfoFormDTO.getTopicIds());
+	}
+
 	@Override
 	public GroupDetailResultDTO getGroupDetail(String groupId) {
 		GroupDetailResultDTO groupDetail = new GroupDetailResultDTO();

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -418,4 +418,20 @@
                    and esr.DEL_FLAG = 0
              ) t
     </select>
+
+    <!-- 查询话题所属小组名 -->
+    <select id="selectGroupInfo" resultType="com.epmet.resi.group.dto.group.result.GroupInfoResultDTO">
+        SELECT
+            rt.ID AS topicId,
+            rg.GROUP_NAME AS topicGroupName
+        FROM resi_topic rt
+        LEFT JOIN resi_group rg ON rg.ID = rt.GROUP_ID
+        WHERE rt.DEL_FLAG = '0'
+            AND rg.DEL_FLAG = '0'
+            AND
+            <foreach collection="topicIds" item="topicId" separator=" OR ">
+                rt.id = #{topicId}
+            </foreach>
+
+    </select>
 </mapper>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java

@@ -5,8 +5,10 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.MyPartProjectsResultDTO;
+import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import com.epmet.modules.person.service.IssueService;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,4 +54,17 @@ public class IssueController {
         return new Result<List<MyPartProjectsResultDTO>>().ok(issueService.myPartProjects(formDTO));
     }
 
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param tokenDto
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    @PostMapping("my-pub-issues/auditing")
+    public Result<List<MyPubIssuesAuditingResultDTO>> myPubIssuesAuditing(@LoginUser TokenDto tokenDto, @RequestBody MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO){
+        ValidatorUtils.validateEntity(myPubIssuesAuditingFormDTO, MyPubIssuesAuditingFormDTO.MyPubIssuesAuditing.class);
+        return new Result<List<MyPubIssuesAuditingResultDTO>>().ok(issueService.myPubIssuesAuditing(tokenDto,myPubIssuesAuditingFormDTO));
+    }
+
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/IssueService.java

@@ -1,8 +1,10 @@
 package com.epmet.modules.person.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.MyPartProjectsResultDTO;
+import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 
 import java.util.List;
@@ -26,4 +28,13 @@ public interface IssueService {
      * @author sun
      */
     List<MyPartProjectsResultDTO> myPartProjects(MyPartProjectsFormDTO formDTO);
+
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param tokenDto
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    List<MyPubIssuesAuditingResultDTO> myPubIssuesAuditing(TokenDto tokenDto, MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO);
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java

@@ -5,9 +5,11 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.MyPartIssuesFormDTO;
+import com.epmet.dto.form.MyPubIssuesAuditingFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.MyPartProjectsResultDTO;
+import com.epmet.dto.result.MyPubIssuesAuditingResultDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.GovProjectOpenFeignClient;
@@ -124,4 +126,21 @@ public class IssueServiceImpl implements IssueService {
 
         return resultList;
     }
+
+    /**
+     * @Description  个人中心-我发起的议题列表-表决中
+     * @Param tokenDto
+     * @Param myPubIssuesAuditingFormDTO
+     * @author zxc
+     * @date 2020/11/11 9:24 上午
+     */
+    @Override
+    public List<MyPubIssuesAuditingResultDTO> myPubIssuesAuditing(TokenDto tokenDto, MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO) {
+        myPubIssuesAuditingFormDTO.setUserId(tokenDto.getUserId());
+        Result<List<MyPubIssuesAuditingResultDTO>> listResult = issueOpenFeignClient.myPubIssuesAuditing(myPubIssuesAuditingFormDTO);
+        if (!listResult.success()){
+            throw new RenException("查询我发起的议题列表-表决中失败......");
+        }
+        return listResult.getData();
+    }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java

@@ -18,6 +18,8 @@ public class MyAdviceListResultDTO implements Serializable {
 
     private String adviceContent;
 
+    private String adviceType;
+
     private List<String> imgList;
 
     @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8")

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java

@@ -156,7 +156,7 @@ public class UserAdviceController {
 
     /**
      * @Description 居民端-我的建议列表
-     * @param map ->pageSize,pageNo
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyAdviceListResultDTO>>
      * @Author liushaowen
      * @Date 2020/11/9 17:35

epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml

@@ -46,6 +46,7 @@
     <resultMap id="myAdviceListResultMap" type="com.epmet.dto.result.MyAdviceListResultDTO">
         <id column="id"></id>
         <result property="adviceContent" column="ADVICE_CONTENT"/>
+        <result property="adviceType" column="ADVICE_TYPE"/>
         <result property="adviceTime" column="ADVICE_TIME"/>
         <result property="replyContent" column="REPLY_CONTENT"/>
         <result property="replyTime" column="REPLY_TIME"/>
@@ -53,7 +54,7 @@
     </resultMap>
 
     <select id="myAdviceList" resultMap="myAdviceListResultMap">
-        select id,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
+        select id,advice_type,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
         from user_advice
         where del_flag = 0 and user_id = #{userId}
         order by created_time desc