From d91bfaac6dde14384129582a24ef20fe57d99dd8 Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Mon, 11 Aug 2025 15:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CoscoMessageController.java | 26 ++++++++++++++++++- .../dao/mapper/CoscoMessageMapper.java | 3 +++ .../coscosupplier/entity/CoscoAccessUser.java | 7 +++++ .../service/ICoscoMessageService.java | 2 ++ .../impl/CoscoAccessWorkServiceImpl.java | 2 ++ .../service/impl/CoscoMessageServiceImpl.java | 5 ++++ .../base/dao/mapper/CoscoAccessWorkMapper.xml | 12 --------- .../base/dao/mapper/CoscoMessageMapper.xml | 19 ++++++++++++++ .../mapper/CoscoSupplierChangeApplyMapper.xml | 17 ------------ 9 files changed, 63 insertions(+), 30 deletions(-) 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 cf9c3a2..a09e518 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 @@ -59,7 +59,7 @@ public class CoscoMessageController extends BaseController { } /** - * 获取这个登录的供应商所有未读品类退出消息 + * 获取这个登录的供应商所有未读品类退出消息--(暂时只有供应商能用上) * @return */ @ApiOperation("查询数据") @@ -78,6 +78,30 @@ public class CoscoMessageController extends BaseController { } + /** + * 获取当前登录人所有未读消息 + * @return + */ + @ApiOperation("查询数据") + @GetMapping("/getCountMessage") + public BaseResponse getCountMessage() { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + CoscoMessage coscoMessage = new CoscoMessage(); + coscoMessage.setRead(0l);//未读 + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId()); + }else{ + coscoMessage.setReceiverId(currentUser.getUserId()); + } + return BaseResponse.success(coscoMessageService.getCountMessage(coscoMessage)); + } + + + + + /** * 批量修改已读状态----暂时没用 * @param ids diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java index 1b9a6e4..884f2ac 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java @@ -31,6 +31,9 @@ public interface CoscoMessageMapper { List selectCoscoMessageList(CoscoMessage vo); + String selectCountMessage(CoscoMessage vo); + + /** * 新增供应商业务处理消息推送 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java index d62afa7..a00c6ba 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java @@ -57,9 +57,16 @@ public class CoscoAccessUser extends CoscoBaseEntity { */ private String deptName; + /** + * 单位名称 + */ + private String orgName; + /** * 人员名称 */ private String userName; + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java index ac8fb06..4286157 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java @@ -21,6 +21,8 @@ public interface ICoscoMessageService { List getExitMge(CoscoMessage data); + String getCountMessage(CoscoMessage data); + /** * 查询供应商业务处理消息推送 * 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 cbff870..cbd65bf 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 @@ -190,6 +190,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id); SysOrg dept = orgService.getOrgInfo(coscoAccessWork.getDeptId()); coscoAccessWork.setDeptName(dept.getOrgName());//准入部门 + coscoAccessWork.setOrgName(dept.getCuCompanyName());//准入单位 vo.setCoscoAccessWork(coscoAccessWork); //供应商信息 @@ -224,6 +225,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { if (deptId != null && orgMap.containsKey(deptId)) { SysOrg org = orgMap.get(deptId); accessUser.setDeptName(org.getOrgName()); + accessUser.setOrgName(org.getCuCompanyName());// 设置单位名称 } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java index 388e419..7542168 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java @@ -53,6 +53,11 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { return coscoMessageList; } + @Override + public String getCountMessage(CoscoMessage data) { + return coscoMessageMapper.selectCountMessage(data); + } + /** * 查询供应商业务处理消息推送 * diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml index 30ef011..da51c7c 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml @@ -65,12 +65,6 @@ WHEN w.review_status = 3 THEN '已完成' ELSE CAST(w.review_status AS CHAR) END AS review_status_text, - CASE - WHEN w.approve_status = 0 THEN '审批中' - WHEN w.approve_status = 1 THEN '通过' - WHEN w.approve_status = 2 THEN '驳回' - ELSE CAST(w.approve_status AS CHAR) - END AS approve_status_text, w.work_flow_id, w.create_by, w.create_time, @@ -108,12 +102,6 @@ WHEN w.review_status = 3 THEN '已完成' ELSE CAST(w.review_status AS CHAR) END AS review_status_text, - CASE - WHEN w.approve_status = 0 THEN '审批中' - WHEN w.approve_status = 1 THEN '通过' - WHEN w.approve_status = 2 THEN '驳回' - ELSE CAST(w.approve_status AS CHAR) - END AS approve_status_text, w.work_flow_id, w.create_by, w.create_time, diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml index 3625afa..077dfc1 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml @@ -64,6 +64,25 @@ + + +