Browse Source

议题处理进展、表决中支持、反对数量修改

dev_shibei_match
zxc 6 years ago
parent
commit
7fef4da39f
  1. 20
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java
  2. 24
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/checkVoteFormDTO.java
  3. 24
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckVoteResultDTO.java
  4. 21
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridIdResultDTO.java
  5. 40
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProcessResultDTO.java
  6. 41
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java
  7. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
  8. 28
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
  9. 12
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java
  10. 15
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
  11. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
  12. 11
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  13. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
  14. 7
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
  15. 7
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
  16. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java
  17. 79
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
  18. 75
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
  19. 80
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  20. 5
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
  21. 34
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
  22. 4
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
  23. 20
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java
  24. 57
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectProcessListResultDTO.java
  25. 7
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java
  26. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java
  27. 14
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
  28. 15
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
  29. 16
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml
  30. 24
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GridIdFormDTO.java
  31. 20
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CheckJoinTeamResultDTO.java
  32. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  33. 7
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
  34. 8
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  35. 17
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  36. 12
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
  37. 24
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/CheckVoteFormDTO.java
  38. 24
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/GridIdFormDTO.java
  39. 20
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/CheckJoinTeamResultDTO.java
  40. 24
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/CheckVoteResultDTO.java
  41. 21
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/GridIdResultDTO.java
  42. 41
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java
  43. 31
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteInitResultDTO.java
  44. 10
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
  45. 16
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
  46. 16
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
  47. 11
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
  48. 10
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
  49. 7
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
  50. 9
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
  51. 33
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

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

@ -0,0 +1,20 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 处理进展已转项目
*/
@Data
public class ProcessProjectIdFormDTO implements Serializable {
private static final long serialVersionUID = 2185544562374036005L;
/**
* 项目Id
*/
private String projectId;
}

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

@ -0,0 +1,24 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 校验是否投票表决中
*/
@Data
public class checkVoteFormDTO implements Serializable {
private static final long serialVersionUID = -2170063271034172650L;
/**
* 用户id
*/
private String userId;
/**
* 议题id
*/
private String issueId;
}

24
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckVoteResultDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 校验是否投票表决中
*/
@Data
public class CheckVoteResultDTO implements Serializable {
private static final long serialVersionUID = 1908314603146050709L;
/**
* 是否投票 已投票true未投票false
*/
private Boolean voteStatus;
/**
* 支持support反对opposition
*/
private String voteType;
}

21
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridIdResultDTO.java

@ -0,0 +1,21 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 表决中议题详情支持反对数
*/
@Data
public class GridIdResultDTO implements Serializable {
private static final long serialVersionUID = 1968505337707779785L;
/**
* 网格ID
*/
private String gridId;
}

40
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProcessResultDTO.java

@ -0,0 +1,40 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 议题处理进展
*/
@Data
public class IssueProcessResultDTO implements Serializable {
private static final long serialVersionUID = 8437703271418235334L;
/**
* 处理进展名称(表决中转项目流转中已结案已关闭)
*/
private String processName;
/**
* 已转项目进展记录时间
*/
private Long processTime;
/**
* 进展说明
*/
private String progressDesc;
/**
* 进展id操作记录表id
*/
private String processId;
/**
* 网格Id
*/
private String gridId;
}

41
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java

@ -0,0 +1,41 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 议题处理进展
*/
@Data
public class ProcessListResultDTO implements Serializable {
private static final long serialVersionUID = -702803628652751983L;
/**
* 处理进展名称(表决中转项目流转中已结案已关闭)
*/
private String processName;
/**
* 已转项目进展记录时间
*/
private Long processTime;
/**
* 处理部门处理人所属的机关单位名称
*/
private String departmentName;
/**
* 进展说明
*/
private String progressDesc;
/**
* 进展id操作记录表id
*/
private String processId;
}

5
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java

@ -28,5 +28,10 @@ public class VoteResultDTO implements Serializable {
*/
private Integer oppositionCount;
/**
* 支持support 反对oppose
*/
private String voteType = "";
}

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

