diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java new file mode 100644 index 000000000..a40c7642e --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.feign.fallback.GroupFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * + * 友邻社群模块调用 + * + * @Author：liuchuang + * @Date：2019/11/20 23:41 + */ +@FeignClient(name = ServiceConstant.EPDC_GROUP_SERVER, fallback = GroupFeignClientFallback.class) +public interface GroupFeignClient { + + /** + * + * 创建网格党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 0:01 + */ + @PostMapping(value = "group/epdc-app/group/createParty", consumes = MediaType.APPLICATION_JSON_VALUE) + Result createPartyGroup(CompleteDeptDTO formDto); +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java new file mode 100644 index 000000000..fe8696ae6 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java @@ -0,0 +1,21 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.feign.GroupFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/11/20 23:41 + */ +@Component +public class GroupFeignClientFallback implements GroupFeignClient { + + @Override + public Result createPartyGroup(CompleteDeptDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "createPartyGroup", formDto); + } +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 5234ad883..8d62456c8 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -26,6 +27,7 @@ import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.SysSimpleDeptDTO; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.entity.SysDeptEntity; +import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; import lombok.extern.slf4j.Slf4j; @@ -51,6 +53,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) { //普通管理员，只能查询所属部门及子部门的数据 @@ -103,6 +108,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl completeDeptDtoResult = this.getCompleteDept(entity.getId().toString()); + groupFeignClient.createPartyGroup(completeDeptDtoResult.getData()); + } } @Override diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java index 8032d27a2..88cde28c8 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java @@ -14,6 +14,7 @@ import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.log.SysLogLogin; @@ -142,6 +143,9 @@ public class AuthServiceImpl implements AuthService { Result result = userFeignClient.getByUsername(username); UserDetail user = result.getData(); + //授权信息 + WorkUserAuthorizationDTO authorization = new WorkUserAuthorizationDTO(); + //登录日志 SysLogLogin log = new SysLogLogin(); log.setType(LogTypeEnum.LOGIN.value()); @@ -156,8 +160,8 @@ public class AuthServiceImpl implements AuthService { log.setStatus(LoginStatusEnum.FAIL.value()); log.setCreatorName(username); logProducer.saveLog(log); - - return new Result().error("账号不存在"); + authorization.setRegisterState(NumConstant.ZERO_STR); + return new Result().ok(authorization); } //密码错误 @@ -176,7 +180,6 @@ public class AuthServiceImpl implements AuthService { log.setCreator(user.getId()); log.setCreatorName(user.getUsername()); logProducer.saveLog(log); - return new Result().error("账号已停用"); } @@ -186,8 +189,6 @@ public class AuthServiceImpl implements AuthService { //登录成功，生成token String token = jwtUtils.generateToken(user.getId()); - //授权信息 - WorkUserAuthorizationDTO authorization = new WorkUserAuthorizationDTO(); authorization.setToken(token); authorization.setExpire(jwtProperties.getExpire()); @@ -203,6 +204,7 @@ public class AuthServiceImpl implements AuthService { authorization.setDeptName(user.getDeptName()); authorization.setUserTagKey(user.getTypeKey()); + authorization.setRegisterState(NumConstant.ONE_STR); return new Result().ok(authorization); } diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java index 17c83983a..afee518ad 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java @@ -36,6 +36,11 @@ public class WorkUserAuthorizationDTO implements Serializable { */ private String userTagKey; + /** + * 注册状态 0-未注册，1-已注册 + */ + private String registerState; + /** * 用户所有角色权限信息 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java new file mode 100644 index 000000000..b209235e8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/async/GroupTask.java @@ -0,0 +1,50 @@ +package com.elink.esua.epdc.async; + +import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; +import com.elink.esua.epdc.feign.GroupFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +/** + * + * 友邻社群模块 + * + * @Author：liuchuang + * @Date：2019/11/21 10:19 + */ +@Component +public class GroupTask { + + @Autowired + private GroupFeignClient groupFeignClient; + + /** + * + * 加入网格党员群 + * + * @params [] + * @return void + * @author liuchuang + * @since 2019/11/21 10:21 + */ + @Async + public void joinGridPartyGroup(GroupUserFormDTO formDto) { + groupFeignClient.joinGridPartyGroup(formDto); + } + + /** + * + * 更新社群用户党员标识并加入关联的所有网格党员群 + * + * @params [formDto] + * @return void + * @author liuchuang + * @since 2019/11/21 11:12 + */ + @Async + public void updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { + groupFeignClient.updateUserPartyMember(formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java index b79f9e3a6..508a64951 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java @@ -195,7 +195,7 @@ public interface GroupFeignClient { /** * - * 更新社群用户党员标识 + * 更新社群用户党员标识并加入关联的所有网格党员群 * * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -204,4 +204,16 @@ public interface GroupFeignClient { */ @PostMapping(value = "group/epdc-app/usergroup/partyMember", consumes = MediaType.APPLICATION_JSON_VALUE) Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto); + + /** + * + * 用户加入党员群 + * + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/11/21 10:35 + */ + @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE) + Result joinGridPartyGroup(GroupUserFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java index 42754e74d..364fdab45 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/GroupFeignClientFallback.java @@ -94,4 +94,9 @@ public class GroupFeignClientFallback implements GroupFeignClient { public Result updateUserPartyMember(GroupUserPartyMemberFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "updateUserPartyMember", formDto); } + + @Override + public Result joinGridPartyGroup(GroupUserFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "joinGridPartyGroup", formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 0b2f1c825..7cee16d4c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; +import com.elink.esua.epdc.async.GroupTask; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.commons.tools.constant.NumConstant; @@ -11,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; @@ -20,6 +22,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.group.form.GroupAddUserFormDTO; +import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; @@ -83,7 +87,7 @@ public class AppUserServiceImpl implements AppUserService { private RedisUtils redisUtils; @Autowired - private GroupFeignClient groupFeignClient; + private GroupTask groupTask; private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png"; @@ -218,6 +222,9 @@ public class AppUserServiceImpl implements AppUserService { EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); + // 网格长加入网格党员群并设置为群主 + this.joinGridPartyGroup(newAppUser, NumConstant.ONE_STR); + return new Result().ok(authorization); } @@ -626,6 +633,10 @@ public class AppUserServiceImpl implements AppUserService { } userResult = registerBindGridResultDto.getData(); registeredUser = userResult.getUserDTO(); + // 用户已认证为党员，绑定网格时加入该网格党员群 + if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) { + this.joinGridPartyGroup(registeredUser, NumConstant.ZERO_STR); + } } // 已注册已绑定当前网格 @@ -710,11 +721,19 @@ public class AppUserServiceImpl implements AppUserService { tokenDto.setPartyFlag(user.getPartyFlag()); EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState()); - // 更新社群用户党员标识 - GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); - formDto.setUserId(user.getId()); - formDto.setPartyMember(user.getPartyFlag()); - groupFeignClient.updateUserPartyMember(formDto); + // 更新社群用户党员标识并加入关联的所有网格党员群 + if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { + GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); + formDto.setUserId(user.getId()); + formDto.setPartyMember(user.getPartyFlag()); + formDto.setNickname(user.getNickname()); + formDto.setUserAvatar(user.getFaceImg()); + formDto.setMobile(user.getMobile()); + formDto.setDeptId(user.getGridId()); + formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); + + groupTask.updateUserPartyMember(formDto); + } return new Result().ok(authorizationDto); } @@ -847,4 +866,26 @@ public class AppUserServiceImpl implements AppUserService { } return null; } + + /** + * + * 用户加入网格党员群 + * + * @params [userDto, lordFlag] + * @return void + * @author liuchuang + * @since 2019/11/21 10:58 + */ + private void joinGridPartyGroup(UserDTO userDto, String lordFlag) { + GroupUserFormDTO formDto = new GroupUserFormDTO(); + formDto.setUserId(userDto.getId()); + formDto.setNickname(userDto.getNickname()); + formDto.setUserAvatar(userDto.getFaceImg()); + formDto.setMobile(userDto.getMobile()); + formDto.setPartyMember(userDto.getPartyFlag()); + formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); + formDto.setLordFlag(lordFlag); + formDto.setGridId(userDto.getGridId()); + groupTask.joinGridPartyGroup(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java index 40fe3c679..c7dfac26e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java @@ -53,6 +53,7 @@ public class GroupServiceImpl implements GroupService { formDto.setGrid(deptDTO.getGrid()); formDto.setGridId(deptDTO.getGridId()); formDto.setGroupCategory(NumConstant.ONE_STR); + formDto.setState(GroupStateEnum.GROUP_STATE_PENDING_REVIEW.getValue()); // 群主信息 GroupUserFormDTO groupUserFormDTO = new GroupUserFormDTO(); groupUserFormDTO.setUserId(userDetail.getUserId()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 435a0e02f..ecd615a05 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -63,7 +64,9 @@ public class WorkUserServiceImpl implements WorkUserService { } SysUserDTO userDto = sysUserDtoResult.getData(); if (null == userDto) { - return new Result().error("用户不存在"); + WorkUserAuthorizationDTO resultDto = new WorkUserAuthorizationDTO(); + resultDto.setRegisterState(NumConstant.ZERO_STR); + return new Result().ok(resultDto); } return resourceFeignClient.getToken(ConvertUtils.sourceToTarget(userDto, WorkUserTokenFormDTO.class)); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java new file mode 100644 index 000000000..659d762e2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * + * 议题处理进度（后台和工作端用） + * + * @Author：liuchuang + * @Date：2019/11/21 15:08 + */ +@Data +public class IssueProgressResultDTO implements Serializable { + private static final long serialVersionUID = 2739821096656995025L; + + /** + * 状态 + */ + private String state; + /** + * 时间 + */ + private String createdTime; + /** + * 意见 + */ + private String advice; + /** + * 操作人部门 + */ + private String handlerDept; + + /** + * 处理图片 + */ + private List images; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 91b48cd3e..375501dae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -158,4 +158,15 @@ public interface IssueDao extends BaseDao { * 工作端-议题详情 */ WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId); + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + List selectListIssueProgress(String issueId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 70508326c..7f3476dc4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -237,4 +237,15 @@ public interface IssueService extends BaseService { * 工作端-议题详情 */ WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId); + + /** + * + * 议题处理进度(后台/工作端用) + * + * @params [issueId] + * @return java.util.List + * @author liuchuang + * @since 2019/11/21 15:16 + */ + List listIssueProgress(String issueId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index b694223cb..cc2a9ea79 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -444,4 +444,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp public WorkIssueDetailResultDTO selectOneWorkIssueDetail(String issueId) { return baseDao.selectOneWorkIssueDetail(issueId); } + + @Override + public List listIssueProgress(String issueId) { + return baseDao.selectListIssueProgress(issueId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 5084007a9..e05b1a6ce 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -354,6 +354,31 @@ CREATED_TIME DESC + + + + + + + + + + + + + \ No newline at end of file