From 19d3c883fa92aa9744c837b5c6d8a4dd49c84a94 Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Wed, 16 Jul 2025 10:56:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/OrgController.java | 2 +- .../supplier/base/service/IOrgService.java | 7 ++- .../base/service/impl/OrgServiceImpl.java | 22 ++++++++- .../controller/CoscoMessageController.java | 10 +++- .../CoscoSupplierBaseController.java | 8 ++- .../coscosupplier/entity/CoscoAccessWork.java | 5 ++ .../CoscoSupplierSurveyQuestionReply.java | 2 + .../impl/CoscoAccessWorkServiceImpl.java | 19 ++++--- .../impl/CoscoSupplierBaseServiceImpl.java | 9 ++++ .../supplier/coscosupplier/vo/OrgDeptVo.java | 26 ++++++++++ .../dao/mapper/CoscoSupplierSurveyMapper.xml | 49 ++++++++++--------- ...CoscoSupplierSurveyQuestionReplyMapper.xml | 45 +++++++++++------ 12 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/OrgDeptVo.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 index fc20213..646eb1a 100644 --- 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 @@ -28,7 +28,7 @@ public class OrgController { @ApiOperation("查询机构详细信息") @GetMapping("/{id}") public BaseResponse getOrgInfo(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - return orgService.getOrgInfo(id); + return BaseResponse.success(orgService.getOrgInfo(id)); } @ApiOperation("查询机构列表") 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 index d4169dc..9edcfdf 100644 --- 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 @@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.service; import com.chinaunicom.mall.ebtp.common.base.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; import java.util.List; @@ -24,7 +25,11 @@ public interface IOrgService { * @param id * @return */ - BaseResponse getOrgInfo(String id); + SysOrg getOrgInfo(String id); + OrgDeptVo getOrgDeptInfo(String id); + + + /** * 查询机构列表 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 d02ff7c..1766930 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 @@ -5,8 +5,10 @@ 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 com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.util.*; import java.util.stream.Collectors; @@ -34,8 +36,24 @@ public class OrgServiceImpl implements IOrgService { * @return */ @Override - public BaseResponse getOrgInfo(String id) { - return systemClient.getOrgInfo(id); + public SysOrg getOrgInfo(String id) { + return systemClient.getOrgInfo(id).getData(); + } + + @Override + public OrgDeptVo getOrgDeptInfo(String id) { + OrgDeptVo orgDeptVo = new OrgDeptVo(); + SysOrg dept = systemClient.getOrgInfo(id).getData(); + if(!ObjectUtils.isEmpty(dept)){ + SysOrg org = systemClient.getOrgInfo(dept.getUpOrgId()).getData(); + if(!ObjectUtils.isEmpty(org)){ + orgDeptVo.setOrgId(org.getOrgId()); + orgDeptVo.setOrgName(org.getOrgName()); + } + orgDeptVo.setDeptId(dept.getOrgId()); + orgDeptVo.setDeptName(dept.getOrgName()); + } + return orgDeptVo; } /** 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 51ecb9c..6a830f2 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 @@ -4,7 +4,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.base.constant.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; @@ -34,6 +36,10 @@ public class CoscoMessageController extends BaseController { @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); return BaseResponse.success(coscoMessageService.getPage(coscoMessage)); } @@ -55,7 +61,9 @@ public class CoscoMessageController extends BaseController { coscoMessage.setRead(0l);//未读 coscoMessage.setType(MessageType.MESSAGETYPE_GYSPLTC); //获取登录人供应商id - coscoMessage.setReceiverId("1939870786604302336"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//登录人id + coscoMessage.setReceiverId(userId); return BaseResponse.success(coscoMessageService.getExitMge(coscoMessage)); } 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 a9a0210..ad4049b 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 @@ -300,7 +300,9 @@ public class CoscoSupplierBaseController extends BaseController { //如果id是就自己查 if(StringUtils.isEmpty(vo.getSupplierId())){ //获取登录人信息 - vo.setSupplierId("1939870859522277376"); + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + String userId = currentUser.getUserId();//登录人id + vo.setSupplierId(userId); } return BaseResponse.success(coscoSupplierBaseService.getZrCategoryPage(vo)); } @@ -316,7 +318,9 @@ public class CoscoSupplierBaseController extends BaseController { @GetMapping("/getSupplierInfo/{id}") public BaseResponse getCoscoSupplierBase(@ApiParam(value = "主键id", required = true) @PathVariable String id){ //获取登录人信息 - id = "1942424482567487488"; + //获取登录人信息 + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + id = currentUser.getUserId();//登录人id return BaseResponse.success(coscoSupplierBaseService.getCoscoSupplierBase(id)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java index 0e96108..e2831fb 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWork.java @@ -92,4 +92,9 @@ public class CoscoAccessWork extends CoscoBaseEntity { //品类名集合 private List categoryNameList; + + //单位名称 + private String orgName; + //部门名称 + private String deptName; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java index b7c8b6f..a62cd78 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierSurveyQuestionReply.java @@ -39,5 +39,7 @@ public class CoscoSupplierSurveyQuestionReply extends CoscoBaseEntity { //@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + //问题名 + private String questionName; } 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 66e3ef8..d64c094 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 @@ -3,8 +3,10 @@ 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.entity.SysOrg; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; @@ -14,10 +16,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplier import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessItemVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessUserItemVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,6 +61,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { private ICoscoAccessItemAttachmentsService coscoAccessItemAttachmentsService; @Autowired private ICoscoMessageService coscoMessageService; + @Autowired + private IOrgService orgService; /** @@ -74,7 +75,13 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { IPage page = new Page<>(data.getPageNo(), data.getPageSize()); //只查询供应商准入 data.setApplyType(CoscoType.APPLY_TYPE_GYSZR); - return coscoAccessWorkMapper.selectPageList(page, data); + IPage pageData = coscoAccessWorkMapper.selectPageList(page, data); + for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){ + OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId()); + coscoAccessWork.setOrgName(orgDeptVo.getOrgName()); + coscoAccessWork.setDeptName(orgDeptVo.getDeptName()); + } + return pageData; } @Override @@ -82,7 +89,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { IPage page = new Page<>(data.getPageNo(), data.getPageSize()); //只查询供应商准入 data.setApplyType(CoscoType.APPLY_TYPE_GYSZR); - return coscoAccessWorkMapper.selectCoscoAccessWorkUserReviewPage(page, data); + return coscoAccessWorkMapper.selectCoscoAccessWorkUserReviewPage(page, data); } @Override 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 338e462..dcd3ada 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 @@ -173,6 +173,15 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl - - and supplier_id = #{supplierId} - - - and supplier_name like concat('%', #{supplierName}, '%') - - - and name like concat('%', #{name}, '%') - - - and position = #{position} - - - and phone = #{phone} - - - and email = #{email} - - - and date_time = #{dateTime} - - - and last_update_time = #{lastUpdateTime} - + del_flag = 'normal' + + and supplier_id = #{supplierId} + + + and supplier_name like concat('%', #{supplierName}, '%') + + + and name like concat('%', #{name}, '%') + + + and position = #{position} + + + and phone = #{phone} + + + and email = #{email} + + + and date_time = #{dateTime} + + + and last_update_time = #{lastUpdateTime} + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierSurveyQuestionReplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierSurveyQuestionReplyMapper.xml index 1340652..dcdaa86 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierSurveyQuestionReplyMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierSurveyQuestionReplyMapper.xml @@ -15,35 +15,50 @@ + - select id, supplier_id, survey_question_id, reply_value, del_flag, create_by, create_time, update_by, update_time, last_update_time - from cosco_supplier_survey_question_reply + SELECT + cssqr.id, + cssqr.supplier_id, + cssqr.survey_question_id, + csq.question_name, + cssqr.reply_value, + cssqr.del_flag, + cssqr.create_by, + cssqr.create_time, + cssqr.update_by, + cssqr.update_time, + cssqr.last_update_time + FROM + cosco_supplier_survey_question_reply cssqr + LEFT JOIN cosco_survey_question csq ON cssqr.survey_question_id = csq.id