@ -1,24 +1,34 @@
package com.epmet.controller;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.CommonIssueListFormDTO;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.form.IssueDetailFormDTO;
import com.epmet.dto.result.ClosedIssueListResultDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.GridIdResultDTO;
import com.epmet.dto.form.ShiftProjectListFromDTO;
import com.epmet.dto.result.GridVotingIssueCountResultDTO;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.dto.result.IssueResultDTO;
import com.epmet.dto.result.VotingIssueListResultDTO;
import com.epmet.excel.IssueExcel;
import com.epmet.dto.result.ShiftProjectListResultDTO;
import com.epmet.service.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* @Description 居民端党群议事
@ -104,5 +114,15 @@ public class IssueController {
ValidatorUtils.validateEntity(issueListFormDTO);
return new Result<List<ClosedIssueListResultDTO>>().ok(issueService.closedList(issueListFormDTO));
}
/**
* @Description 根据issueId查询gridId
* @param issueId
* @author zxc
*/
@PostMapping("selectgrididbyissueid")
public Result<GridIdResultDTO> selectGridIdByIssueId(@RequestBody IssueIdFormDTO issueId){
return new Result<GridIdResultDTO>().ok(issueService.selectGridIdByIssueId(issueId));
}
}

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

@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.excel.IssueProcessExcel;
import com.epmet.service.IssueProcessService;
import org.springframework.beans.factory.annotation.Autowired;
@ -91,4 +93,14 @@ public class IssueProcessController {
ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class);
}
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
@PostMapping("processlist")
public Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId){
return new Result<List<ProcessListResultDTO>>().ok(issueProcessService.processList(issueId));
}
}

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

@ -18,9 +18,14 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.IssueProcessResultDTO;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.entity.IssueProcessEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 议题进展记录表
@ -39,4 +44,14 @@ public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
**/
int insertOne(IssueProcessDTO issueProcessDTO);
/**
* @Description 议题处理进展已关闭
* @param issueId
* @author zxc
*/
List<IssueProcessResultDTO> issueProcess(IssueIdFormDTO issueId);
IssueProcessResultDTO issueBeginInfo(IssueIdFormDTO formDTO);
}

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

@ -50,7 +50,7 @@ public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEnt
* @param userId
* @author zxc
*/
Integer checkVote(@Param("issueId")String issueId,@Param("userId")String userId);
String checkVote(@Param("issueId")String issueId,@Param("userId")String userId);
/**
* @Description 议题表决折线图

11
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@ -3,14 +3,17 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.BelongGridNameFormDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.AgencyGridResultDTO;
import com.epmet.dto.result.BelongGridNameResultDTO;
import com.epmet.dto.result.DepartmentStaffListResultDTO;
import com.epmet.dto.result.ProcessorListResultDTO;
import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @Description 调用gov-org服务
@ -45,4 +48,12 @@ public interface GovOrgFeignClient {
**/
@PostMapping(value = "/gov/org/customeragency/getprocessorlist/{agencyId}")
Result<ProcessorListResultDTO> getProcessorList(@PathVariable("agencyId") String agencyId);
/**
* @Description 查询网格名
* @param formDTO
* @author zxc
*/
@PostMapping(value = "/gov/org/customergrid/getgridnamebygridid")
Result<BelongGridNameResultDTO> getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO);
}

10
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java

@ -2,8 +2,10 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ProcessProjectIdFormDTO;
import com.epmet.dto.form.ShiftProjectFormDTO;
import com.epmet.dto.form.ShiftProjectsFromDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.dto.result.IssueProjectResultDTO;
import com.epmet.dto.result.ShiftProjectResultDTO;
import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
@ -38,4 +40,12 @@ public interface GovProjectFeignClient {
**/
@PostMapping("/gov/project/project/issueshiftproject")
Result<IssueProjectResultDTO> issueShiftProject(@RequestBody ShiftProjectFormDTO formDTO);
/**
* @Description 议题处理进展已转项目
* @param formDTO
* @author zxc
*/
@PostMapping("/gov/project/projectprocess/projectprocesslist")
Result<List<ProcessListResultDTO>> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO);
}

7
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@ -3,7 +3,9 @@ package com.epmet.feign.fallback;
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.BelongGridNameFormDTO;
import com.epmet.dto.result.AgencyGridResultDTO;
import com.epmet.dto.result.BelongGridNameResultDTO;
import com.epmet.dto.result.DepartmentStaffListResultDTO;
import com.epmet.dto.result.ProcessorListResultDTO;
import com.epmet.feign.GovOrgFeignClient;
@ -30,4 +32,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
public Result<ProcessorListResultDTO> getProcessorList(String agencyId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getProcessorList", agencyId);
}
@Override
public Result<BelongGridNameResultDTO> getGridNameByGridId(BelongGridNameFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO);
}
}

7
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java

