diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java index 731158d..9df3fdc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java @@ -16,6 +16,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWork import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessWorkService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierexitService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -73,7 +74,7 @@ public class SynchronousController { * 供应商准入审批回调接口 */ @PostMapping("/receiveApprove") - public BaseResponse receiveApprove(@RequestBody CoscoAccessWork vo) { + public BaseResponse receiveApprove(@RequestBody CoscoAccessWork vo) { return BaseResponse.success(coscoAccessWorkService.receiveApprove(vo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java new file mode 100644 index 0000000..b6239f1 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/MessageType.java @@ -0,0 +1,12 @@ +package com.chinaunicom.zyhy.ebtp.supplier.common; + +public class MessageType { + + //供应商准入审批处理完成 + public static final String MESSAGETYPE_GYSZR = "MESSAGETYPE_GYSZR"; + + + + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java new file mode 100644 index 0000000..948932c --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/ServiceException.java @@ -0,0 +1,74 @@ +package com.chinaunicom.zyhy.ebtp.supplier.common; + +/** + * 业务异常 + * + * @author ruoyi + */ +public final class ServiceException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细，内部调试错误 + * + * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法，避免反序列化问题 + */ + public ServiceException() + { + } + + public ServiceException(String message) + { + this.message = message; + } + + public ServiceException(String message, Integer code) + { + this.message = message; + this.code = code; + } + + public String getDetailMessage() + { + return detailMessage; + } + + @Override + public String getMessage() + { + return message; + } + + public Integer getCode() + { + return code; + } + + public ServiceException setMessage(String message) + { + this.message = message; + return this; + } + + public ServiceException setDetailMessage(String detailMessage) + { + this.detailMessage = detailMessage; + return this; + } +} \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLog.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLog.java new file mode 100644 index 0000000..a9881aa --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLog.java @@ -0,0 +1,10 @@ +package com.chinaunicom.zyhy.ebtp.supplier.common.aop; + +import java.lang.annotation.*; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface MessageLog { + String messageType() default "SYSTEM"; // 消息类型 +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java new file mode 100644 index 0000000..a785243 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java @@ -0,0 +1,113 @@ +package com.chinaunicom.zyhy.ebtp.supplier.common.aop; + +import com.alibaba.nacos.common.utils.StringUtils; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.expression.EvaluationContext; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; +import org.springframework.stereotype.Component; + +import java.util.*; + +@Aspect +@Component +@RequiredArgsConstructor +@Slf4j +public class MessageLogAspect { + + @Autowired + private ICoscoMessageService coscoMessageService; + + + // 修改点1：切点定义中添加参数绑定 + @Pointcut("@annotation(messageLog)") + public void messageLogPointCut(MessageLog messageLog) {} + + // 成功执行后切入 + @Around("messageLogPointCut(messageLog)") + public Object around(ProceedingJoinPoint joinPoint, MessageLog messageLog) throws Throwable { + String messageType = messageLog.messageType(); + // 1. 先执行目标方法 + Object result = joinPoint.proceed(); + + // 2. 方法执行完后再处理消息逻辑 + try { + if(MessageType.MESSAGETYPE_GYSZR.equals(messageType)){//供应商准入审批处理 + pustMessageSupplierWork(result,messageType); + } + } catch (Exception e) { + e.printStackTrace(); + log.error("消息处理失败（不影响主流程）", e); + } + + return result; + } + + /** + * 供应商准入审批处里 + */ + public void pustMessageSupplierWork(Object result,String messageType){ + if (result instanceof CoscoSupplierAccessWorkVo) { + CoscoSupplierAccessWorkVo vo = (CoscoSupplierAccessWorkVo) result; + List coscoMessageList = new ArrayList<>(); + // 使用转换后的对象 + for(CoscoAccessSupplier coscoAccessSupplier : vo.getSupplierList()){ + String approveStr = ""; + if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + approveStr = "通过"; + }else{ + approveStr = "驳回"; + } + String cont = coscoAccessSupplier.getSupplierName()+"供应商准入"+vo.getDeptId()+"部门"+approveStr; + coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getSupplierId(),cont,messageType)); + } + pustMessage(coscoMessageList); + } else { + throw new IllegalArgumentException("返回对象类型不匹配"); + } + } + + /** + * 封装实体 + * @param receiverId + * @param cont + * @param messageType + */ + public CoscoMessage coscoMessageData(String receiverId,String cont,String messageType){ + Date time = CoscoDateUtils.getNowDate(); + CoscoMessage coscoMessage = new CoscoMessage(); + coscoMessage.setCreateTime(time); + coscoMessage.setUpdateTime(time); + coscoMessage.setId(CoscoIdUtil.getId()); + coscoMessage.setReceiverId(receiverId); + coscoMessage.setContent(cont); + coscoMessage.setType(messageType); + return coscoMessage; + } + + + /** + * 保存消息数据 + */ + public int pustMessage(List coscoMessageList){ + return coscoMessageService.pustMessage(coscoMessageList); + } + + +} \ No newline at end of file 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 d85bae1..10a51ac 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 @@ -35,6 +35,10 @@ public interface CoscoMessageMapper { */ public int insertCoscoMessage(CoscoMessage coscoMessage); + public int batchCoscoMessage(List coscoMessage); + + + /** * 修改供应商业务处理消息推送 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java index bf03da4..4f954f6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUserItemVo.java @@ -10,6 +10,9 @@ public class CoscoAccessUserItemVo { //准入申请主表Id private String accessWorkId; + //暂时写死额的userId + private String userId; + //打分用的集合 private List coscoAccessUserItemList; 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 c9fdc07..0a982f5 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 @@ -79,4 +79,9 @@ public class CoscoAccessWork extends CoscoBaseEntity { private String categoryName; + /** 是否为组长(0.否、1.是) */ + //@Excel(name = "是否为组长(0.否、1.是)") + private Long isLeader; + + } 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 6f98c2c..562b3fb 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 @@ -1,7 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo; import java.util.List; @@ -86,7 +88,7 @@ public interface ICoscoAccessWorkService { * 接受审批返回值 * @return */ - public Boolean receiveApprove(CoscoAccessWork vo); + public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo); } 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 c383127..aa2a390 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 @@ -27,12 +27,14 @@ public interface ICoscoMessageService { */ public List selectCoscoMessageList(CoscoMessage coscoMessage); + public int insertCoscoMessage(CoscoMessage coscoMessage); + /** * 新增供应商业务处理消息推送 * * @return 结果 */ - public int pustMessage(String receiverId,String content,String type); + public int pustMessage(List coscoMessageList); /** * 修改供应商业务处理消息推送 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 64f31e8..1c4fdf6 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 @@ -5,13 +5,14 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; -import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; -import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; -import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.common.*; +import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; 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.ICoscoAccessWorkService; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWorkVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,7 +63,22 @@ 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 paegList = coscoAccessWorkMapper.selectPageList(page, data); + List coscoAccessWorks = paegList.getRecords(); + for(CoscoAccessWork coscoAccessWork : coscoAccessWorks){ + CoscoAccessUser coscoAccessUser = new CoscoAccessUser(); + coscoAccessUser.setAccessWorkId(coscoAccessWork.getId()); + //暂时这么写，这里需要获取登录人信息 + coscoAccessUser.setUserId(data.getCreateBy()); + coscoAccessUser.setIsLeader(CoscoType.IS_LEADER_SHI); + if(coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser).size() > 0){ + coscoAccessWork.setIsLeader(CoscoType.IS_LEADER_SHI); + }else{ + coscoAccessWork.setIsLeader(CoscoType.IS_LEADER_FO); + } + + } + return paegList; } @Override @@ -364,7 +380,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { @Override @Transactional public Boolean updateCoscoAccessWork(CoscoAccessUserItemVo vo) { - String userId = "USER001"; + //String userId = "USER001"; + String userId =vo.getUserId(); if(vo.getCoscoAccessUserItemList() != null){ for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){ //修改评审项关联评审人员表 @@ -504,18 +521,24 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { */ @Override @Transactional - public Boolean receiveApprove(CoscoAccessWork vo) { + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSZR) + public CoscoSupplierAccessWorkVo receiveApprove(CoscoAccessWork vo) { + + //aop返回对象 + CoscoSupplierAccessWorkVo coscoSupplierAccessWorkVo = new CoscoSupplierAccessWorkVo(); + List supplierIdList = new ArrayList<>(); + //先验证一下主任务表数据状态 CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId()); if(coscoAccessWorkData == null){ - return true; + throw new IllegalArgumentException("任务信息不能为空"); } if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) || CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){ - return true; + throw new IllegalArgumentException("该任务已处理完成"); } //修改任务主表审批状态--通过或者驳回 @@ -525,7 +548,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessWork.setWorkFlowId(vo.getWorkFlowId()); coscoAccessWork.setUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessWork.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); + //coscoAccessWorkMapper.updateCoscoAccessWork(coscoAccessWork); //审批通过 if(vo.getApproveStatus().equals(CoscoType.APPROVE_STATUS_TG)){ @@ -555,7 +578,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessSupplierCategory.setUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessSupplierCategory.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); - coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); + //coscoAccessSupplierCategoryMapper.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } //修改注册信息表状态 @@ -566,19 +589,23 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoSupplierBase.setUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierBase.setLastUpdateTime(CoscoDateUtils.getNowDate()); coscoSupplierBase.setDeptId(coscoAccessWorkData.getDeptId()); - coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); + //coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); //修改准入供应商表状态 CoscoAccessSupplier coscoAccessSupplier2 = new CoscoAccessSupplier(); coscoAccessSupplier2.setId(coscoAccessSupplier1.getId()); coscoAccessSupplier2.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); - coscoAccessSupplierMapper.updateCoscoAccessSupplier(coscoAccessSupplier2); + //coscoAccessSupplierMapper.updateCoscoAccessSupplier(coscoAccessSupplier2); + + supplierIdList.add(coscoAccessSupplier1); } } - - return true; + coscoSupplierAccessWorkVo.setSupplierList(supplierIdList); + coscoSupplierAccessWorkVo.setApproveStatus(vo.getApproveStatus()); + coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId()); + return coscoSupplierAccessWorkVo; } } 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 bbf5aad..52af583 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 @@ -43,6 +43,18 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { return coscoMessageMapper.selectCoscoMessageList(coscoMessage); } + /** + * 消息保存接口 + * @param coscoMessage + * @return + */ + @Override + public int insertCoscoMessage(CoscoMessage coscoMessage) { + coscoMessage.setId(CoscoIdUtil.getId()); + coscoMessage.setCreateTime(CoscoDateUtils.getNowDate()); + return coscoMessageMapper.insertCoscoMessage(coscoMessage); + } + /** * 消息保存接口 * @param receiverId 接收人id @@ -51,13 +63,11 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { * @return */ @Override - public int pustMessage(String receiverId,String content,String type) { - CoscoMessage coscoMessage = new CoscoMessage(); - coscoMessage.setId(CoscoIdUtil.getId()); - coscoMessage.setCreateTime(CoscoDateUtils.getNowDate()); - return coscoMessageMapper.insertCoscoMessage(coscoMessage); + public int pustMessage(List coscoMessageList) { + return coscoMessageMapper.batchCoscoMessage(coscoMessageList); } + /** * 修改供应商业务处理消息推送 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java index f41a7c5..72032f3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java @@ -112,8 +112,8 @@ public class SupplierSyncTask { //2.供应商提示语：您的企业营业执照将于XXX日到期，请及时更新 // //供应商营业执照过期分提前30天、提前15天、提前7天、已经过期四种类型时间点分别推送营业执照过期提示系统信息，分别发送准入单位及供应商 - coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商营业执照将于"+endTime+"日到期",type); - coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业营业执照将于"+endTime+"日到期，请及时更新",type); + //coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商营业执照将于"+endTime+"日到期",type); + // coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业营业执照将于"+endTime+"日到期，请及时更新",type); } private void sendNotificationZzxx(CoscoSupplierBase supplier,CoscoSupplierQualifications qualifications ,String title, String endTime,String type) { @@ -121,8 +121,8 @@ public class SupplierSyncTask { //2.供应商提示语：您的企业XXX资质将于XXX日到期，请及时更新 // //供应商资质过期分提前30天、提前15天、提前7天、已经过期四种类型时间点分别推送资质过期提示系统信息，分别发送准入单位及供应商 - coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商"+qualifications.getName()+"资质将于"+endTime+"日到期",type); - coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业"+qualifications.getName()+"资质将于"+endTime+"日到期，请及时更新",type); + //coscoMessageService.pustMessage(supplier.getCreateBy(),"准入单位提示语：您的准入的"+supplier.getName()+"供应商"+qualifications.getName()+"资质将于"+endTime+"日到期",type); + //coscoMessageService.pustMessage(supplier.getCreateBy(),"供应商提示语：您的企业"+qualifications.getName()+"资质将于"+endTime+"日到期，请及时更新",type); } //移除供应商所有信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java new file mode 100644 index 0000000..7dd66f8 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java @@ -0,0 +1,28 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo; + +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; +import lombok.Data; + +import java.util.List; + +@Data +public class CoscoSupplierAccessWorkVo { + + /** + * 供应商id集合 + */ + List supplierList; + + /** + * 审批状态 + */ + Long approveStatus; + + + /** + * 准入部门 + */ + String deptId; + + +}