From a4658114cee71678c505f6a79cf7386d4e3db2ef Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Tue, 22 Jul 2025 11:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/base/constant/CoscoType.java | 6 ++++ .../base/service/impl/OrgServiceImpl.java | 2 +- .../CoscoAccessWorkCategoryController.java | 3 +- .../controller/CoscoAccessWorkController.java | 6 ++-- .../controller/CoscoMessageController.java | 14 +++++++-- .../CoscoSupplierBankController.java | 20 ++++++++++++ .../CoscoSupplierBaseController.java | 31 +++++++++++++------ .../CoscoSupplierChangeApplyController.java | 20 ++++++++++-- .../CoscoSupplierInvoiceController.java | 20 ++++++++++++ ...CoscoSupplierQualificationsController.java | 19 ++++++++++++ ...coSupplierSurveyAttachmentsController.java | 19 ++++++++++++ .../CoscoSupplierUserController.java | 26 +++++++++++++++- .../CoscoSupplierexitController.java | 5 +-- .../dao/mapper/CoscoSupplierUserMapper.java | 7 +++++ .../entity/CoscoAccessSupplier.java | 4 ++- .../entity/CoscoSupplierBase.java | 3 +- .../entity/CoscoSupplierChangeApply.java | 2 +- .../entity/CoscoSupplierexit.java | 4 +++ .../service/ICoscoSupplierUserService.java | 8 +++++ .../CoscoAccessWorkCategoryServiceImpl.java | 2 ++ .../impl/CoscoAccessWorkServiceImpl.java | 3 +- .../impl/CoscoSupplierBaseServiceImpl.java | 30 ++++++++++++------ .../impl/CoscoSupplierUserServiceImpl.java | 10 ++++++ .../impl/CoscoSupplierexitServiceImpl.java | 24 +++++--------- .../coscosupplier/vo/SupplierPageVo.java | 7 +++++ .../CoscoAccessSupplierCategoryMapper.xml | 18 +++++------ .../dao/mapper/CoscoAccessSupplierMapper.xml | 29 +++++++++++------ .../dao/mapper/CoscoSupplierBankMapper.xml | 3 -- .../dao/mapper/CoscoSupplierBaseMapper.xml | 16 +++++----- .../dao/mapper/CoscoSupplierInvoiceMapper.xml | 3 -- .../CoscoSupplierQualificationsMapper.xml | 3 -- .../CoscoSupplierSurveyAttachmentsMapper.xml | 3 -- .../dao/mapper/CoscoSupplierUserMapper.xml | 8 +++-- .../dao/mapper/CoscoSupplierexitMapper.xml | 10 ++++++ 34 files changed, 294 insertions(+), 94 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java index 262241e..be6216d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoType.java @@ -6,6 +6,8 @@ public class CoscoType { public static final Long ACCESS_STATUS_TC = 2L; public static final Long ACCESS_STATUS_WZR = 0L; public static final Long ACCESS_STATUS_YZR = 1L; + public static final String ACCESS_STATUS_WZR_CN = "未准入"; + //是否为代理录入（0.否、1.是） public static final Long FILLIN_STATUS_S = 1L; @@ -84,6 +86,10 @@ public class CoscoType { + //用户类型，登录人类型，type=2是供应商登录 + + public static final String USERTYPE_GYS = "2"; + 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 index 6471f59..a143ef2 100644 --- 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 @@ -49,7 +49,7 @@ public class OrgServiceImpl implements IOrgService { OrgDeptVo orgDeptVo = new OrgDeptVo(); SysOrg dept = getOrgInfo(id); if(!ObjectUtils.isEmpty(dept)){ - SysOrg org = systemClient.getOrgInfo(dept.getUpOrgId()).getData(); + SysOrg org = systemClient.getOrgInfo(dept.getCuCompanyNumber()).getData(); if(!ObjectUtils.isEmpty(org)){ orgDeptVo.setOrgId(org.getOrgId()); orgDeptVo.setOrgName(org.getOrgName()); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java index ef7b98d..0e94285 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkCategoryController.java @@ -37,8 +37,7 @@ public class CoscoAccessWorkCategoryController extends BaseController { @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) { BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId(); - data.setCreateBy(userId); + data.setOrgId(currentUser.getOrganizationId()); return BaseResponse.success(coscoAccessWorkCategoryService.getPage(data)); } 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 536a207..025c4af 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 @@ -40,8 +40,7 @@ public class CoscoAccessWorkController extends BaseController { public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) { //判断当前登录人是否是组长 BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId(); - data.setCreateBy(userId); + data.setOrgId(currentUser.getOrganizationId()); return BaseResponse.success(coscoAccessWorkService.getPage(data)); } @@ -68,6 +67,9 @@ public class CoscoAccessWorkController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getApprovePage") public BaseResponse> getApprovePage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) { + //判断当前登录人是否是组长 + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + data.setOrgId(currentUser.getOrganizationId()); return BaseResponse.success(coscoAccessWorkService.getApprovePage(data)); } 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 6a830f2..c1f2fb4 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 @@ -7,9 +7,12 @@ 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -30,16 +33,21 @@ public class CoscoMessageController extends BaseController { @Autowired private ICoscoMessageService coscoMessageService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; + /** * 查询供应商业务处理消息推送列表 */ @ApiOperation("查询分页数据") @PostMapping("/page") public BaseResponse> page(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoMessage coscoMessage) { - //获取登录人供应商id BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId();//登录人id - coscoMessage.setReceiverId(userId); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoMessageService.getPage(coscoMessage)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java index 6ac673e..14eb2d9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBankController.java @@ -4,9 +4,14 @@ import java.util.List; 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBankService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +30,9 @@ public class CoscoSupplierBankController extends BaseController { @Autowired private ICoscoSupplierBankService coscoSupplierBankService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; + /** * 查询中远海运_供应商_银行账户列表 */ @@ -42,6 +50,12 @@ public class CoscoSupplierBankController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBank vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + vo.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierBankService.getPage(vo)); } @@ -58,6 +72,12 @@ public class CoscoSupplierBankController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoSupplierBank coscoSupplierBank) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoSupplierBank.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierBankService.insertCoscoSupplierBank(coscoSupplierBank)); } 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 f0e7bfd..189d83c 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 @@ -11,8 +11,10 @@ import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -37,6 +39,8 @@ public class CoscoSupplierBaseController extends BaseController { @Autowired private ICoscoSupplierBaseService coscoSupplierBaseService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; /** * 查询当前登录人的所在单位下，未准入供应商分页数据 @@ -56,6 +60,8 @@ public class CoscoSupplierBaseController extends BaseController { */ @PostMapping("/getSupplierPage") public BaseResponse> getSupplierPage(@ApiParam(value = "对象数据", required = true) @RequestBody SupplierPageVo supplierPageVo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + supplierPageVo.setOrgId(currentUser.getOrganizationId()); return BaseResponse.success(coscoSupplierBaseService.getSupplierPage(supplierPageVo)); } @@ -284,6 +290,12 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + id = coscoSupplierUser.getSupplierId(); + } return BaseResponse.success(coscoSupplierBaseService.selectCoscoSupplierBaseById(id)); } @@ -295,12 +307,11 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getCategoryPage") public BaseResponse> getZrCategoryPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessSupplierCategory vo) { - //如果id是就自己查 - if(StringUtils.isEmpty(vo.getSupplierId())){ - //获取登录人信息 - BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId();//登录人id - vo.setSupplierId(userId); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + vo.setSupplierId(coscoSupplierUser.getSupplierId()); } return BaseResponse.success(coscoSupplierBaseService.getZrCategoryPage(vo)); } @@ -315,10 +326,12 @@ public class CoscoSupplierBaseController extends BaseController { @ApiOperation("查询数据") @GetMapping("/getSupplierInfo/{id}") public BaseResponse getCoscoSupplierBase(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - //获取登录人信息 - //获取登录人信息 BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - id = currentUser.getUserId();//登录人id + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + id = coscoSupplierUser.getSupplierId(); + } return BaseResponse.success(coscoSupplierBaseService.getCoscoSupplierBase(id)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java index 5a9c271..4441bbe 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierChangeApplyController.java @@ -2,9 +2,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierChangeApplyService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +29,8 @@ public class CoscoSupplierChangeApplyController extends BaseController { @Autowired private ICoscoSupplierChangeApplyService coscoSupplierChangeApplyService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; /** * 供应商变更管理分页列表 @@ -60,7 +66,12 @@ public class CoscoSupplierChangeApplyController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getSupplierChangePage") public BaseResponse> getSupplierChangePage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierChangeApply data) { - data.setSupplierId("1939870859522277376"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + data.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierChangeApplyService.selectCoscoSupplierChangeApplyList(data)); } @@ -71,7 +82,12 @@ public class CoscoSupplierChangeApplyController extends BaseController { */ @GetMapping("/getSupplierIdCount/{id}") public Integer getSupplierByIdCount(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - id = "1938468513881849856"; + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + id = coscoSupplierUser.getSupplierId(); + } return coscoSupplierChangeApplyService.getSupplierByIdCount(id); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java index aa641ca..d1b88d1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierInvoiceController.java @@ -2,9 +2,14 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierInvoice; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierInvoiceService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +30,9 @@ public class CoscoSupplierInvoiceController extends BaseController { @Autowired private ICoscoSupplierInvoiceService coscoSupplierInvoiceService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; + /** * 查询中远海运_供应商_开票信息列表 */ @@ -42,6 +50,12 @@ public class CoscoSupplierInvoiceController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierInvoice vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + vo.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierInvoiceService.getPage(vo)); } @@ -58,6 +72,12 @@ public class CoscoSupplierInvoiceController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoSupplierInvoice coscoSupplierInvoice) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoSupplierInvoice.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierInvoiceService.insertCoscoSupplierInvoice(coscoSupplierInvoice)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java index 74d5239..6e4254d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierQualificationsController.java @@ -2,9 +2,14 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierQualifications; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierQualificationsService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +30,8 @@ public class CoscoSupplierQualificationsController extends BaseController { @Autowired private ICoscoSupplierQualificationsService coscoSupplierQualificationsService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; /** * 查询中远海运_供应商_资质信息列表 @@ -43,6 +50,12 @@ public class CoscoSupplierQualificationsController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierQualifications vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + vo.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierQualificationsService.getPage(vo)); } @@ -61,6 +74,12 @@ public class CoscoSupplierQualificationsController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoSupplierQualifications coscoSupplierQualifications) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoSupplierQualifications.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierQualificationsService.insertCoscoSupplierQualifications(coscoSupplierQualifications)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java index 45b7b2c..f8ef931 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierSurveyAttachmentsController.java @@ -2,9 +2,14 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierSurveyAttachments; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierSurveyAttachmentsService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +29,8 @@ import java.util.List; public class CoscoSupplierSurveyAttachmentsController extends BaseController { @Autowired private ICoscoSupplierSurveyAttachmentsService coscoSupplierSurveyAttachmentsService; + @Autowired + private ICoscoSupplierUserService coscoSupplierUserService; /** * 查询中远海运_供应商_承诺书及附件列表 @@ -42,6 +49,12 @@ public class CoscoSupplierSurveyAttachmentsController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierSurveyAttachments vo) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + vo.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierSurveyAttachmentsService.getPage(vo)); } @@ -59,6 +72,12 @@ public class CoscoSupplierSurveyAttachmentsController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoSupplierSurveyAttachments.setSupplierId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierSurveyAttachmentsService.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierUserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierUserController.java index f0ad340..6b17daa 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierUserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierUserController.java @@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; 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.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierUserService; @@ -30,8 +32,24 @@ public class CoscoSupplierUserController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPage") public BaseResponse page(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierUser coscoSupplierUser) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser supplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoSupplierUser.setSupplierId(supplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierUserService.getPage(coscoSupplierUser)); } + /** + * 获取中远海运_供应商_通过登录人id查询供应商联系人详细信息 + */ + @GetMapping(value = "/user/info") + public BaseResponse getUserInfo() { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + return BaseResponse.success(coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId())); + } + /** * 获取中远海运_供应商_供应商联系人详细信息 @@ -46,13 +64,19 @@ public class CoscoSupplierUserController extends BaseController { */ @PostMapping(value = "/add") public BaseResponse add(@RequestBody CoscoSupplierUser coscoSupplierUser) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser supplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoSupplierUser.setSupplierId(supplierUser.getSupplierId()); + } return BaseResponse.success(coscoSupplierUserService.insertCoscoSupplierUser(coscoSupplierUser)); } /** * 修改中远海运_供应商_供应商联系人 */ - @PostMapping(value = "/edit") + @PutMapping(value = "/edit") public BaseResponse edit(@RequestBody CoscoSupplierUser coscoSupplierUser) { return BaseResponse.success(coscoSupplierUserService.updateCoscoSupplierUser(coscoSupplierUser)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java index 6e40ce4..013040d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java @@ -37,8 +37,7 @@ public class CoscoSupplierexitController extends BaseController { @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierexit data) { BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId(); - data.setCreateBy(userId); + data.setOrgId(currentUser.getOrganizationId()); return BaseResponse.success(coscoSupplierexitService.getPage(data)); } @@ -61,6 +60,8 @@ public class CoscoSupplierexitController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getSupplierCategoryPage") public BaseResponse> getSupplierCategoryPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessSupplierCategory data) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + data.setOrgId(currentUser.getOrganizationId()); return BaseResponse.success(coscoSupplierexitService.getSupplierCategoryPage(data)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierUserMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierUserMapper.java index 051d182..dcf6fca 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierUserMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierUserMapper.java @@ -22,6 +22,13 @@ public interface CoscoSupplierUserMapper { */ public CoscoSupplierUser selectCoscoSupplierUserById(String id); + /** + * 通过userId查询用户信息 + * @param userId + * @return + */ + public CoscoSupplierUser selectCoscoSupplierUserByUserId(String userId); + /** * 查询中远海运_供应商_供应商联系人列表 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java index d59f8df..d703f01 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessSupplier.java @@ -26,8 +26,10 @@ public class CoscoAccessSupplier extends CoscoBaseEntity { //准入部门id private String deptId; - //供应商准入状态（0.未准入、1.已准入） + //供应商准入状态（0.未准入、1.已准入、2.退出） private Long accessStatus; + private String accessStatusCn; + /** 准入工作id(cosco_access_work表主键) */ private String accessWorkId; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java index f1f62a2..0ef478c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java @@ -238,7 +238,8 @@ public class CoscoSupplierBase { //批量修改用 private List idList; - private List deptIdList; + //单位id + private String orgId; //合并后的统一社会信用代码 @ExcelProperty("统一社会信用代码") private String unifiedCode; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java index e111c0c..2ef5b8e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierChangeApply.java @@ -44,7 +44,7 @@ public class CoscoSupplierChangeApply extends CoscoBaseEntity { private String delFlag; /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java index 9d469e7..6c3c7e5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexit.java @@ -29,6 +29,10 @@ public class CoscoSupplierexit extends CoscoBaseEntity { /** 发起单位id */ //@Excel(name = "发起单位id") + private String orgId; + + /** 发起部门id */ + //@Excel(name = "发起单位id") private String deptId; /** 审批状态(0.待审批、1.通过、2.驳回) */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierUserService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierUserService.java index e60bd90..080f8f4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierUserService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierUserService.java @@ -21,6 +21,14 @@ public interface ICoscoSupplierUserService { */ public CoscoSupplierUser selectCoscoSupplierUserById(String id); + + /** + * 通过userId查询用户信息 + * @param userId + * @return + */ + public CoscoSupplierUser selectCoscoSupplierUserByUserId(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 c6c77dc..3c15c72 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 @@ -118,6 +118,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplier.setId(PropertyUtils.getSnowflakeId()); coscoAccessSupplier.setAccessWorkId(workId); coscoAccessSupplier.setSupplierId(sId); + coscoAccessSupplier.setOrgId(coscoAccessWork.getOrgId()); coscoAccessSupplier.setDeptId(coscoAccessWork.getDeptId()); coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); coscoAccessSupplierList.add(coscoAccessSupplier); @@ -247,6 +248,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplierCategory.setCategoryId(accessCategory.getCategoryId()); coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy()); coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy()); + coscoAccessSupplierCategory.setOrgId(coscoAccessWorkData.getOrgId()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); coscoAccessSupplierCategory.setId(PropertyUtils.getSnowflakeId()); coscoAccessSupplierCategory.setCreateTime(date); 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 40db4df..16dd9be 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 @@ -155,9 +155,10 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessUser.setAccessWorkId(id); List coscoAccessUserList = coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser); for(CoscoAccessUser accessUser : coscoAccessUserList){ - //TODO 获取评审人的所诉部门，等完善单位数据后 ，再确认一下 OrgDeptVo userDept = orgService.getOrgDeptInfo(accessUser.getDeptId()); accessUser.setDeptName(userDept.getOrgName()); + SysUser sysUser = userService.getUserInfo(accessUser.getUserId()); + accessUser.setUserName(sysUser.getName()); } vo.setCoscoAccessUserls(coscoAccessUserList); 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 d524e55..f29be3f 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 @@ -86,6 +86,8 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl selectWzrPageList(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); - //查询当前登录人的部门本级、上级、下级，所有已发起和已准入供应商id - //TODO 获取登录人的单位id，查询这个单位未发起准入，与未准入的数据 ---暂时没有 单位id，先随便取登录人OrganizationId BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - currentUser.getOrganizationId(); - List deptIds = new ArrayList<>(); - deptIds.add(currentUser.getOrganizationId()); - coscoSupplierBase.setDeptIdList(deptIds); - + coscoSupplierBase.setOrgId(currentUser.getOrganizationId()); //查询当前登录人的部门本级、上级、下级，以外的供应商数据 return coscoSupplierBaseMapper.selectWzrPageList(page, coscoSupplierBase); } @@ -123,6 +119,19 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getPage(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); IPage pageData = coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String orgId = currentUser.getOrganizationId(); + for(CoscoSupplierBase supplierBase : pageData.getRecords()){ + CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); + coscoAccessSupplier.setOrgId(orgId); + coscoAccessSupplier.setSupplierId(supplierBase.getId()); + List coscoAccessSupplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierList(coscoAccessSupplier); + if (!CollectionUtils.isEmpty(coscoAccessSupplierList)) { + supplierBase.setAccessStatusCn(coscoAccessSupplierList.get(0).getAccessStatusCn()); + }else{ + supplierBase.setAccessStatusCn(CoscoType.ACCESS_STATUS_WZR_CN); + } + } return pageData; } @@ -135,7 +144,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getHgSupplierBasePage(CoscoSupplierBase coscoSupplierBase) { IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); IPage pageData = coscoSupplierBaseMapper.getHeSupplierBasePage(page, coscoSupplierBase); - //TODO 暂时先这么写，后续如果准入主表添加，单位id与部门id，就通过2个id查询对应的名称，然后set进去 for(CoscoSupplierBase supplierBase : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(supplierBase.getDeptId()); supplierBase.setOrgName(orgDeptVo.getOrgName()); @@ -177,7 +185,6 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl getHeSupplierBaseExecList(CoscoSupplierBase coscoSupplierBase) { List list = coscoSupplierBaseMapper.getHeSupplierBaseExecList(coscoSupplierBase); - //TODO 暂时先这么写，后续如果准入主表添加，单位id与部门id，就通过2个id查询对应的名称，然后set进去 for(CoscoSupplierBase supplierBase : list){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(supplierBase.getDeptId()); supplierBase.setOrgName(orgDeptVo.getOrgName()); @@ -222,7 +229,10 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl coscoSupplierSurveyList = coscoSupplierSurveyMapper.selectCoscoSupplierSurveyList(coscoSupplierSurvey); + if (!CollectionUtils.isEmpty(coscoSupplierSurveyList)) { + vo.setCoscoSupplierSurvey(coscoSupplierSurveyList.get(0)); + } //问题回复信息 CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply = new CoscoSupplierSurveyQuestionReply(); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java index 7ea5fc0..7ac6884 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierUserServiceImpl.java @@ -70,6 +70,16 @@ public class CoscoSupplierUserServiceImpl implements ICoscoSupplierUserService { return coscoSupplierUser; } + /** + * 通过userid查询联系人信息 + * @param userId + * @return + */ + @Override + public CoscoSupplierUser selectCoscoSupplierUserByUserId(String userId) { + return coscoSupplierUserMapper.selectCoscoSupplierUserByUserId(userId); + } + /** * 查询中远海运_供应商_供应商联系人列表 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java index 9677dcc..02de7af 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java @@ -56,7 +56,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { public IPage getPage(CoscoSupplierexit data) { IPage page = new Page<>(data.getPageNo(), data.getPageSize()); IPage pageData = coscoSupplierexitMapper.selectPageList(page, data); - //TODO 暂时先这么写，后续如果主表添加，单位id与部门id，就通过2个id查询对应的名称，然后set进去 for(CoscoSupplierexit coscoSupplierexit : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoSupplierexit.getDeptId()); coscoSupplierexit.setOrgName(orgDeptVo.getOrgName()); @@ -72,19 +71,9 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { */ @Override public IPage getSupplierCategoryPage(CoscoAccessSupplierCategory data) { - //获取当前登录人的所有部门，查询这个人所有部门下的审批中的退出数据 ---因为审批通过的会在已准入品类表中删除所有不需要查审批通过的 - //TODO 先随便获取登录人的所在部门吧 - BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - List deptIds = new ArrayList<>(); - deptIds.add(currentUser.getOrganizationId()); - List categoryList = coscoAccessSupplierCategoryMapper.selectCategoryByDeptIdList(deptIds); - - //查询所有部门的没通过与审批中的数据 // 创建分页对象（当前页，每页大小） IPage page = new Page<>(data.getPageNo(), data.getPageSize()); - data.setCategoryList(categoryList); IPage pageData = coscoAccessSupplierCategoryMapper.selectExitCategoryList(page, data); - //TODO 暂时先这么写，后续如果主表添加，单位id与部门id，就通过2个id查询对应的名称，然后set进去 for(CoscoAccessSupplierCategory category : pageData.getRecords()){ OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId()); category.setDeptName(orgDeptVo.getDeptName()); @@ -180,6 +169,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { //基础信息保存--审批中 CoscoSupplierexit coscoSupplierexit = vo.getCoscoSupplierexit(); coscoSupplierexit.setId(exitId); + coscoSupplierexit.setDeptId(currentUser.getDeptId()); coscoSupplierexit.setCreateBy(userId); coscoSupplierexit.setCreateTime(date); coscoSupplierexit.setUpdateBy(userId); @@ -225,7 +215,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { coscoAccessSupplierCategoryList.add(coscoAccessSupplierCategory); } CoscoAccessSupplierCategory deleteCoscoAccessSupplierCategory = new CoscoAccessSupplierCategory(); - deleteCoscoAccessSupplierCategory.setDeptId(coscoSupplierexit.getDeptId()); + deleteCoscoAccessSupplierCategory.setOrgId(coscoSupplierexit.getOrgId()); deleteCoscoAccessSupplierCategory.setSupplierexitId(coscoSupplierexit.getId()); deleteCoscoAccessSupplierCategory.setCoscoAccessSupplierCategoryList(coscoAccessSupplierCategoryList); coscoAccessSupplierCategoryMapper.batchDeleteCoscoAccessSupplierCategory(deleteCoscoAccessSupplierCategory); @@ -233,13 +223,13 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { //查询该任务下的所有供应商 List supplierIdList = coscoSupplierexitSupplierMapper.selectSupplierIdList(coscoSupplierexit.getId()); - //查询任务下所有供应商在其他部门没有品类的供应商 + //查询任务下所有供应商在其他单位没有品类的供应商 CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setIdList(supplierIdList); List otherDeptSupplierId = coscoSupplierBaseMapper.selectCoscoSupplierBaseCountCategoryNum(coscoSupplierBase); - //查询任务下所有供应商在本部门没有品类的供应商 - coscoSupplierBase.setDeptId(coscoSupplierexit.getDeptId()); + //查询任务下所有供应商在本单位没有品类的供应商 + coscoSupplierBase.setOrgId(coscoSupplierexit.getOrgId()); List deptSupplierId = coscoSupplierBaseMapper.selectCoscoSupplierBaseCountCategoryNum(coscoSupplierBase); if (!CollectionUtils.isEmpty(otherDeptSupplierId)) { @@ -251,11 +241,11 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { } if (!CollectionUtils.isEmpty(deptSupplierId)) { - //准入供应商表状态修改,如果任务下的供应商在本部门下有没品类了直接修改为退出 + //准入供应商表状态修改,如果任务下的供应商在本单位下有没品类了直接修改为退出 //修改准入供应商关联表状态 CoscoAccessSupplier coscoAccessSupplier = new CoscoAccessSupplier(); coscoAccessSupplier.setIdList(deptSupplierId); - coscoAccessSupplier.setDeptId(coscoSupplierexit.getDeptId()); + coscoAccessSupplier.setOrgId(coscoSupplierexit.getOrgId()); coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_TC); coscoAccessSupplier.setSupplierexitId(coscoSupplierexit.getId());//退出任务表id coscoAccessSupplierMapper.batchUpdateCoscoAccessSupplierIdAndDeptId(coscoAccessSupplier); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index 933f76b..5c7f33d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -22,6 +22,13 @@ public class SupplierPageVo { private String nameEn; + + /** + * 单位ID + */ + private String orgId; + + /** * 部门ID */ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml index 88b2c90..d917a0d 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierCategoryMapper.xml @@ -53,7 +53,7 @@ and c.supplier_id = #{vo.supplierId} - and c.categoryId = #{vo.categoryId} + and c.category_id = #{vo.categoryId} and c.create_time >= #{vo.startTime} @@ -144,19 +144,19 @@ cosco_access_supplier_category c left join cosco_supplier_base s on c.supplier_id = s.id and s.del_flag = 'normal' left join cosco_category ca on c.category_id = ca.id and ca.del_flag = 'normal' - where c.del_flag = 'normal' and s.access_status = 1 and s.blacklist_status = 0 and s.greylist_status = 0 + left join ( + select cssc.category_id from cosco_supplierexit_supplier_category cssc + left join cosco_supplierexit cs on cs.id = cssc.supplierexit_id + where cs.approve_status in (0) and cs.del_flag = 'normal' + and cs.org_id = #{vo.orgId} + ) as exc on c.category_id = exc.category_id + where c.del_flag = 'normal' and s.access_status = 1 and exc.category_id is null and s.name like concat('%', #{vo.supplierName}, '%') and c.category_id = #{vo.categoryId} - - AND c.category_id NOT IN - - #{item} - - order by c.create_time desc @@ -290,7 +290,7 @@ UPDATE cosco_access_supplier_category SET del_flag = 'deleted',supplierexit_id = #{supplierexitId} - WHERE dept_id = #{deptId} + WHERE org_id = #{orgId} AND ( diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml index 465fadd..75dcd15 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml @@ -7,15 +7,18 @@ + + - - - - - + + + + + + @@ -40,6 +43,13 @@ WHEN s.supplier_type = 'ovs' THEN name_en ELSE name END AS supplierName, a.access_work_id, + a.access_status, + CASE a.access_status + WHEN 0 THEN '未准入' + WHEN 1 THEN '已准入' + WHEN 2 THEN '退出' + ELSE CAST(a.access_status AS CHAR) + END AS access_status_cn, a.supplier_id, a.org_id, a.dept_id @@ -101,6 +111,7 @@ and a.dept_id = #{deptId} + order by a.id desc + insert into cosco_supplier_user @@ -172,9 +177,6 @@ update cosco_supplier_user - supplier_id = - #{supplierId}, - user_id = #{userId}, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml index 5a2c460..7313967 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml @@ -8,6 +8,7 @@ + @@ -27,6 +28,7 @@ id, exit_theme, exit_reason, + org_id, dept_id, approve_status, CASE @@ -55,6 +57,9 @@ and exit_reason = #{vo.exitReason} + + and org_id = #{vo.orgId} + and dept_id = #{vo.deptId} @@ -86,6 +91,9 @@ and exit_reason = #{exitReason} + + and org_id = #{orgId} + and dept_id = #{deptId} @@ -114,6 +122,7 @@ id, exit_theme, exit_reason, + org_id, dept_id, approve_status, work_flow_id, @@ -128,6 +137,7 @@ #{id}, #{exitTheme}, #{exitReason}, + #{orgId}, #{deptId}, #{approveStatus}, #{workFlowId},