@ -3,8 +3,10 @@ package com.epmet.feign.fallback;
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.ProcessProjectIdFormDTO;
import com.epmet.dto.form.ShiftProjectFormDTO;
import com.epmet.dto.form.ShiftProjectsFromDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.dto.result.IssueProjectResultDTO;
import com.epmet.dto.result.ShiftProjectResultDTO;
import com.epmet.feign.GovProjectFeignClient;
@ -24,6 +26,11 @@ public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProjectByIssue", fromDTO);
}
@Override
public Result<List<ProcessListResultDTO>> projectProcessList(ProcessProjectIdFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectProcessList", formDTO);
}
@Override
public Result<IssueProjectResultDTO> issueShiftProject(ShiftProjectFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "issueShiftProject", formDTO);

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

@ -20,7 +20,10 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.entity.IssueProcessEntity;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -93,6 +96,13 @@ public interface IssueProcessService extends BaseService<IssueProcessEntity> {
*/
void delete(String[] ids);
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
List<ProcessListResultDTO> processList(IssueIdFormDTO issueId);
/**
* @Description 议题流程新增记录
* @param issueProcessDTO

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

@ -1,6 +1,16 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.form.CloseIssueFormDTO;
import com.epmet.dto.form.DepartmentStaffListFormDTO;
import com.epmet.dto.form.IssueDetailFormDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.DepartmentStaffListResultDTO;
import com.epmet.dto.result.GridIdResultDTO;
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;
@ -10,8 +20,10 @@ import com.epmet.dto.form.IssueDetailFormDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.entity.IssueEntity;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
/**
* @Author zxc
@ -19,6 +31,66 @@ import java.util.List;
*/
public interface IssueService extends BaseService<IssueEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<IssueDTO>
* @author generator
* @date 2020-05-14
*/
PageData<IssueDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<IssueDTO>
* @author generator
* @date 2020-05-14
*/
List<IssueDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return IssueDTO
* @author generator
* @date 2020-05-14
*/
IssueDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-05-14
*/
void save(IssueDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-05-14
*/
void update(IssueDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-05-14
*/
void delete(String[] ids);
/**
* @Description 议题详情
* @param issueDetail
@ -94,6 +166,13 @@ public interface IssueService extends BaseService<IssueEntity> {
**/
GovIssueDetailResultDTO issueDetailGov(IssueDetailFormDTO issueDetail);
/**
* @Description 根据issueId查询gridId
* @param issueId
* @author zxc
*/
GridIdResultDTO selectGridIdByIssueId(IssueIdFormDTO issueId);
/**
* @param formDTO
* @return

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

@ -20,19 +20,34 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.constant.IssueConstant;
import com.epmet.dao.IssueProcessDao;
import com.epmet.dao.IssueProjectRelationDao;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.form.BelongGridNameFormDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.form.ProcessProjectIdFormDTO;
import com.epmet.dto.result.BelongGridNameResultDTO;
import com.epmet.dto.result.IssueProcessResultDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.entity.IssueProcessEntity;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.GovProjectFeignClient;
import com.epmet.redis.IssueProcessRedis;
import com.epmet.service.IssueProcessService;
import com.epmet.service.IssueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
@ -48,6 +63,16 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
@Autowired
private IssueProcessRedis issueProcessRedis;
@Autowired
private IssueService issueService;
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private GovProjectFeignClient govProjectFeignClient;
@Autowired
private IssueProjectRelationDao issueProjectRelationDao;
@Autowired
private IssueProcessDao issueProcessDao;
@Override
public PageData<IssueProcessDTO> page(Map<String, Object> params) {
@ -113,4 +138,54 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
return baseDao.insertOne(issueProcessDTO);
}
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
@Override
public List<ProcessListResultDTO> processList(IssueIdFormDTO issueId) {
List<ProcessListResultDTO> listResult = new ArrayList<ProcessListResultDTO>();
IssueDTO issueDTO = issueService.get(issueId.getIssueId());
String issueStatus = issueDTO.getIssueStatus();
if (issueStatus.equals(IssueConstant.ISSUE_CLOSED)){//已关闭——处理进展
List<IssueProcessResultDTO> issueProcessResultDTOS = baseDao.issueProcess(issueId);
if (issueProcessResultDTOS.size()!=NumConstant.ZERO){
String gridId = issueProcessResultDTOS.get(NumConstant.ZERO).getGridId();
BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO();
formDTO.setGridId(gridId);
//处理部门(处理人所属的机关单位名称) eg:阜新路社区——第一网格
BelongGridNameResultDTO data = govOrgFeignClient.getGridNameByGridId(formDTO).getData();
BeanUtils.copyProperties(issueProcessResultDTOS,listResult);
for (IssueProcessResultDTO issueProcessResultDTO : issueProcessResultDTOS) {
ProcessListResultDTO process = new ProcessListResultDTO();
BeanUtils.copyProperties(issueProcessResultDTO,process);
process.setDepartmentName(data.getBelongsGridName());
listResult.add(process);
}
}
}else if (issueStatus.equals(IssueConstant.ISSUE_SHIFT_PROJECT)){//已转项目——处理进展
String projectId = issueProjectRelationDao.selectProjectIdByIssueId(issueId.getIssueId());
if (!StringUtils.isBlank(projectId)) {
ProcessProjectIdFormDTO formDTO = new ProcessProjectIdFormDTO();
formDTO.setProjectId(projectId);
listResult = govProjectFeignClient.projectProcessList(formDTO).getData();
//转议题时间
IssueProcessResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId);
String gridId = issueProcessResultDTO.getGridId();
BelongGridNameFormDTO gridName = new BelongGridNameFormDTO();
gridName.setGridId(gridId);
//处理部门(处理人所属的机关单位名称) eg:阜新路社区——第一网格
BelongGridNameResultDTO data = govOrgFeignClient.getGridNameByGridId(gridName).getData();
ProcessListResultDTO process = new ProcessListResultDTO();
BeanUtils.copyProperties(issueProcessResultDTO,process);
process.setDepartmentName(data.getBelongsGridName());
listResult.add(process);
}
}else {
return new ArrayList<>();
}
return listResult;
}
}

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

@ -1,16 +1,19 @@
package com.epmet.service.impl;
import com.alibaba.nacos.client.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.IssueConstant;
import com.epmet.constant.ReadFlagConstant;
import com.epmet.constant.UserMessageConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dao.IssueDao;
import com.epmet.dao.IssueProjectRelationDao;
import com.epmet.dto.IssueDTO;
@ -18,14 +21,12 @@ import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.IssueVoteStatisticalDTO;
import com.epmet.dto.form.CommonIssueListFormDTO;
import com.epmet.dao.IssueProcessDao;
import com.epmet.dto.ProjectDTO;
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.IssueDetailFormDTO;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.entity.IssueEntity;
import com.epmet.entity.IssueProcessEntity;
@ -43,20 +44,17 @@ import com.epmet.service.IssueProjectRelationService;
import com.epmet.service.IssueService;
import com.epmet.service.IssueVoteStatisticalService;
import com.epmet.utils.ModuleConstants;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @Author zxc
@ -91,6 +89,57 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
@Autowired
private IssueProjectRelationService issueProjectRelationService;
@Override
public PageData<IssueDTO> page(Map<String, Object> params) {
IPage<IssueEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, IssueDTO.class);
}
@Override
public List<IssueDTO> list(Map<String, Object> params) {
List<IssueEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, IssueDTO.class);
}
private QueryWrapper<IssueEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<IssueEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public IssueDTO get(String id) {
IssueEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, IssueDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(IssueDTO dto) {
IssueEntity entity = ConvertUtils.sourceToTarget(dto, IssueEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(IssueDTO dto) {
IssueEntity entity = ConvertUtils.sourceToTarget(dto, IssueEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @param issueDetail
* @Description 议题详情
@ -169,6 +218,19 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
}
/**
* @Description 根据issueId查询gridId
* @param issueId
* @author zxc
*/
@Override
public GridIdResultDTO selectGridIdByIssueId(IssueIdFormDTO issueId) {
GridIdResultDTO gridIdResult = new GridIdResultDTO();
IssueDTO issueDTO = get(issueId.getIssueId());
gridIdResult.setGridId(issueDTO.getGridId());
return gridIdResult;
}
/**
* @Description 关闭议题议题转项目时给话题创建人和议题发起人发送消息
* @author sun

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

@ -132,12 +132,13 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
public VoteResultDTO voteCount(TokenDto tokenDto,IssueIdFormDTO issueId) {
VoteResultDTO voteResultDTO = issueVoteStatisticalDao.voteCount(issueId);
//校验是否已经投票
Integer voteStatus = issueVoteStatisticalDao.checkVote(issueId.getIssueId(), tokenDto.getUserId());
String voteStatus = issueVoteStatisticalDao.checkVote(issueId.getIssueId(), tokenDto.getUserId());
if (voteResultDTO!=null){
if (voteStatus==0){
if (StringUtils.isBlank(voteStatus)){
voteResultDTO.setVoteFlag(false);
}else {
voteResultDTO.setVoteFlag(true);
voteResultDTO.setVoteType(voteStatus);
}
}
return voteResultDTO;

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

@ -98,5 +98,39 @@
0
</trim>
</insert>
<!-- 议题处理进展——已关闭 -->
<select id="issueProcess" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.IssueProcessResultDTO">
SELECT
CASE
WHEN issue_status = 'voting' THEN "转议题"
WHEN issue_status = 'closed' THEN "已关闭"
WHEN issue_status = 'shift_project' THEN "已转项目"
END AS processName,
UNIX_TIMESTAMP( created_time ) AS processTime,
operation_explain AS progressDesc,
id AS processId,
org_id AS gridId
FROM
issue_process
WHERE
issue_id = #{issueId}
AND del_flag = 0
ORDER BY created_time DESC
</select>
<select id="issueBeginInfo" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.IssueProcessResultDTO">
SELECT
'转议题' AS processName,
UNIX_TIMESTAMP( created_time ) AS processTime,
operation_explain AS progressDesc,
id AS processId,
org_id AS gridId
FROM
issue_process
WHERE
issue_id = #{issueId}
AND issue_status = 'voting'
AND del_flag = 0
</select>
</mapper>

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

@ -30,9 +30,9 @@
</select>
<!-- 校验是否投票(表决中详情——支持、反对) -->
<select id="checkVote" resultType="integer">
<select id="checkVote" resultType="java.lang.String">
SELECT
COUNT(*) AS voteStatus
attitude AS voteType
FROM
issue_vote_detail
WHERE

20
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 处理进展已转项目
*/
@Data
public class ProcessProjectIdFormDTO implements Serializable {
private static final long serialVersionUID = 2185544562374036005L;
/**
* 项目Id
*/
private String projectId;
}

57
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectProcessListResultDTO.java

@ -0,0 +1,57 @@
/**
* 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.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 项目跟踪-项目处理进展列表-接口返参
*/
@Data
public class ProjectProcessListResultDTO implements Serializable {
private static final long serialVersionUID = 5342591979112900804L;
/**
* 项目处理进展Id
*/
private String processId = "";
/**
* 处理进展名称
*/
private String processName = "";
/**
* 处理进展时间
*/
private Long processTime;
/**
* 处理部门
*/
private String departmentName = "";
/**
* 进展说明
*/
private String progressDesc = "";
}

7
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java

@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.ProjectProcessDTO;
import com.epmet.dto.form.ProcessProjectIdFormDTO;
import com.epmet.dto.result.ProjectProcessListResultDTO;
import com.epmet.excel.ProjectProcessExcel;
import com.epmet.service.ProjectProcessService;
import org.springframework.beans.factory.annotation.Autowired;
@ -91,4 +93,9 @@ public class ProjectProcessController {
ExcelUtils.exportExcelToTarget(response, null, list, ProjectProcessExcel.class);
}
@PostMapping("projectprocesslist")
public Result<List<ProjectProcessListResultDTO>> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO){
return new Result<List<ProjectProcessListResultDTO>>().ok(projectProcessService.projectProcessList(formDTO));
}
}

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java

@ -18,7 +18,9 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.ProcessProjectIdFormDTO;
import com.epmet.dto.result.ProcesslistResultDTO;
import com.epmet.dto.result.ProjectProcessListResultDTO;
import com.epmet.entity.ProjectProcessEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -43,4 +45,11 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
List<ProcesslistResultDTO> getProcessListByProjectId(@Param("projectId") String projectId);
List<ProjectProcessEntity> selectReturnableList(@Param("projectId") String projectId);
/**
* @Description 议题处理进展已转项目
* @param formDTO
* @author zxc
*/
List<ProjectProcessListResultDTO> projectProcessList(ProcessProjectIdFormDTO formDTO);
}

