From 3254d0e03bf1da0f02eece9fb5727e40d0e22f56 Mon Sep 17 00:00:00 2001 From: efren <79289982@qq.com> Date: Fri, 11 Jul 2025 10:19:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feign=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=85=AC=E7=A7=81=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f446428..dedd212 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -101,6 +101,18 @@ spring: nodes: 10.0.0.125:6379 password: + +check: + porject: + name-value: 33333 + num-value: 33333 + length: 2000 + checkBoolen: false + tokentime: + timeLimit: 5000 + onof: 0 + checkprivateKey : MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAk7N3OeQS9WJa/v5dX/s9/DCKpJ8kOjR1Zrh1X+TF98udqGbGBWmiyVk2SqGPA4Q9kUCWw46CocjE047gx5AFrQIDAQABAkAIHG/stvCvlxImNLPOBI8X3VaPycmEhML5vCF9/aM9g1SuFa298Q5W8FqAmm8SE5lRpw2yyToWtLbufJtAa7wFAiEAxViJBkLU4wfPCwiPiAn17owXbocC9rj3fAzEH9DYDdcCIQC/mZp4ujO035Qqw2QQeFWpDc/vITx1OTWaxq6/LvvwGwIgXTZLSmzItw9aKOD7QotJ4UnES41zxetp4er5u/leA3MCIGcRw2ZEjII1b+hdOdweT75kfsId9/77apm7Xc/c/4yXAiEAnBrCiVXRNN+slO0MYaxynr4eIiPG/EjYBYxXlwBpeOc= + checkpublicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJOzdznkEvViWv7+XV/7PfwwiqSfJDo0dWa4dV/kxffLnahmxgVposlZNkqhjwOEPZFAlsOOgqHIxNOO4MeQBa0CAwEAAQ== # 天宫Eureka配置 eureka: client: From c07a5387c095a6bc284366408a197fac4cce313a Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Fri, 11 Jul 2025 14:09:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/OrgController.java | 58 ++++++ .../base/controller/UserController.java | 38 ++-- .../supplier/base/service/IOrgService.java | 70 +++++++ .../supplier/base/service/IUserService.java | 22 +++ .../base/service/impl/OrgServiceImpl.java | 183 ++++++++++++++++++ .../base/service/impl/UserService.java | 58 ------ .../base/service/impl/UserServiceImpl.java | 38 ++++ .../controller/CoscoAccessWorkController.java | 14 +- .../controller/CoscoMessageController.java | 2 +- .../CoscoSupplierBaseController.java | 26 ++- .../service/ICoscoAccessWorkService.java | 2 +- .../service/ICoscoSupplierBaseService.java | 2 +- .../CoscoAccessWorkCategoryServiceImpl.java | 15 +- .../impl/CoscoAccessWorkServiceImpl.java | 54 +++--- .../impl/CoscoSupplierBaseServiceImpl.java | 32 +-- .../impl/CoscoSupplierexitServiceImpl.java | 12 +- 16 files changed, 488 insertions(+), 138 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java new file mode 100644 index 0000000..fc20213 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java @@ -0,0 +1,58 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.controller; + +import com.chinaunicom.mall.ebtp.common.base.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/org") +public class OrgController { + + + @Autowired + private IOrgService orgService; + + @ApiOperation("查询组织信息（当前组织及下级组织列表）") + @GetMapping("/queryOrgWithChildren") + public BaseResponse> getOrgWithChildren(@ApiParam(value = "查询条件", required = false) @SpringQueryMap SysOrg sysOrg){ + return orgService.getOrgWithChildren(sysOrg); + } + + @ApiOperation("查询机构详细信息") + @GetMapping("/{id}") + public BaseResponse getOrgInfo(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + return orgService.getOrgInfo(id); + } + + @ApiOperation("查询机构列表") + @GetMapping("/list") + public BaseResponse> getOrglist(@ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysOrg param){ + return orgService.getOrglist(param); + } + + @ApiOperation("查询所有数据（树形结构）") + @GetMapping("/queryAll") + public BaseResponse> queryAll(@SpringQueryMap SysOrg sysOrg){ + return orgService.queryAll(sysOrg); + } + + + @ApiOperation("查询当前登录人的所在单位下的所有部门数据（树形结构）") + @GetMapping("/queryUserOrgAll") + public BaseResponse> queryUserOrgAll(){ + return orgService.queryUserOrgAll(); + } + + + + + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java index 00d5dbc..a06de80 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/UserController.java @@ -1,16 +1,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserService; +import com.chinaunicom.mall.ebtp.common.base.entity.SysUser; +import com.chinaunicom.mall.ebtp.common.base.entity.SysUserVO; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.impl.UserServiceImpl; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; -import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/user") @@ -18,18 +17,27 @@ public class UserController { @Autowired - private UserService userService; + private IUserService userService; + /** + * 分页查询用户信息 + * @param vo + * @return + */ + @PostMapping("/getUserPage") + public BaseResponse getUserPage(@ApiParam(value = "对象数据", required = true) @RequestBody SysUserVO vo) { + return userService.getUserPage(vo); + } + /** + * 查询用户列表 + * @return + */ @GetMapping("/getUserList") - public BaseResponse getUserList(SelectUserVo vo) { - return BaseResponse.success(userService.getUser(vo)); + public BaseResponse getUserList( @ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysUser param) { + return BaseResponse.success(userService.getUserList(param)); } - @GetMapping("/getDeptList") - public BaseResponse getDeptList() { - return BaseResponse.success(userService.getDept()); - } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java new file mode 100644 index 0000000..d4169dc --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java @@ -0,0 +1,70 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service; + + +import com.chinaunicom.mall.ebtp.common.base.entity.*; + +import java.util.List; + +/** + * 部门接口 + * @author Craft + * @date 2024-01-29 + */ +public interface IOrgService { + + /** + * 查询组织信息（当前组织及下级组织列表） + * @param sysOrg + * @return + */ + BaseResponse> getOrgWithChildren(SysOrg sysOrg); + + /** + * 查询机构详细信息 + * @param id + * @return + */ + BaseResponse getOrgInfo(String id); + + /** + * 查询机构列表 + * @param param + * @return + */ + BaseResponse> getOrglist(SysOrg param); + + /** + * 查询所有数据（树形结构） + * @param sysOrg + * @return + */ + BaseResponse> queryAll(SysOrg sysOrg); + + /** + * 查询当前登录人的所在单位下的所有部门数据（树形结构） + * @return + */ + BaseResponse> queryUserOrgAll(); + + + /** + * 获取当前登录人的本级及下级部门id + * @return + */ + List levelAndBelowOrgIdList(); + /** + * 获取当前登录人的本级及上级部门id + * @return + */ + List levelAndAboveOrgIdList(); + + /** + * 获取当前登录人的本级及下级及上级部门id + * @return + */ + List levelAndBelowAndAboveOrgIdList(); + + + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java new file mode 100644 index 0000000..2ae90a4 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IUserService.java @@ -0,0 +1,22 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.SysUser; +import com.chinaunicom.mall.ebtp.common.base.entity.SysUserVO; + +import java.util.List; + +/** + * 用户接口 + * @author Craft + * @date 2024-01-29 + */ +public interface IUserService{ + + BaseResponse> getUserPage(SysUserVO vo); + + BaseResponse> getUserList(SysUser vo); + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java new file mode 100644 index 0000000..bf29fd1 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java @@ -0,0 +1,183 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; + +import com.alibaba.nacos.common.utils.StringUtils; +import com.chinaunicom.mall.ebtp.common.base.client.SystemClient; +import com.chinaunicom.mall.ebtp.common.base.entity.*; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + + +@Service +public class OrgServiceImpl implements IOrgService { + + @Autowired + private SystemClient systemClient; + + /** + * 查询组织信息（当前组织及下级组织列表） + * @param sysOrg + * @return + */ + @Override + public BaseResponse> getOrgWithChildren(SysOrg sysOrg) { + return systemClient.getOrgWithChildren(sysOrg); + } + + /** + * 查询机构详细信息 + * @param id + * @return + */ + @Override + public BaseResponse getOrgInfo(String id) { + return systemClient.getOrgInfo(id); + } + + /** + * 查询机构列表 + * @param param + * @return + */ + @Override + public BaseResponse> getOrglist(SysOrg param) { + return systemClient.getOrglist(param); + } + + /** + * 查询所有数据（树形结构） + * @param sysOrg + * @return + */ + @Override + public BaseResponse> queryAll(SysOrg sysOrg) { + return systemClient.queryAll(sysOrg); + } + + /** + * 查询当前登录人的所在单位下的所有部门数据（树形结构） + * @return + */ + @Override + public BaseResponse queryUserOrgAll() { + try { + // 1. 获取当前用户（判空） + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + if (currentUser == null) { + return BaseResponse.fail("用户未登录或Token无效"); + } + + // 2. 获取组织信息（判空 + 检查接口返回是否成功） + BaseResponse baseResponse = systemClient.getOrgInfo(currentUser.getOrganizationId()); + if (baseResponse == null || !baseResponse.isSuccess() || baseResponse.getData() == null) { + return BaseResponse.fail("获取组织信息失败"); + } + + // 3. 解析 orgFullId（判空 + 安全分割） + SysOrg sysOrg = baseResponse.getData(); + String orgFullId = sysOrg.getOrgFullId(); + if (StringUtils.isEmpty(orgFullId)) { + return BaseResponse.fail("组织全ID为空"); + } + + String[] parts = orgFullId.split(","); + String orgId; + if (parts.length == 1) { + orgId = parts[0]; // 只有一级，返回一级 + } else { + orgId = parts[1]; // 有多级，返回第二级 + } + + // 4. 查询组织数据（判空构造参数） + SysOrg sysOrgAll = new SysOrg(); + sysOrgAll.setOrgId(orgId); + BaseResponse> response = systemClient.queryAll(sysOrgAll); + + // 5. 返回前检查接口响应 + return response != null ? response : BaseResponse.fail("组织查询结果为空"); + } catch (Exception e) { + return BaseResponse.fail("系统异常: " + e.getMessage()); + } + } + + /** + * 获取当前登录人本级及下级部门id + * @return + */ + @Override + public List levelAndBelowOrgIdList() { + // 获取当前用户 + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + SysOrg sysOrg = new SysOrg(); + sysOrg.setOrgId(currentUser.getOrganizationId()); + BaseResponse> baseResponse = systemClient.getOrgWithChildren(sysOrg); + List sysOrgList = baseResponse.getData(); + // 提取 orgId 到 List + List orgIdList = Optional.ofNullable(sysOrgList) + .orElse(Collections.emptyList()) + .stream() + .map(SysOrg::getOrgId) + .filter(Objects::nonNull) // 过滤掉 null 值 + .collect(Collectors.toList()); + return orgIdList; + } + + /** + * 获取当前登录人本级及上级部门id + * @return + */ + @Override + public List levelAndAboveOrgIdList() { + // 获取当前用户（判空） + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + SysOrg sysOrg = systemClient.getOrgInfo(currentUser.getOrganizationId()).getData(); + String orgFullId = sysOrg.getOrgFullId(); + List orgIdList = orgFullId == null || orgFullId.isEmpty() + ? Collections.emptyList() + : Arrays.asList(orgFullId.split(",")); + return orgIdList; + } + + + /** + * 查询当前登录人的所在单位下的所有部门id数据 + * @return + */ + @Override + public List levelAndBelowAndAboveOrgIdList() { + // 1. 获取当前用户（判空） + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + + // 2. 获取组织信息 + BaseResponse baseResponse = systemClient.getOrgInfo(currentUser.getOrganizationId()); + + // 3. 解析 orgFullId + SysOrg sysOrg = baseResponse.getData(); + String orgFullId = sysOrg.getOrgFullId(); + + String[] parts = orgFullId.split(","); + String orgId; + if (parts.length == 1) { + orgId = parts[0]; // 只有一级，返回一级 + } else { + orgId = parts[1]; // 有多级，返回第二级 + } + + // 4. 查询组织数据（判空构造参数） + SysOrg sysOrgAll = new SysOrg(); + sysOrgAll.setOrgId(orgId); + List sysOrgVOList = systemClient.queryAll(sysOrgAll).getData(); + // 提取 orgId 到 List + List orgIdList = Optional.ofNullable(sysOrgVOList) + .orElse(Collections.emptyList()) + .stream() + .map(SysOrgVO::getOrgId) + .filter(Objects::nonNull) // 过滤掉 null 值 + .collect(Collectors.toList()); + return orgIdList; + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java deleted file mode 100644 index 910d921..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; - -import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; -import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -public class UserService { - - public List getDept() { - List deptList = new ArrayList<>(); - for (int i = 1; i <= 10; i++) { - UserVo dept = new UserVo(); - dept.setUserDeptId("D" + String.format("%03d", i)); - dept.setUserDept("部门" + i); - deptList.add(dept); - } - return deptList; - } - - - public List getUser(SelectUserVo vo) { - List userList = new ArrayList<>(); - Map map = new HashMap<>(); - if(vo.getUserIds()!=null){ - for (String userId : vo.getUserIds()) { - map.put(userId,userId); - } - } - for (int i = 1; i <= 32; i++) { - UserVo user = new UserVo(); - user.setUserId("U" + String.format("%03d", i)); // U001 ~ U010 - user.setUserName("用户" + i); - user.setUserDept("部门" + ((i % 3) + 1)); // 部门1、部门2、部门3轮换 - user.setUserDeptId("D" + ((i % 3) + 1)); - String s = map.get(user.getUserId()); - if(s!=null){ - user.setIsSelected(true); - } - userList.add(user); - } - - if(vo.getPageNumber()!=null && vo.getPageSize()!=null){ - int pageNum = vo.getPageNumber(); - int pageSize = vo.getPageSize(); - int start = (pageNum - 1) * pageSize; - int end = Math.min(start + pageSize, userList.size()); - return userList.subList(start, end); - } - return userList; - } - -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..60be7ff --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java @@ -0,0 +1,38 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.client.SystemClient; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.entity.SysUser; +import com.chinaunicom.mall.ebtp.common.base.entity.SysUserVO; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + + +@Service +public class UserServiceImpl implements IUserService { + + @Autowired + private SystemClient systemClient; + + @Override + public BaseResponse> getUserPage(SysUserVO vo) { + return systemClient.getUserPage(vo); + } + + @Override + public BaseResponse> getUserList(SysUser user) { + return systemClient.getUserlist(user); + } + + public List getUser(SelectUserVo vo){ + return new ArrayList<>(); + } + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java index 0af31de..1c628dc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java @@ -5,7 +5,9 @@ import javax.validation.Valid; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService; import io.swagger.annotations.ApiOperation; @@ -35,7 +37,9 @@ public class CoscoAccessWorkController extends BaseController { @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) { //判断当前登录人是否是组长 - data.setUserId("1"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId(); + data.setUserId(userId); return BaseResponse.success(coscoAccessWorkService.getPage(data)); } @@ -79,8 +83,9 @@ public class CoscoAccessWorkController extends BaseController { */ @ApiOperation("查询数据") @GetMapping("/reviewInfo") - public BaseResponse> reviewInfo(@ApiParam(value = "主键id", required = true) String id,@ApiParam(value = "用户id", required = true) String userId){ - userId = "1"; + public BaseResponse> reviewInfo(@ApiParam(value = "主键id", required = true) String id){ + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId(); return BaseResponse.success(coscoAccessWorkService.reviewInfo(id,userId)); } @@ -102,8 +107,7 @@ public class CoscoAccessWorkController extends BaseController { */ @ApiOperation("修改数据") @PostMapping("/update") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoAccessUserItemVo vo){ - vo.setUserId("1"); + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoAccessUserItemVo vo){ return BaseResponse.success(coscoAccessWorkService.updateCoscoAccessWork(vo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java index 325e8bb..6479270 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java @@ -45,7 +45,7 @@ public class CoscoMessageController extends BaseController { } /** - * 获取这个登录的供应商所有品类退出消息 + * 获取这个登录的供应商所有未读品类退出消息 * @return */ @ApiOperation("查询数据") diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java index f68e64f..d0260da 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java @@ -5,7 +5,9 @@ import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.AdmissionDetailsVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; @@ -37,7 +39,7 @@ public class CoscoSupplierBaseController extends BaseController { /** - * 查询未准入供应商分页数据 + * 查询当前登录人的所在单位下的所有部门，未准入供应商分页数据 * @return 返回结果 */ @ApiOperation("查询分页数据") @@ -66,7 +68,7 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("新增数据") @PostMapping("/add") public BaseResponse supplierRegistration(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoSupplierVo vo){ - return BaseResponse.success(coscoSupplierBaseService.insertCoscoSupplierBase(vo)); + return BaseResponse.success(coscoSupplierBaseService.insertCoscoSupplierBase(vo,null)); } /** @@ -77,10 +79,12 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("新增数据") @PostMapping("/addAgent") public BaseResponse addAgent(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoSupplierVo vo){ + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//登录人id CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); coscoSupplierBase.setFillinStatus(CoscoType.FILLIN_STATUS_S);//代录入标识 - coscoSupplierBase.setFillinBy("1");//代理人 - return BaseResponse.success(coscoSupplierBaseService.insertCoscoSupplierBase(vo)); + coscoSupplierBase.setFillinBy(userId);//代理人 + return BaseResponse.success(coscoSupplierBaseService.insertCoscoSupplierBase(vo,userId)); } @@ -102,7 +106,9 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPageAgent") public BaseResponse> getPageAgent(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) { - coscoSupplierBase.setFillinBy("1"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//登录人id + coscoSupplierBase.setFillinBy(userId); return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase)); } @@ -114,7 +120,9 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPageMy") public BaseResponse> getPageMy(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) { - coscoSupplierBase.setCreateBy("1"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//登录人id + coscoSupplierBase.setCreateBy(userId); return BaseResponse.success(coscoSupplierBaseService.getMySupplierBasePage(coscoSupplierBase)); } @@ -164,7 +172,9 @@ public class CoscoSupplierBaseController extends BaseController { @GetMapping("/getPageMyExport") public void getPageMyExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase){ try{ - coscoSupplierBase.setCreateBy("1"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//登录人id + coscoSupplierBase.setCreateBy(userId); List list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase); // 动态设置导出字段（忽略未标注字段） @@ -269,7 +279,7 @@ public class CoscoSupplierBaseController extends BaseController { /** - * 供应商后台获取基本信息 + * 供应商获取基本信息，银行信息、资质信息、附件信息、开票信息 * @param id * @return */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java index aa870c2..44f4688 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoAccessWorkService.java @@ -64,7 +64,7 @@ public interface ICoscoAccessWorkService { * @param coscoAccessWork 供应商准入_准入申请工作主 * @return 结果 */ - public Boolean updateCoscoAccessWork(CoscoAccessUserItemVo coscoAccessWork); + public int updateCoscoAccessWork(CoscoAccessUserItemVo coscoAccessWork); /** * 批量删除供应商准入_准入申请工作主 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java index e88bc19..bb69f0f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java @@ -55,7 +55,7 @@ public interface ICoscoSupplierBaseService { * 新增中远海运_供应商_基本信息 * */ - public Integer insertCoscoSupplierBase(CoscoSupplierVo vo); + public Integer insertCoscoSupplierBase(CoscoSupplierVo vo,String userId); /** * 修改中远海运_供应商_基本信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index 00821a3..2edfebb 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; @@ -70,8 +72,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg // 创建分页对象（当前页，每页大小） IPage page = new Page<>(data.getPageNo(), data.getPageSize()); data.setApplyType(CoscoType.APPLY_TYPE_PLZR); - IPage wqeq = coscoAccessWorkMapper.selectPageList(page, data); - return wqeq; + return coscoAccessWorkMapper.selectPageList(page, data); } @@ -84,6 +85,8 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg @Override @Transactional public Integer insertCoscoAccessWork(CoscoAccessWorkVo vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//当前登录人 String workId = CoscoIdUtil.getId();//工作主体id Date date = CoscoDateUtils.getNowDate(); //任务主体新增/品类准入 @@ -91,9 +94,9 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessWork.setId(workId); coscoAccessWork.setApplyType(CoscoType.APPLY_TYPE_PLZR); coscoAccessWork.setAccessType(CoscoType.ACCESS_TYPE_ONLINE); - coscoAccessWork.setCreateBy("1"); + coscoAccessWork.setCreateBy(userId); coscoAccessWork.setCreateTime(date); - coscoAccessWork.setUpdateBy("1"); + coscoAccessWork.setUpdateBy(userId); coscoAccessWork.setUpdateTime(date); coscoAccessWork.setLastUpdateTime(date); @@ -215,7 +218,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessCategory.setDeptId(coscoAccessWorkData.getDeptId()); List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryByDeptIdList(coscoAccessCategory); - //审批通过 + //审批通过,将需要插入到已准入品类表的品类插入到数据库中 if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus())){ List coscoAccessSupplierCategoryList = new ArrayList<>(); for (CoscoAccessCategory accessCategory : coscoAccessCategoryList){ @@ -237,7 +240,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplierCategoryMapper.batchCoscoAccessSupplierCategory(coscoAccessSupplierCategoryList); } - }else{ //审批未通过 + }else{ //审批未通过，给供应商发送消息 for(CoscoAccessCategory accessCategory : coscoAccessCategoryList){ supplierAndCateGoryList.add(accessCategory); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java index 7267c0e..a48009a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java @@ -2,6 +2,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; @@ -212,15 +214,17 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @Override @Transactional public Integer insertCoscoAccessWork(CoscoAccessWorkVo vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//当前登录人id String workId = CoscoIdUtil.getId();//工作主体id Date date = CoscoDateUtils.getNowDate(); //供应商准入_准入申请工作主表新增 CoscoAccessWork coscoAccessWork = vo.getCoscoAccessWork(); coscoAccessWork.setId(workId); coscoAccessWork.setApplyType(CoscoType.APPLY_TYPE_GYSZR); - coscoAccessWork.setCreateBy("1"); + coscoAccessWork.setCreateBy(userId); coscoAccessWork.setCreateTime(date); - coscoAccessWork.setUpdateBy("1"); + coscoAccessWork.setUpdateBy(userId); coscoAccessWork.setUpdateTime(date); coscoAccessWork.setLastUpdateTime(date); @@ -237,7 +241,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { List coscoAccessUserls = vo.getCoscoAccessUserls(); //添加评审人员，并返回组长id - String leaderId = addCoscoAccessUser(workId, coscoAccessUserls,date);//组长id + String leaderId = addCoscoAccessUser(workId, coscoAccessUserls,date,userId);//组长id //给每个供应商添加评审项，并且把每个供应商的评审项进行人员绑定，组长需要每一家供应商添加一项结果汇总 addUserAndItem(vo, workId, leaderId); @@ -249,7 +253,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //如果是线下准入、评审状态直接为完成 coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_YWC); //新增线下审批需要的附件 - addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_OFFLINE); + addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_OFFLINE,userId); } //如果是零星采购/应急采购,不需要走任何流程直接审核通过 @@ -261,7 +265,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //零星采购，直接把准入品类添加到已准入品类表，并给供应商发送消息 sporadicHandling(coscoAccessWork,vo.getCategoryIds()); //新增零星采购需要的附件 - addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_SCATTERED); + addCoscoAccessWorkAttachments(vo.getCoscoAccessWorkAttachments(),workId,CoscoType.ACCESS_TYPE_SCATTERED,userId); } //保存工作主表 @@ -273,16 +277,16 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { * @param coscoAccessWorkAttachments 附件实体 * @param attachmentsType 附件类型 */ - private void addCoscoAccessWorkAttachments(CoscoAccessWorkAttachments coscoAccessWorkAttachments,String workId,String attachmentsType){ + private void addCoscoAccessWorkAttachments(CoscoAccessWorkAttachments coscoAccessWorkAttachments,String workId,String attachmentsType,String userId){ //附件新增 if(!ObjectUtils.isEmpty(coscoAccessWorkAttachments)){ Date date = new Date(); coscoAccessWorkAttachments.setId(PropertyUtils.getSnowflakeId()); coscoAccessWorkAttachments.setAccessWorkId(workId); coscoAccessWorkAttachments.setAttachmentsType(attachmentsType); - coscoAccessWorkAttachments.setCreateBy("1"); + coscoAccessWorkAttachments.setCreateBy(userId); coscoAccessWorkAttachments.setCreateTime(date); - coscoAccessWorkAttachments.setUpdateBy("1"); + coscoAccessWorkAttachments.setUpdateBy(userId); coscoAccessWorkAttachments.setUpdateTime(date); coscoAccessWorkAttachments.setLastUpdateTime(date); coscoAccessWorkAttachmentsMapper.insertCoscoAccessWorkAttachments(coscoAccessWorkAttachments); @@ -385,7 +389,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessUserItem.setLastUpdateTime(date); return coscoAccessUserItem; } - private String addCoscoAccessUser(String workId, List coscoAccessUserls,Date date) { + private String addCoscoAccessUser(String workId, List coscoAccessUserls,Date date,String userId) { String leaderId = "";//组长id List coscoAccessUserList = new ArrayList<>(); //评审人员集合 @@ -398,9 +402,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessUser.setAccessWorkId(workId); coscoAccessUser.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D); coscoAccessUser.setId(CoscoIdUtil.getId()); - coscoAccessUser.setCreateBy("1"); + coscoAccessUser.setCreateBy(userId); coscoAccessUser.setCreateTime(date); - coscoAccessUser.setUpdateBy("1"); + coscoAccessUser.setUpdateBy(userId); coscoAccessUser.setUpdateTime(date); coscoAccessUser.setLastUpdateTime(date); coscoAccessUserList.add(coscoAccessUser); @@ -455,10 +459,12 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { */ @Override @Transactional - public Boolean updateCoscoAccessWork(CoscoAccessUserItemVo vo) { - String userId =vo.getUserId(); + public int updateCoscoAccessWork(CoscoAccessUserItemVo vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId(); Date date = CoscoDateUtils.getNowDate(); + //修改评审项关联评审人员表 addCoscoAccessUserItemAndUp(vo); //修改评审人员表状态 CoscoAccessUser coscoAccessUser = new CoscoAccessUser(); @@ -466,7 +472,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessUser.setUserId(userId); coscoAccessUser.setReviewTime(date); coscoAccessUser.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_Y); - coscoAccessUser.setUpdateBy("1"); + coscoAccessUser.setUpdateBy(userId); coscoAccessUser.setUpdateTime(date); coscoAccessUser.setLastUpdateTime(date); coscoAccessUserMapper.updateCoscoAccessUserByUserId(coscoAccessUser); @@ -477,6 +483,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessUser2.setStatus(CoscoType.COSCO_ACCESS_USER_STATUS_D); coscoAccessUser2.setIsLeader(CoscoType.IS_LEADER_FO); Integer num = coscoAccessUserMapper.selectCountStatus(coscoAccessUser2); + CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); if(num == 0){ //说明组员已经全部评审完成 //人员查询 @@ -488,32 +495,31 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { if(CoscoType.IS_LEADER_SHI.equals(coscoAccessUserList.get(0).getIsLeader())){ //组长-修改已完成 //修改任务主表评审状态 - CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(vo.getAccessWorkId()); coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_YWC); - coscoAccessWork.setUpdateBy("1"); - updateWork(coscoAccessWork); + coscoAccessWork.setUpdateBy(userId); + }else{ //组员-结果汇总中 //修改任务主表评审状态 - CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(vo.getAccessWorkId()); coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_JGHZZ); - coscoAccessWork.setUpdateBy("1"); - updateWork(coscoAccessWork); + coscoAccessWork.setUpdateBy(userId); } }else{ //修改任务主表评审状态--进行中 - CoscoAccessWork coscoAccessWork = new CoscoAccessWork(); coscoAccessWork.setId(vo.getAccessWorkId()); coscoAccessWork.setReviewStatus(CoscoType.REVIEW_STATUS_JXZ); - coscoAccessWork.setUpdateBy("1"); - updateWork(coscoAccessWork); + coscoAccessWork.setUpdateBy(userId); } - return true; + return updateWork(coscoAccessWork); } + /** + * 修改评审项关联评审人员表，并新增修改或者删除附件 + * @param vo + */ private void addCoscoAccessUserItemAndUp(CoscoAccessUserItemVo vo) { //如果附件有值可能是新增，也可能是修改 if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index 3f13d7d..1fd664e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; @@ -194,7 +196,7 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getSupplierCategoryPage(CoscoAccessSupplierCategory data) { - //获取当前登录人的所有部门，查询这个人所有部门下的审批中的退出数据 ---因为审批通过的会在因准入品类表中删除所有不需要查审批通过的 + //获取当前登录人的所有部门，查询这个人所有部门下的审批中的退出数据 ---因为审批通过的会在已准入品类表中删除所有不需要查审批通过的 List deptIds = new ArrayList<>(); deptIds.add("100"); List categoryList = coscoAccessSupplierCategoryMapper.selectCategoryByDeptIdList(deptIds); @@ -121,6 +123,8 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { @Override @Transactional public Integer insertCoscoSupplierexit(CoscoSupplierexitVo vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//当前登录人 String exitId = PropertyUtils.getSnowflakeId(); Date date = new Date(); //需要退出的供应商id集合 去重 @@ -147,9 +151,9 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { //基础信息保存--审批中 CoscoSupplierexit coscoSupplierexit = vo.getCoscoSupplierexit(); coscoSupplierexit.setId(exitId); - coscoSupplierexit.setCreateBy("1"); + coscoSupplierexit.setCreateBy(userId); coscoSupplierexit.setCreateTime(date); - coscoSupplierexit.setUpdateBy("1"); + coscoSupplierexit.setUpdateBy(userId); coscoSupplierexit.setUpdateTime(date); coscoSupplierexit.setLastUpdateTime(date); coscoSupplierexit.setApproveStatus(CoscoType.APPROVE_STATUS_SPZ); @@ -231,7 +235,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { } //所有退出的品类发给消息 coscoSupplierExitSupplierCategoryVo.setCoscoSupplierexitSupplierCategoryList(categoryList); - + //审批状态 coscoSupplierExitSupplierCategoryVo.setApproveStatus(coscoSupplierexit.getApproveStatus()); return coscoSupplierExitSupplierCategoryVo; }