liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息推送修改

Browse Source
This commit is contained in:
TL
2025-07-22 13:19:28 +08:00
parent 16ff5ace6a
commit 5fe4dfd02e
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java
View File

@ -86,7 +86,7 @@ public class MessageLogAspect {
if(MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)){//供应商资质信息处理
pustMessageSupplierCategoryZzxx(result,messageType);
}
if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商资质信息处理
if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商评审消息处理
pustMessageSupplierCategoryPsry(result,messageType);
}
} catch (Exception e) {
@ -207,7 +207,7 @@ public class MessageLogAspect {
} else {
approveStr = "已驳回";
}
String cont = coscoAccessSupplier.getSupplierName() + "，准入" + vo.getDeptId() + "部门，" + approveStr;
String cont = coscoAccessSupplier.getSupplierName() + "，准入" + vo.getOrgName() + "单位，" + approveStr;
coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getSupplierId(), cont, messageType));
}
pustMessage(coscoMessageList);
@ -232,7 +232,7 @@ public class MessageLogAspect {
approveStr = "已驳回";
}
String cont = coscoAccessCategory.getSupplierName() + "，准入" +
vo.getDeptId() + "部门的" +
vo.getOrgName() + "单位的" +
coscoAccessCategory.getCategoryName() + "品类，" + approveStr;
coscoMessageList.add(coscoMessageData(coscoAccessCategory.getSupplierId(), cont, messageType));
}
@ -258,7 +258,7 @@ public class MessageLogAspect {
approveStr = "已驳回";
}
String cont = coscoSupplierexitSupplierCategory.getSupplierName()+"，"+
coscoSupplierexitSupplierCategory.getDeptId()+"部门的"+
vo.getOrgName()+"单位的"+
coscoSupplierexitSupplierCategory.getCategoryName()+"品类退出，"+approveStr;
coscoMessageList.add(coscoMessageData(coscoSupplierexitSupplierCategory.getSupplierId(),cont,messageType));
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java
View File

@ -68,10 +68,12 @@ public class CoscoMessageController extends BaseController {
CoscoMessage coscoMessage = new CoscoMessage();
coscoMessage.setRead(0l);//未读
coscoMessage.setType(MessageType.MESSAGETYPE_GYSPLTC);
//获取登录人供应商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.getExitMge(coscoMessage));
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
View File

@ -207,7 +207,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
//封装消息内容实体
coscoSupplierAccessWorkVo.setSupplierAndCategoryList(supplierAndCateGoryList);
coscoSupplierAccessWorkVo.setApproveStatus(coscoAccessWorkData.getApproveStatus());
coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId());
coscoSupplierAccessWorkVo.setOrgName(orgService.getOrgInfo(coscoAccessWorkData.getOrgId()).getOrgName());
return coscoSupplierAccessWorkVo;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -753,7 +753,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//封装消息内容实体
coscoSupplierAccessWorkVo.setSupplierList(supplierMessageList);
coscoSupplierAccessWorkVo.setApproveStatus(coscoAccessWorkData.getApproveStatus());
coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId());
coscoSupplierAccessWorkVo.setOrgName(orgService.getOrgInfo(coscoAccessWorkData.getOrgId()).getOrgName());
return coscoSupplierAccessWorkVo;
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
View File

@ -257,6 +257,9 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
coscoSupplierExitSupplierCategoryVo.setCoscoSupplierexitSupplierCategoryList(categoryList);
//审批状态
coscoSupplierExitSupplierCategoryVo.setApproveStatus(coscoSupplierexit.getApproveStatus());
//查询单位名称，推送消息给该单位
coscoSupplierExitSupplierCategoryVo.setOrgName(orgService.getOrgInfo(coscoSupplierexit.getOrgId()).getOrgName());
return coscoSupplierExitSupplierCategoryVo;
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java
View File

@ -31,6 +31,11 @@ public class CoscoSupplierAccessWorkVo {
* 准入部门
*/
String deptId;
/**
* 准入单位
*/
String orgName;
}

1
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java
View File

@ -18,4 +18,5 @@ public class CoscoSupplierExitSupplierCategoryVo {
*/
Long approveStatus;
String orgName;
}