14
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java

@ -21,14 +21,13 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dto.ProjectProcessDTO;
import com.epmet.dto.form.ProcessListFormDTO;
import com.epmet.dto.form.ProjectDetailFromDTO;
import com.epmet.dto.form.ReturnListFromDTO;
import com.epmet.dto.form.TransferFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.DepartmentResultDTO;
import com.epmet.dto.result.ProcesslistResultDTO;
import com.epmet.dto.result.ProjectProcessListResultDTO;
import com.epmet.dto.result.ReturnListResultDTO;
import com.epmet.entity.ProjectProcessEntity;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -126,4 +125,11 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
**/
void transfer(TransferFormDTO formDTO);
/**
* @Description 议题处理进展已转项目
* @param formDTO
* @author zxc
*/
List<ProjectProcessListResultDTO> projectProcessList(ProcessProjectIdFormDTO formDTO);
}

15
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@ -32,10 +32,7 @@ import com.epmet.dao.ProjectStaffDao;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.ProjectProcessDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.AgencyDeptGridResultDTO;
import com.epmet.dto.result.ProcesslistResultDTO;
import com.epmet.dto.result.ReturnListResultDTO;
import com.epmet.dto.result.StaffInfoResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.ProjectEntity;
import com.epmet.entity.ProjectProcessEntity;
import com.epmet.entity.ProjectStaffEntity;
@ -244,4 +241,14 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
projectStaffService.insertBatch(entityList);
}
/**
* @Description 议题处理进展已转项目
* @param formDTO
* @author zxc
*/
@Override
public List<ProjectProcessListResultDTO> projectProcessList(ProcessProjectIdFormDTO formDTO) {
return baseDao.projectProcessList(formDTO);
}
}

