diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java new file mode 100644 index 0000000000..c2c5395932 --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/checkVoteFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/checkVoteFormDTO.java new file mode 100644 index 0000000000..f930a2e05e --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckVoteResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckVoteResultDTO.java new file mode 100644 index 0000000000..3266e5b63d --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridIdResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GridIdResultDTO.java new file mode 100644 index 0000000000..013ebc2aad --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProcessResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProcessResultDTO.java new file mode 100644 index 0000000000..568f88ecf9 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTO.java new file mode 100644 index 0000000000..05b17f9d57 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java index 3d4db2594e..99f4e6d1cd 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java +++ b/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 = ""; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 4996d5e69f..1d66cbf7d7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/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>().ok(issueService.closedList(issueListFormDTO)); } + + /** + * @Description 根据issueId查询gridId + * @param issueId + * @author zxc + */ + @PostMapping("selectgrididbyissueid") + public Result selectGridIdByIssueId(@RequestBody IssueIdFormDTO issueId){ + return new Result().ok(issueService.selectGridIdByIssueId(issueId)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java index bf6c57f863..86addc77a7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProcessController.java +++ b/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> processList(@RequestBody IssueIdFormDTO issueId){ + return new Result>().ok(issueProcessService.processList(issueId)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java index 2ad711fd01..d48ecb94cb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java +++ b/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 { **/ int insertOne(IssueProcessDTO issueProcessDTO); + + /** + * @Description 议题处理进展——已关闭 + * @param issueId + * @author zxc + */ + List issueProcess(IssueIdFormDTO issueId); + + IssueProcessResultDTO issueBeginInfo(IssueIdFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java index f6aa7956ee..d20d18f501 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java @@ -50,7 +50,7 @@ public interface IssueVoteStatisticalDao extends BaseDao getProcessorList(@PathVariable("agencyId") String agencyId); + + /** + * @Description 查询网格名 + * @param formDTO + * @author zxc + */ + @PostMapping(value = "/gov/org/customergrid/getgridnamebygridid") + Result getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java index abf27d9410..1ebc259209 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java +++ b/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 issueShiftProject(@RequestBody ShiftProjectFormDTO formDTO); + + /** + * @Description 议题处理进展——已转项目 + * @param formDTO + * @author zxc + */ + @PostMapping("/gov/project/projectprocess/projectprocesslist") + Result> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index 8b9d94fd3e..d216667d86 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/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 getProcessorList(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getProcessorList", agencyId); } + + @Override + public Result getGridNameByGridId(BelongGridNameFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java index 05102bb2ce..d147041562 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java +++ b/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> projectProcessList(ProcessProjectIdFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectProcessList", formDTO); + } + @Override public Result issueShiftProject(ShiftProjectFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "issueShiftProject", formDTO); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java index 7a0de275b2..73e54adaca 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProcessService.java +++ b/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 { */ void delete(String[] ids); + /** + * @Description 议题处理进展 + * @param issueId + * @author zxc + */ + List processList(IssueIdFormDTO issueId); + /** * @Description 议题流程新增记录 * @param issueProcessDTO diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 3f4ea086af..daa7c9d499 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/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 { + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-14 + */ + List list(Map 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 { **/ GovIssueDetailResultDTO issueDetailGov(IssueDetailFormDTO issueDetail); + /** + * @Description 根据issueId查询gridId + * @param issueId + * @author zxc + */ + GridIdResultDTO selectGridIdByIssueId(IssueIdFormDTO issueId); + /** * @param formDTO * @return diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index 99b507d9b6..20d678832e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/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 page(Map params) { @@ -113,4 +138,54 @@ public class IssueProcessServiceImpl extends BaseServiceImpl processList(IssueIdFormDTO issueId) { + List listResult = new ArrayList(); + IssueDTO issueDTO = issueService.get(issueId.getIssueId()); + String issueStatus = issueDTO.getIssueStatus(); + if (issueStatus.equals(IssueConstant.ISSUE_CLOSED)){//已关闭——处理进展 + List 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; + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 6e45ccf40a..6a0e3e296b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/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 imp @Autowired private IssueProjectRelationService issueProjectRelationService; + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IssueDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IssueDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper 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 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 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 5058c84832..5fa16e9c84 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/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 + + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index 5fe5c88507..3d35fea463 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -30,9 +30,9 @@ - SELECT - COUNT(*) AS voteStatus + attitude AS voteType FROM issue_vote_detail WHERE diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProcessProjectIdFormDTO.java new file mode 100644 index 0000000000..c2c5395932 --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectProcessListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectProcessListResultDTO.java new file mode 100644 index 0000000000..5c12be99ee --- /dev/null +++ b/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 + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.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 = ""; +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java index 116ad85e3a..f5958bd7fc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java +++ b/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> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO){ + return new Result>().ok(projectProcessService.projectProcessList(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java index 71f0b72b72..53583222b0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java +++ b/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 { List getProcessListByProjectId(@Param("projectId") String projectId); List selectReturnableList(@Param("projectId") String projectId); + + /** + * @Description 议题处理进展——已转项目 + * @param formDTO + * @author zxc + */ + List projectProcessList(ProcessProjectIdFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java index 751e31ba03..99a642f700 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java +++ b/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 **/ void transfer(TransferFormDTO formDTO); + /** + * @Description 议题处理进展——已转项目 + * @param formDTO + * @author zxc + */ + List projectProcessList(ProcessProjectIdFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index c8aafa9826..f26a6b84e4 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/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 projectProcessList(ProcessProjectIdFormDTO formDTO) { + return baseDao.projectProcessList(formDTO); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index d93c09e825..49024c5fe6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml @@ -30,4 +30,20 @@ ORDER BY CREATED_TIME DESC + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GridIdFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GridIdFormDTO.java new file mode 100644 index 0000000000..ab9536e8dc --- /dev/null +++ b/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; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CheckJoinTeamResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CheckJoinTeamResultDTO.java new file mode 100644 index 0000000000..732571d09d --- /dev/null +++ b/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; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 98eb905c13..da16e3fc25 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/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().ok(resultDTO2); } + + /** + * @Description 校验用户是否加入小组 + * @param gridId + * @author zxc + */ + @PostMapping("checkjointeam") + public Result checkjointeam(@RequestBody GridIdFormDTO gridId){ + return new Result().ok(resiGroupService.checkjointeam(gridId)); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 064f1731a4..38dc060246 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/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 { * @date 2020.05.14 10:54 **/ List getGroupIdByGridId(@Param("gridId") String gridId); + + /** + * @Description 校验用户是否加入小组 + * @param gridId + * @author zxc + */ + Integer checkjointeam(GridIdFormDTO gridId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 26b616a346..83a4a6e275 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/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 { * @date 2020.05.14 10:54 **/ List getGroupIdByGridId(String gridId); + + /** + * @Description 校验用户是否加入小组 + * @param gridId + * @author zxc + */ + CheckJoinTeamResultDTO checkjointeam(GridIdFormDTO gridId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 97c4b17d1a..b55ed95902 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/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 + + +