16
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml

@ -30,4 +30,20 @@
ORDER BY CREATED_TIME DESC
</select>
<!-- 议题处理进展——已转项目 -->
<select id="projectProcessList" parameterType="com.epmet.dto.form.ProcessProjectIdFormDTO" resultType="com.epmet.dto.result.ProjectProcessListResultDTO">
SELECT
operation_name AS processName,
UNIX_TIMESTAMP( created_time ) AS processTime,
department_name AS departmentName,
public_reply AS progressDesc,
id AS processId
FROM
project_process
WHERE
project_id = #{projectId}
AND del_flag = 0
ORDER BY created_time DESC
</select>
</mapper>

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

@ -0,0 +1,24 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 查询某用户是否加入过小组
*/
@Data
public class GridIdFormDTO implements Serializable {
private static final long serialVersionUID = -8535773441961516653L;
/**
* 用户id
*/
private String userId;
/**
* 网格Id
*/
private String gridId;
}

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

@ -0,0 +1,20 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 校验用户是否加入小组
*/
@Data
public class CheckJoinTeamResultDTO implements Serializable {
private static final long serialVersionUID = -1590972041272087570L;
/**
* 是否加入小组 eg:已加入true未加入false
*/
private Boolean voteAuthorization;
}

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

@ -311,4 +311,14 @@ public class ResiGroupController {
resultDTO2.setResultName("group返参");
return new Result<TestResultDTO2>().ok(resultDTO2);
}
/**
* @Description 校验用户是否加入小组
* @param gridId
* @author zxc
*/
@PostMapping("checkjointeam")
public Result<CheckJoinTeamResultDTO> checkjointeam(@RequestBody GridIdFormDTO gridId){
return new Result<CheckJoinTeamResultDTO>().ok(resiGroupService.checkjointeam(gridId));
}
}

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

@ -148,4 +148,11 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
* @date 2020.05.14 10:54
**/
List<String> getGroupIdByGridId(@Param("gridId") String gridId);
/**
* @Description 校验用户是否加入小组
* @param gridId
* @author zxc
*/
Integer checkjointeam(GridIdFormDTO gridId);
}

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

@ -27,6 +27,7 @@ import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO;
import com.epmet.resi.group.dto.group.ResiGroupDTO;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.*;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -260,4 +261,11 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
* @date 2020.05.14 10:54
**/
List<String> getGroupIdByGridId(String gridId);
/**
* @Description 校验用户是否加入小组
* @param gridId
* @author zxc
*/
CheckJoinTeamResultDTO checkjointeam(GridIdFormDTO gridId);
}

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

@ -815,6 +815,23 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
return baseDao.getGroupIdByGridId(gridId);
}
/**
* @Description 校验用户是否加入小组
* @param gridId
* @author zxc
*/
@Override
public CheckJoinTeamResultDTO checkjointeam(GridIdFormDTO gridId) {
CheckJoinTeamResultDTO checkJoinTeamResultDTO = new CheckJoinTeamResultDTO();
Integer joinTeamCounts = baseDao.checkjointeam(gridId);
if (joinTeamCounts==NumConstant.ZERO){//未加入任何小组(当前网格下)
checkJoinTeamResultDTO.setVoteAuthorization(false);
}else {
checkJoinTeamResultDTO.setVoteAuthorization(true);
}
return checkJoinTeamResultDTO;
}
/**
* @Description 给加入此网格的网格长发送消息
* @param msg

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

@ -278,6 +278,18 @@
AND oper.STATE IN ('under_auditting','approved','rejected')
</select>
<!-- 校验用户是否加入小组 -->
<select id="checkjointeam" parameterType="com.epmet.resi.group.dto.group.form.GridIdFormDTO" resultType="integer">
SELECT
COUNT(*) AS joinTeamCounts
FROM
resi_group_member joinTeamCounts
WHERE
del_flag = 0
AND resi_group_id = ALL ( SELECT id FROM resi_group WHERE del_flag = 0 AND grid_id = #{gridId} )
AND customer_user_id = #{userId}
</select>
<!-- 查询一个网格下面所有组Id -->
<select id="getGroupIdByGridId" resultType="java.lang.String">
SELECT

24
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/CheckVoteFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 查询某用户是否加入过小组
*/
@Data
public class CheckVoteFormDTO implements Serializable {
private static final long serialVersionUID = 3459720938248756634L;
/**
* 用户id
*/
private String userId;
/**
* 议题id
*/
private String issueId;
}

24
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/GridIdFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 查询某用户是否加入过小组
*/
@Data
public class GridIdFormDTO implements Serializable {
private static final long serialVersionUID = -8535773441961516653L;
/**
* 用户id
*/
private String userId;
/**
* 网格Id
*/
private String gridId;
}

20
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/CheckJoinTeamResultDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 校验用户是否加入小组
*/
@Data
public class CheckJoinTeamResultDTO implements Serializable {
private static final long serialVersionUID = -1590972041272087570L;
/**
* 是否加入小组 eg:已加入true未加入false
*/
private Boolean voteAuthorization;
}

24
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/CheckVoteResultDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 校验是否投票表决中
*/
@Data
public class CheckVoteResultDTO implements Serializable {
private static final long serialVersionUID = 1908314603146050709L;
/**
* 是否投票 已投票true未投票false
*/
private Boolean voteStatus;
/**
* 支持support反对opposition
*/
private String voteType;
}

21
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/GridIdResultDTO.java

@ -0,0 +1,21 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 表决中议题详情支持反对数
*/
@Data
public class GridIdResultDTO implements Serializable {
private static final long serialVersionUID = 1968505337707779785L;
/**
* 网格ID
*/
private String gridId;
}

41
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java

@ -0,0 +1,41 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 议题处理进展
*/
@Data
public class ProcessListResultDTO implements Serializable {
private static final long serialVersionUID = -702803628652751983L;
/**
* 处理进展名称(表决中转项目流转中已结案已关闭)
*/
private String processName;
/**
* 已转项目进展记录时间
*/
private Long processTime;
/**
* 处理部门处理人所属的机关单位名称
*/
private String departmentName;
/**
* 进展说明
*/
private String progressDesc;
/**
* 进展id操作记录表id
*/
private String processId;
}

31
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteInitResultDTO.java

@ -0,0 +1,31 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* 表决中投票初始化
*/
@Data
public class VoteInitResultDTO implements Serializable {
private static final long serialVersionUID = -1564601349406249302L;
/**
* 是否加入小组 已加入true未加入false
*/
private Boolean voteAuthorization;
/**
* 是否投票 已投票true未投票false
*/
private Boolean voteStatus;
/**
* 支持support反对opposition
*/
private String voteType;
}

10
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java

@ -28,5 +28,15 @@ public class VoteResultDTO implements Serializable {
*/
private Integer oppositionCount;
/**
* 是否加入小组 已加入true未加入false
*/
private Boolean voteAuthorization;
/**
* 支持support 反对oppose
*/
private String voteType = "";
}

16
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@ -86,9 +86,9 @@ public class IssueController {
* @author zxc
*/
@PostMapping(value = "vote")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<VoteResultDTO> vote(@RequestBody IssueIdFormDTO formDTO){
return new Result<VoteResultDTO>().ok(issueService.vote(formDTO));
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<VoteResultDTO> vote(@LoginUser TokenDto tokenDto,@RequestBody IssueIdFormDTO formDTO){
return new Result<VoteResultDTO>().ok(issueService.vote(tokenDto,formDTO));
}
/**
@ -198,5 +198,15 @@ public class IssueController {
return govIssueFeignClient.closedList(issueListFormDTO);
}
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
@PostMapping("processlist")
public Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId){
return new Result<List<ProcessListResultDTO>>().ok(issueService.processList(issueId));
}
}

16
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@ -105,4 +105,20 @@ public interface GovIssueFeignClient {
**/
@PostMapping("/gov/issue/issue/closedlist")
Result<List<ClosedIssueListResultDTO>> closedList(@RequestBody CommonIssueListFormDTO issueListFormDTO);
/**
* @Description 根据issueId查询gridId
* @param issueId
* @author zxc
*/
@PostMapping("/gov/issue/issue/selectgrididbyissueid")
Result<GridIdResultDTO> selectGridIdByIssueId(@RequestBody IssueIdFormDTO issueId);
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
@PostMapping("/gov/issue/issueprocess/processlist")
Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId);
}

11
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@ -3,10 +3,13 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.TopicInfoDTO;
import com.epmet.dto.form.GridIdFormDTO;
import com.epmet.dto.form.TopicInfoFormDTO;
import com.epmet.dto.result.CheckJoinTeamResultDTO;
import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @author zxc
@ -24,5 +27,13 @@ public interface ResiGroupFeignClient {
@PostMapping("/resi/group/topic/selectdetail")
Result<TopicInfoDTO> selectDetail(TopicInfoFormDTO formDTO);
/**
* @Description 校验用户是否加入小组
* @param gridId
* @author zxc
*/
@PostMapping("/resi/group/group/checkjointeam")
Result<CheckJoinTeamResultDTO> checkjointeam(@RequestBody GridIdFormDTO gridId);
}

10
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java

@ -66,4 +66,14 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
public Result<List<ClosedIssueListResultDTO>> closedList(CommonIssueListFormDTO issueListFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "closedList", issueListFormDTO);
}
@Override
public Result<GridIdResultDTO> selectGridIdByIssueId(IssueIdFormDTO issueId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "selectGridIdByIssueId", issueId);
}
@Override
public Result<List<ProcessListResultDTO>> processList(IssueIdFormDTO issueId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", issueId);
}
}

7
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.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.TopicInfoDTO;
import com.epmet.dto.form.GridIdFormDTO;
import com.epmet.dto.form.TopicInfoFormDTO;
import com.epmet.dto.result.CheckJoinTeamResultDTO;
import com.epmet.feign.ResiGroupFeignClient;
import org.springframework.stereotype.Component;
@ -18,4 +20,9 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
public Result<TopicInfoDTO> selectDetail(TopicInfoFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectDetail", formDTO);
}
@Override
public Result<CheckJoinTeamResultDTO> checkjointeam(GridIdFormDTO gridId) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "checkjointeam", gridId);
}
}

9
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java

@ -49,7 +49,7 @@ public interface IssueService {
* @param issueId
* @author zxc
*/
VoteResultDTO vote(IssueIdFormDTO issueId);
VoteResultDTO vote(TokenDto tokenDto,IssueIdFormDTO issueId);
/**
* @Description 满意度评价初始化已关闭
@ -95,6 +95,13 @@ public interface IssueService {
*/
List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
List<ProcessListResultDTO> processList(IssueIdFormDTO issueId);
/**
* 已转项目列表
* @author zhaoqifeng

33
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@ -136,9 +136,24 @@ public class IssueServiceImpl implements IssueService {
* @author zxc
*/
@Override
public VoteResultDTO vote(IssueIdFormDTO issueId) {
Result<VoteResultDTO> voteResultDTOResult = govIssueFeignClient.voteCount(issueId);
return voteResultDTOResult.getData();
public VoteResultDTO vote(TokenDto tokenDto,IssueIdFormDTO issueId) {
VoteResultDTO voteResultDTOResult = new VoteResultDTO();
GridIdResultDTO gridId = govIssueFeignClient.selectGridIdByIssueId(issueId).getData();
GridIdFormDTO gridIdFormDTO = new GridIdFormDTO();
gridIdFormDTO.setGridId(gridId.getGridId());
gridIdFormDTO.setUserId(tokenDto.getUserId());
CheckJoinTeamResultDTO check = resiGroupFeignClient.checkjointeam(gridIdFormDTO).getData();
//未加入小组
if (check.getVoteAuthorization()==false){
voteResultDTOResult.setVoteFlag(false);
voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
voteResultDTOResult.setSupportCount(NumConstant.ZERO);
}else {
voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
voteResultDTOResult = govIssueFeignClient.voteCount(issueId).getData();
}
return voteResultDTOResult;
}
/**
@ -157,9 +172,9 @@ public class IssueServiceImpl implements IssueService {
}
/**
* @Description 满意度评价初始化已转项目
* @param tokenDto
* @param projectId
* @Description 满意度评价初始化已转项目
* @author zxc
*/
@Override
@ -260,4 +275,14 @@ public class IssueServiceImpl implements IssueService {
}
return resultList;
}
/**
* @Description 议题处理进展
* @param issueId
* @author zxc
*/
@Override
public List<ProcessListResultDTO> processList(IssueIdFormDTO issueId) {
return govIssueFeignClient.processList(issueId).getData();
}
}

Loading…
Cancel
Save