diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java index 3db94e9..b8ed5be 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/MessageType.java @@ -32,6 +32,18 @@ public class MessageType { */ public static final String MESSAGETYPE_GYSNDJY = "MESSAGETYPE_GYSNDJY"; + /** + * MESSAGETYPE_GYSNDJYSH：GYS = 供应商（Supplier），ND = 年度（Annual），JY = 评价（Evaluation），SH = 审核（Review） + * 表示：供应商年度评价处理完成 + */ + public static final String MESSAGETYPE_GYSNDJYSH = "MESSAGETYPE_GYSNDJYSH"; + /** + * MESSAGETYPE_GYSLKRQSH：GYS = 供应商（Supplier），PL = 品类（Category），LKRQ = 库入库（Library Receipt） + * 表示：供应商品类库入库审核完成 + */ + public static final String MESSAGETYPE_GYSLKRQSH = "MESSAGETYPE_GYSLKRQSH"; + + /** * MESSAGETYPE_GYSPLZR：GYS = 供应商（Supplier），PL = 品类（Category），ZR = 准入（Admission） * 表示：供应商品类准入审批处理完成 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 c67b28b..aac1cea 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 @@ -59,7 +59,7 @@ public class SynchronousController { public BaseResponse categroyLibraryApproval(@RequestBody CoscoCategoryLibrary coscoCategoryLibrary) { int i = coscoCategoryLibraryService .synchronousCategroyLibraryApproval(coscoCategoryLibrary); - if(i<=0){ + if (i <= 0) { return BaseResponse.fail(ErrorMessageConstant.NO_APPROVAL_ORDER_FOUND); } return BaseResponse.success(); @@ -70,8 +70,8 @@ public class SynchronousController { */ @PostMapping("/librarySupplierApply") public BaseResponse librarySupplierApply(@RequestBody CoscoCategoryLibrarySupplierApply librarySupplierApply) { - return BaseResponse.success(coscoCategoryLibrarySupplierApplyService - .synchronousLibrarySupplierApply(librarySupplierApply)); + coscoCategoryLibrarySupplierApplyService.synchronousLibrarySupplierApply(librarySupplierApply); + return BaseResponse.success(); } @@ -88,8 +88,8 @@ public class SynchronousController { } //验证当前工作任务是否已经处理完成 - if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) || - CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){ + if (CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) || + CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus())) { return BaseResponse.fail("该任务已处理完成"); } //审批状态 @@ -111,8 +111,8 @@ public class SynchronousController { } //验证当前工作任务是否已经处理完成 - if(CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) || - CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus()) ){ + if (CoscoType.APPROVE_STATUS_TG.equals(coscoAccessWorkData.getApproveStatus()) || + CoscoType.APPROVE_STATUS_BH.equals(coscoAccessWorkData.getApproveStatus())) { return BaseResponse.fail("该任务已处理完成"); } //审批状态 @@ -131,8 +131,8 @@ public class SynchronousController { if (ObjectUtils.isEmpty(coscoSupplierexit)) { return BaseResponse.fail("任务信息不能为空"); } - if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) || - CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus()) ){ + if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) || + CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierexit.getApproveStatus())) { return BaseResponse.fail("任务已处理完成"); } @@ -168,8 +168,8 @@ public class SynchronousController { return BaseResponse.fail("任务信息不能为空"); } //先验证一下主任务表数据状态 - if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) || - CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){ + if (CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierChangeApply.getApproveStatus()) || + CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus())) { return BaseResponse.fail("任务已处理完成"); } coscoSupplierChangeApply.setApproveStatus(vo.getApproveStatus()); 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 index 355a37a..1670315 100644 --- 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 @@ -8,7 +8,13 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; 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; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.MessageAnnualreviewVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ApplySupplierSupplierName; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.ApproveVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; @@ -49,10 +55,10 @@ public class MessageLogAspect { private CoscoSupplierBaseMapper coscoSupplierBaseMapper; - // 修改点1：切点定义中添加参数绑定 @Pointcut("@annotation(messageLog)") - public void messageLogPointCut(MessageLog messageLog) {} + public void messageLogPointCut(MessageLog messageLog) { + } // 成功执行后切入 @Around("messageLogPointCut(messageLog)") @@ -77,6 +83,14 @@ public class MessageLogAspect { //供应商年度评价开始处理 pustMessageAnnualreviewStart(result, messageType); } + if (MessageType.MESSAGETYPE_GYSNDJYSH.equals(messageType)) { + //供应商年度评价处理完成 + pustMessageSupplierAnnualreviewSH(result, messageType); + } + if (MessageType.MESSAGETYPE_GYSLKRQSH.equals(messageType)) { + //供应商品类库入库处理完成 + pustLibrarySupplierWork(result, messageType); + } if (MessageType.MESSAGETYPE_GYSJYSH.equals(messageType)) { //供应商评价处理完成 pustMessageEvaluateEnd(result, messageType); @@ -86,20 +100,20 @@ public class MessageLogAspect { pustMessageBlackEnd(result, messageType); } - if(MessageType.MESSAGETYPE_GYSPLTC.equals(messageType)){//供应商品类退出审批处理 - pustMessageSupplierCategoryTc(result,messageType); + if (MessageType.MESSAGETYPE_GYSPLTC.equals(messageType)) {//供应商品类退出审批处理 + pustMessageSupplierCategoryTc(result, messageType); } - if(MessageType.MESSAGETYPE_GYSJCXX.equals(messageType)){//供应商基础信息审批处理 - pustMessageSupplierCategoryJcxx(result,messageType); + if (MessageType.MESSAGETYPE_GYSJCXX.equals(messageType)) {//供应商基础信息审批处理 + pustMessageSupplierCategoryJcxx(result, messageType); } - if(MessageType.MESSAGETYPE_GYSYYZZ.equals(messageType)){//供应商营业执照处理 - pustMessageSupplierCategoryYyzz(result,messageType); + if (MessageType.MESSAGETYPE_GYSYYZZ.equals(messageType)) {//供应商营业执照处理 + pustMessageSupplierCategoryYyzz(result, messageType); } - if(MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)){//供应商资质信息处理 - pustMessageSupplierCategoryZzxx(result,messageType); + if (MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)) {//供应商资质信息处理 + pustMessageSupplierCategoryZzxx(result, messageType); } - if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商评审消息处理 - pustMessageSupplierCategoryPsry(result,messageType); + if (MessageType.MESSAGETYPE_PSRY.equals(messageType)) {//供应商评审消息处理 + pustMessageSupplierCategoryPsry(result, messageType); } } catch (Exception e) { e.printStackTrace(); @@ -108,21 +122,64 @@ public class MessageLogAspect { return result; } + private void pustLibrarySupplierWork(Object result, String messageType) { + if (result instanceof ApplySupplierSupplierName) { + ApplySupplierSupplierName vo = (ApplySupplierSupplierName) result; + if (vo.getStatus().equals(CoscoCategoryConstant.APPROVE_STATUS_PASS)) { + List suppliers = vo.getSuppliers(); + List sendMessageVoList = new ArrayList<>(); + suppliers.forEach(supplier -> { + String cont = supplier.getSupplierName() + "在" + vo.getOrgName() + "单位添加品类库" + vo.getLibraryName() + "成功"; + getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList); + }); + sendMessageList(sendMessageVoList); + } + } + } + + private void pustMessageSupplierAnnualreviewSH(Object result, String messageType) { + + if (result instanceof List) { + List resultList = (List) result; + if (!resultList.isEmpty() && !(resultList.get(0) instanceof MessageAnnualreviewVo)) { + throw new IllegalArgumentException("返回对象类型不匹配：不是 NoTaskVo 列表"); + } + // 如果你确定空列表也合法，可省略上面的非空判断 + List list = (List) result; + List sendMessageVoList = new ArrayList<>(); + for (MessageAnnualreviewVo vo : list) { + List taskSupplierList = vo.getTaskSupplierList(); + taskSupplierList.forEach(supplier -> { + String cont = supplier.getSupplierName() + "在" + vo.getOrgName() + "单位，年度评分为" + supplier.getReviewResult(); + getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList); + }); + } + //sendMessageList(sendMessageVoList); + + } + + + } + /** * 黑名单处理完成 + * * @param result * @param messageType */ private void pustMessageBlackEnd(Object result, String messageType) { if (result instanceof BlackApproveVo) { BlackApproveVo vo = (BlackApproveVo) result; - String resultast ; + String resultast; List coscoMessageList = new ArrayList<>(); + List sendMessageVoList = new ArrayList<>(); if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(vo.getApproveStatus())) { resultast = "已通过"; - for (String supplierId : vo.getSupperierIds()) { - CoscoMessage coscoMessage = coscoMessageData(supplierId, "供应商在" + vo.getDeptName() + "部门，添加黑名单" + resultast, messageType); + for (CoscoBlacklistSupplier supplier : vo.getSupperierIds()) { + String cont = supplier.getSupplierName() + "在" + vo.getDeptName() + "单位，添加黑名单" + resultast; + CoscoMessage coscoMessage = coscoMessageData(supplier.getSupplierId(), cont, messageType); coscoMessageList.add(coscoMessage); + getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList); } } else { resultast = "已驳回"; @@ -130,10 +187,20 @@ public class MessageLogAspect { CoscoMessage coscoMessage = coscoMessageData(vo.getDeptId(), "供应商在" + vo.getDeptName() + "部门，添加黑名单" + resultast, messageType); coscoMessageList.add(coscoMessage); pustMessage(coscoMessageList); + //sendMessageList(sendMessageVoList); } } + private void getSendMessage(String supplierId, String cont, List sendMessageVoList) { + SendMessageVo sendMessageVo = new SendMessageVo(); + sendMessageVo.setPhone(getSupplierUser(supplierId)); + sendMessageVo.setMessage(cont); + sendMessageVo.setId(supplierId); + sendMessageVoList.add(sendMessageVo); + } + private void pustMessageEvaluateEnd(Object result, String messageType) { + if (result instanceof ApproveVo) { ApproveVo vo = (ApproveVo) result; String resultast; @@ -145,12 +212,17 @@ public class MessageLogAspect { List coscoMessageList = new ArrayList<>(); CoscoMessage coscoMessage = coscoMessageData(vo.getCreateBy(), "评价任务" + vo.getTaskName() + resultast, messageType); coscoMessageList.add(coscoMessage); - for (String supplierId : vo.getSupplierIds()) { - coscoMessageData(supplierId, "供应商在" + vo.getDeptName() + "评价任务" + resultast, messageType); + List sendMessageVoList = new ArrayList<>(); + for (CoscoEvaluateTaskSupplier supplier : vo.getSuppliers()) { + String cont = supplier.getSupplierName() + "在" + vo.getOrgName() + "评价任务" + resultast; + coscoMessageData(supplier.getSupplierId(), cont, messageType); coscoMessageList.add(coscoMessage); + + getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList); } pustMessage(coscoMessageList); + //sendMessageList(sendMessageVoList); } } @@ -226,11 +298,7 @@ public class MessageLogAspect { //只有审批通过时才发送短信 if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) { //短信实体封装 - SendMessageVo sendMessageVo = new SendMessageVo(); - sendMessageVo.setPhone(getSupplierUser(coscoAccessSupplier.getSupplierId())); - sendMessageVo.setMessage(cont); - sendMessageVo.setId(coscoAccessSupplier.getSupplierId()); - sendMessageVoList.add(sendMessageVo); + getSendMessage(coscoAccessSupplier.getSupplierId(), cont, sendMessageVoList); } } @@ -271,11 +339,7 @@ public class MessageLogAspect { //审批通过才发短信 if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) { //短信实体封装 - SendMessageVo sendMessageVo = new SendMessageVo(); - sendMessageVo.setPhone(getSupplierUser(vo.getSupplierAndCategoryList().get(0).getSupplierId())); - sendMessageVo.setMessage(cont); - sendMessageVo.setId(vo.getSupplierAndCategoryList().get(0).getSupplierId()); - sendMessageVoList.add(sendMessageVo); + getSendMessage(vo.getSupplierAndCategoryList().get(0).getSupplierId(), cont, sendMessageVoList); } //保存消息 @@ -290,21 +354,21 @@ public class MessageLogAspect { /** * 供应商品类退出审批处里 */ - public void pustMessageSupplierCategoryTc(Object result,String messageType){ + public void pustMessageSupplierCategoryTc(Object result, String messageType) { if (result instanceof CoscoSupplierExitSupplierCategoryVo) { CoscoSupplierExitSupplierCategoryVo vo = (CoscoSupplierExitSupplierCategoryVo) result; List coscoMessageList = new ArrayList<>(); List sendMessageVoList = new ArrayList<>(); String approveStr = ""; - if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) { approveStr = "已通过"; - }else{ + } else { approveStr = "已驳回"; } //退出的供应商 List exitSupperlierId = new ArrayList<>(); - if(!ObjectUtils.isEmpty(vo.getCoscoAccessSupplier())){ + if (!ObjectUtils.isEmpty(vo.getCoscoAccessSupplier())) { CoscoAccessSupplier exitSupperlier = vo.getCoscoAccessSupplier(); exitSupperlierId = exitSupperlier.getIdList(); } @@ -328,18 +392,14 @@ public class MessageLogAspect { String cont = supplierName + "，" + vo.getOrgName() + "单位的" + categoryNames + "品类退出，" + approveStr; if (!CollectionUtils.isEmpty(exitSupperlierId) && exitSupperlierId.contains(supplierId)) { - cont += "，"+supplierName+"已被，"+vo.getOrgName() + "单位退出"; + cont += "，" + supplierName + "已被，" + vo.getOrgName() + "单位退出"; } coscoMessageList.add(coscoMessageData(supplierId, cont, messageType)); if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) { // 短信实体封装 - SendMessageVo sendMessageVo = new SendMessageVo(); - sendMessageVo.setPhone(getSupplierUser(supplierId)); - sendMessageVo.setMessage(cont); - sendMessageVo.setId(supplierId); - sendMessageVoList.add(sendMessageVo); + getSendMessage(supplierId, cont, sendMessageVoList); } } @@ -357,19 +417,19 @@ public class MessageLogAspect { /** * 供应商基础信息审批处里 */ - public void pustMessageSupplierCategoryJcxx(Object result,String messageType){ + public void pustMessageSupplierCategoryJcxx(Object result, String messageType) { if (result instanceof CoscoSupplierChangeApply) { CoscoSupplierChangeApply vo = (CoscoSupplierChangeApply) result; List coscoMessageList = new ArrayList<>(); // 使用转换后的对象 String approveStr = ""; - if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ + if (CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())) { approveStr = "已通过"; - }else{ + } else { approveStr = "已驳回"; } - String cont = vo.getSupplierName()+"，基础信息变更审批"+approveStr; - coscoMessageList.add(coscoMessageData(vo.getSupplierId(),cont,messageType)); + String cont = vo.getSupplierName() + "，基础信息变更审批" + approveStr; + coscoMessageList.add(coscoMessageData(vo.getSupplierId(), cont, messageType)); pustMessage(coscoMessageList); } else { throw new IllegalArgumentException("返回对象类型不匹配"); @@ -379,31 +439,27 @@ public class MessageLogAspect { /** * 供应商营业执照处理 */ - public void pustMessageSupplierCategoryYyzz(Object result,String messageType){ + public void pustMessageSupplierCategoryYyzz(Object result, String messageType) { if (result instanceof CoscoSupplierBaseVo) { CoscoSupplierBaseVo vo = (CoscoSupplierBaseVo) result; List coscoMessageList = new ArrayList<>(); List sendMessageVoList = new ArrayList<>(); - String supplierCont = "您的企业营业执照将于"+vo.getEndTime()+"日到期，请及时更新"; - if(vo.getDaysRemaining() == 0){//已经过期 - supplierCont = "您的企业营业执照已经到期，您的准入单位和准入品类全撤销移除"; + String supplierCont = "您的企业营业执照将于" + vo.getEndTime() + "日到期，请及时更新"; + if (vo.getDaysRemaining() == 0) {//已经过期 + supplierCont = "您的企业营业执照已经到期，您的准入单位和准入品类全撤销移除"; } - coscoMessageList.add(coscoMessageData(vo.getSupplierId(),supplierCont,messageType)); + coscoMessageList.add(coscoMessageData(vo.getSupplierId(), supplierCont, messageType)); - for(CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()){ - String deptCont = "您准入的"+vo.getSupplierName()+"供应商营业执照将于"+vo.getEndTime()+"日到期"; - if(vo.getDaysRemaining() == 0){//已经过期 - deptCont = "您准入的"+vo.getSupplierName()+"供应商营业执照已经到期,该供应商准入单位和准入品类全撤销移除"; + for (CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()) { + String deptCont = "您准入的" + vo.getSupplierName() + "供应商营业执照将于" + vo.getEndTime() + "日到期"; + if (vo.getDaysRemaining() == 0) {//已经过期 + deptCont = "您准入的" + vo.getSupplierName() + "供应商营业执照已经到期,该供应商准入单位和准入品类全撤销移除"; } - coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(),deptCont,messageType)); + coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(), deptCont, messageType)); } //短信实体封装 - SendMessageVo sendMessageVo = new SendMessageVo(); - sendMessageVo.setPhone(getSupplierUser(vo.getSupplierId())); - sendMessageVo.setMessage(supplierCont); - sendMessageVo.setId(vo.getSupplierId()); - sendMessageVoList.add(sendMessageVo); + getSendMessage(vo.getSupplierId(), supplierCont, sendMessageVoList); //保存消息 pustMessage(coscoMessageList); @@ -417,32 +473,28 @@ public class MessageLogAspect { /** * 供应商纸质信息处理 */ - public void pustMessageSupplierCategoryZzxx(Object result,String messageType){ + public void pustMessageSupplierCategoryZzxx(Object result, String messageType) { if (result instanceof CoscoSupplierBaseVo) { CoscoSupplierBaseVo vo = (CoscoSupplierBaseVo) result; List coscoMessageList = new ArrayList<>(); List sendMessageVoList = new ArrayList<>(); - String supplierCont = "您的企业"+vo.getQualificationsName()+"资质将于"+vo.getEndTime()+"日到期，请及时更新"; - if(vo.getDaysRemaining() == 0){//已经过期 - supplierCont = "您的企业"+vo.getQualificationsName()+"资质已经到期，请及时更新"; + String supplierCont = "您的企业" + vo.getQualificationsName() + "资质将于" + vo.getEndTime() + "日到期，请及时更新"; + if (vo.getDaysRemaining() == 0) {//已经过期 + supplierCont = "您的企业" + vo.getQualificationsName() + "资质已经到期，请及时更新"; } - coscoMessageList.add(coscoMessageData(vo.getSupplierId(),supplierCont,messageType)); + coscoMessageList.add(coscoMessageData(vo.getSupplierId(), supplierCont, messageType)); - for(CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()){ - String deptCont = "您准入的"+vo.getSupplierName()+"供应商"+vo.getQualificationsName()+"资质将于"+vo.getEndTime()+"日到期"; - if(vo.getDaysRemaining() == 0){//已经过期 - deptCont = "您准入的"+vo.getSupplierName()+"供应商"+vo.getQualificationsName()+"资质已经到期"; + for (CoscoAccessSupplier coscoAccessSupplier : vo.getCoscoAccessSupplierList()) { + String deptCont = "您准入的" + vo.getSupplierName() + "供应商" + vo.getQualificationsName() + "资质将于" + vo.getEndTime() + "日到期"; + if (vo.getDaysRemaining() == 0) {//已经过期 + deptCont = "您准入的" + vo.getSupplierName() + "供应商" + vo.getQualificationsName() + "资质已经到期"; } - coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(),deptCont,messageType)); + coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getDeptId(), deptCont, messageType)); } //短信实体封装 - SendMessageVo sendMessageVo = new SendMessageVo(); - sendMessageVo.setPhone(getSupplierUser(vo.getSupplierId())); - sendMessageVo.setMessage(supplierCont); - sendMessageVo.setId(vo.getSupplierId()); - sendMessageVoList.add(sendMessageVo); + getSendMessage(vo.getSupplierId(), supplierCont, sendMessageVoList); //消息保存 pustMessage(coscoMessageList); //发送短信 @@ -456,14 +508,14 @@ public class MessageLogAspect { /** * 评审人员信息处理 */ - public void pustMessageSupplierCategoryPsry(Object result,String messageType){ + public void pustMessageSupplierCategoryPsry(Object result, String messageType) { if (result instanceof UserItmeMessageVo) { UserItmeMessageVo vo = (UserItmeMessageVo) result; List coscoMessageList = new ArrayList<>(); - for(CoscoAccessUser coscoAccessUser : vo.getCoscoAccessUserList()){ + for (CoscoAccessUser coscoAccessUser : vo.getCoscoAccessUserList()) { String cont = "您有新的供应商需要评审"; - coscoMessageList.add(coscoMessageData(coscoAccessUser.getUserId(),cont,messageType)); + coscoMessageList.add(coscoMessageData(coscoAccessUser.getUserId(), cont, messageType)); } pustMessage(coscoMessageList); @@ -475,6 +527,7 @@ public class MessageLogAspect { /** * 封装实体 + * * @param receiverId * @param cont * @param messageType @@ -493,23 +546,25 @@ public class MessageLogAspect { /** * 查询供应商的主联系人 + * * @param supplierId */ - public String getSupplierUser(String supplierId){ + public String getSupplierUser(String supplierId) { CoscoSupplierUser coscoSupplierUser = coscoSupplierUserMapper.selectCoscoSupplierUserBySupplierId(supplierId); return coscoSupplierUser.getContactsPhone(); } /** * 查询供应商名称详情 + * * @param supplierId */ - public String getSupplierName(String supplierId){ + public String getSupplierName(String supplierId) { CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseMapper.selectCoscoSupplierBaseById(supplierId); //如果是境外用英文名称，否则都是用name - if(CoscoType.SUPPLIER_TYPE_OVS.equals(coscoSupplierBase.getSupplierType())){ + if (CoscoType.SUPPLIER_TYPE_OVS.equals(coscoSupplierBase.getSupplierType())) { return coscoSupplierBase.getNameEn(); - }else{ + } else { return coscoSupplierBase.getName(); } } @@ -526,23 +581,24 @@ public class MessageLogAspect { * 发送短信 */ public void sendMessageList(List sendMessageVoList) { - for(SendMessageVo sendMessageVo : sendMessageVoList){ - sendMessage(sendMessageVo.getPhone(),sendMessageVo.getMessage(),sendMessageVo.getId()); + for (SendMessageVo sendMessageVo : sendMessageVoList) { + sendMessage(sendMessageVo.getPhone(), sendMessageVo.getMessage(), sendMessageVo.getId()); } } /** * 发送短信 - * @param phone 需要发送的手机号 + * + * @param phone 需要发送的手机号 * @param message 需要发送的内容 - * @param id 主键 + * @param id 主键 */ - public void sendMessage(String phone,String message,String id){ + public void sendMessage(String phone, String message, String id) { // 发送短信 [中远海运] 您的验证码是：" + code + "，请在5分钟内输入。 //String message = "您的验证码是：" + code + "，请在5分钟内输入。"; BaseResponse templateSMSBaseResponse = smsFeignClient.sendSms(new String[]{phone}, "1180212", new String[]{message}, id, null); } -} \ No newline at end of file +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTaskSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTaskSupplier.java index f06db6a..1455915 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTaskSupplier.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/entity/CoscoAnnualreviewTaskSupplier.java @@ -13,23 +13,38 @@ import java.util.Date; * @date 2025-06-18 */ @Data -public class CoscoAnnualreviewTaskSupplier extends BaseEntity{ +public class CoscoAnnualreviewTaskSupplier extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键ID */ + /** + * 主键ID + */ private String id; - /** 年审任务id(cosco_annualreview_task表主键) */ + /** + * 年审任务id(cosco_annualreview_task表主键) + */ private String annualreviewTaskId; - /** 供应商id(cosco_supplier_base表主键) */ + /** + * 供应商名称 + */ + private String SupplierName; + + /** + * 供应商id(cosco_supplier_base表主键) + */ private String supplierId; - /** 年审最终结果(1.合格、2.不合格) */ + /** + * 年审最终结果(1.合格、2.不合格) + */ private Long reviewResult; - /** 删除标识(normal.正常、deleted.已删除) */ - private String delFlag="normal"; + /** + * 删除标识(normal.正常、deleted.已删除) + */ + private String delFlag = "normal"; private String remark; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java index ea91dd1..2fe8cc3 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java @@ -1,7 +1,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.MessageAnnualreviewVo; + +import java.util.List; + public interface AnnualScheduledTasksService { - void closeTask(); + List closeTask(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java index e068361..9bf52c8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java @@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.impl; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper; @@ -10,12 +11,15 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualre import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.AnnualScheduledTasksService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AuditQuantityVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.MessageAnnualreviewVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -30,6 +34,8 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper; @Autowired private CoscoAnnualreviewTaskSupplierMapper coscoAnnualreviewTaskSupplierMapper; + @Autowired + private IOrgService orgService; /** @@ -41,23 +47,33 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ @Scheduled(cron = "0 15 1 * * ?") @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY) public List checkTask() { - List noTasks =coscoAnnualreviewTaskMapper.selectNoTask(); + List noTasks = coscoAnnualreviewTaskMapper.selectNoTask(); //查询小于当前时间 未开启任务 coscoAnnualreviewTaskMapper.updateNOTask(); return noTasks; } - + /** + * 供应商年度审核结束 + */ @Scheduled(cron = "0 15 2 * * ?") @Transactional(rollbackFor = Exception.class) - public void closeTask() { + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSNDJYSH) + public List closeTask() { //查询所有需要关闭的项目 List coscoAnnualreviewTasks = coscoAnnualreviewTaskMapper.selectCloseTask(); - if(!coscoAnnualreviewTasks.isEmpty()){ + List messageAnnualreviewVos = new ArrayList<>(); + if (!coscoAnnualreviewTasks.isEmpty()) { + List ids = coscoAnnualreviewTasks.stream().map(CoscoAnnualreviewTask::getId).collect(Collectors.toList()); - List coscoAnnualreviewTaskSuppliers =coscoAnnualreviewTaskSupplierMapper. + List coscoAnnualreviewTaskSuppliers = coscoAnnualreviewTaskSupplierMapper. selectByIds(ids); for (CoscoAnnualreviewTask coscoAnnualreviewTask : coscoAnnualreviewTasks) { + MessageAnnualreviewVo returnVo = new MessageAnnualreviewVo(); + OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoAnnualreviewTask.getDeptId()); + returnVo.setDeptId(coscoAnnualreviewTask.getDeptId()); + returnVo.setDeptName(orgDeptInfo.getDeptName()); + returnVo.setOrgName(orgDeptInfo.getOrgName()); //获取年审任务全部信息 CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier = new CoscoAnnualreviewTaskSupplier(); coscoAnnualreviewTaskSupplier.setAnnualreviewTaskId(coscoAnnualreviewTask.getId()); @@ -79,12 +95,15 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ coscoAnnualreviewTaskSupplierMapper.updateCoscoAnnualreviewTaskSupplier(supplier); } }); + returnVo.setTaskSupplierList(collect); //修改任务状态 coscoAnnualreviewTask.setStatus(AnnualreviewTaskConstant.COMPLETED); coscoAnnualreviewTask.setUpdateTime(new Date()); coscoAnnualreviewTaskMapper.updateCoscoAnnualreviewTask(coscoAnnualreviewTask); + messageAnnualreviewVos.add(returnVo); } } + return messageAnnualreviewVos; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/MessageAnnualreviewVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/MessageAnnualreviewVo.java new file mode 100644 index 0000000..699eacf --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/MessageAnnualreviewVo.java @@ -0,0 +1,26 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; + +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplier; +import lombok.Data; + +import java.util.List; + +@Data +public class MessageAnnualreviewVo { + /** + * 部门名称 + */ + private String deptName; + /** + * 单位名称 + */ + private String orgName; + /** + * 单位id + */ + private String deptId; + /** + * 供应商任务列表 + */ + private List taskSupplierList; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklistSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklistSupplier.java index 22f4610..3ff2983 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklistSupplier.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/entity/CoscoBlacklistSupplier.java @@ -19,6 +19,10 @@ public class CoscoBlacklistSupplier extends BaseEntity { /** 供应商id(cosco_supplier_base表主键) */ private String supplierId; + /** + * 供应商名称 + */ + private String supplierName; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index 9b2b9af..b80c677 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.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.constant.CoscoCategoryConstant; @@ -205,7 +206,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { @MessageLog(messageType = MessageType.MESSAGETYPE_HBLXSH) public BlackApproveVo receiveApprove(CoscoBlacklist list) { CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId()); - List supplierList = new ArrayList<>(); + List supplierList = new ArrayList<>(); if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) { coscoBlacklist.setApproveStatus(list.getApproveStatus()); coscoBlacklist.setStartTime(new Date()); @@ -217,7 +218,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId()); List coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); coscoBlacklistSuppliers.forEach(cosupplier -> { - supplierList.add(cosupplier.getSupplierId()); + supplierList.add(cosupplier); CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(cosupplier.getSupplierId()); //判断黑名单 @@ -234,7 +235,8 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { } BlackApproveVo vo=new BlackApproveVo(); vo.setDeptId(coscoBlacklist.getDeptId()); - vo.setDeptName("部门"); + SysOrg orgInfo = orgService.getOrgInfo(coscoBlacklist.getDeptId()); + vo.setDeptName(orgInfo.getOrgName()); vo.setApproveStatus(coscoBlacklist.getApproveStatus()); vo.setSupperierIds(supplierList); return vo; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java index 5ddd8cc..4be55f9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistSupplierServiceImpl.java @@ -43,6 +43,8 @@ public class CoscoBlacklistSupplierServiceImpl implements ICoscoBlacklistSupplie return coscoBlacklistSupplierMapper.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier); } + + /** * 新增供应商黑名单_供应商加入黑灰名单申请关联供应商 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplier.java index 85003db..20fc0e0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplier.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplier.java @@ -24,6 +24,10 @@ public class CoscoCategoryLibrarySupplier extends BaseEntity { /** 供应商id(cosco_supplier_base表主键) */ private String supplierId; + /** + * 供应商名称 + */ + private String supplierName; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java index 93b2845..9b9c715 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategoryLibrarySupplierApply.java @@ -18,20 +18,30 @@ import lombok.Data; public class CoscoCategoryLibrarySupplierApply extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键ID */ + /** + * 主键ID + */ private String id; - /** 品类库id(cosco_category_library表主键) */ + /** + * 品类库id(cosco_category_library表主键) + */ private String categoryLibraryId; - /** 审批状态(0.待审批、1.通过、2.驳回) */ - private Long approveStatus=0L; + /** + * 审批状态(0.待审批、1.通过、2.驳回) + */ + private Long approveStatus = 0L; - /** 审批工作流id */ + /** + * 审批工作流id + */ private String workFlowId; - /** 删除标识(normal.正常、deleted.已删除) */ - private String delFlag= CoscoCategoryConstant.DELETE_FLAG_YES; + /** + * 删除标识(normal.正常、deleted.已删除) + */ + private String delFlag = CoscoCategoryConstant.DELETE_FLAG_YES; /** * 建库方式(online.线上、offline.线下) @@ -41,5 +51,14 @@ public class CoscoCategoryLibrarySupplierApply extends BaseEntity { private LocalDateTime createTime; private LocalDateTime updateTime; + /** + * 部门id + */ + private String deptId; + /** + * 品类库名称 + */ + private String libraryName; + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java index 0f6783e..a9c1522 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java @@ -6,6 +6,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibr import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ApplySupplierSupplierName; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo; @@ -104,5 +105,5 @@ public interface ICoscoCategoryLibrarySupplierApplyService extends IBaseService< * @param librarySupplierApply * @return */ - int synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply); + ApplySupplierSupplierName synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java index 8e0b0e0..19b64cb 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibrarySupplierApplyServiceImpl.java @@ -8,13 +8,18 @@ import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService; import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService; +import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarAttachments; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ApplySupplierSupplierName; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo; @@ -47,6 +52,8 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp private IUserService userService; @Autowired private ICoscoCategoryLibrarAttachmentsService coscoCategoryLibrarAttachmentsService; + @Autowired + private CoscoCategoryLibrarySupplierMapper coscoCategoryLibrarySupplierMapper; /** * 查询品类库_品类库入库供应商申请单 @@ -181,7 +188,7 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId()); vo.setDeptName(orgDeptInfo.getOrgName()); SysUser userById = userService.getUserById(vo.getCreateBy()); - if(userById!=null){ + if (userById != null) { vo.setApplyUser(userById.getName()); } }); @@ -207,12 +214,25 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp } @Override - public int synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply) { + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSLKRQSH) + public ApplySupplierSupplierName synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply) { CoscoCategoryLibrarySupplierApply apply = coscoCategoryLibrarySupplierApplyMapper.selectByWorkFlowId(librarySupplierApply.getWorkFlowId()); if (apply == null) { throw new RuntimeException("未找到对应的审批单"); } apply.setApproveStatus(librarySupplierApply.getApproveStatus()); - return coscoCategoryLibrarySupplierApplyMapper.updateCoscoCategoryLibrarySupplierApply(apply); + coscoCategoryLibrarySupplierApplyMapper.updateCoscoCategoryLibrarySupplierApply(apply); + ApplySupplierSupplierName supplierName = new ApplySupplierSupplierName(); + supplierName.setDeptId(apply.getDeptId()); + OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(apply.getDeptId()); + supplierName.setDeptName(orgDeptInfo.getDeptName()); + supplierName.setOrgName(orgDeptInfo.getOrgName()); + supplierName.setLibraryName(apply.getLibraryName()); + supplierName.setStatus(apply.getApproveStatus()); + CoscoCategoryLibrarySupplier librarySupplier = new CoscoCategoryLibrarySupplier(); + librarySupplier.setCategoryLibrarySupplierApplyId(apply.getId()); + List coscoCategoryLibrarySuppliers = coscoCategoryLibrarySupplierMapper.selectCoscoCategoryLibrarySupplierList(librarySupplier); + supplierName.setSuppliers(coscoCategoryLibrarySuppliers); + return supplierName; } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ApplySupplierSupplierName.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ApplySupplierSupplierName.java new file mode 100644 index 0000000..d5b7af9 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ApplySupplierSupplierName.java @@ -0,0 +1,36 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo; + +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplier; +import lombok.Data; + +import java.util.List; + +@Data +public class ApplySupplierSupplierName { + /** + * 部门id + */ + private String deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 单位名称 + */ + private String orgName; + /** + * 供应商id,名称 + */ + private List suppliers; + /** + * 状态 + */ + private Long status; + /** + * 品类库名称 + */ + private String LibraryName; + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java index 671fba1..5221d51 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java @@ -1,6 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.entity.CoscoBlacklistSupplier; import lombok.Data; import java.io.Serializable; @@ -21,10 +22,14 @@ public class BlackApproveVo implements Serializable { * 状态 */ private Long approveStatus; + /** + * 单位名称 + */ + private String orgName; /** * 供应商id */ - private List supperierIds; + private List supperierIds; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index 8b42871..75779c7 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.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.SysUser; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; @@ -352,7 +353,10 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { ApproveVo aVo = new ApproveVo(); aVo.setResult(vo.getApproveStatus()); aVo.setCreateBy(coscoEvaluateTask.getCreateBy()); - aVo.setDeptName(SupplierUserConstant.CREATE_DEPT); + SysUser userById = userService.getUserById(coscoEvaluateTask.getCreateBy()); + OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userById.getOrgId()); + aVo.setDeptName(orgDeptInfo.getDeptName()); + aVo.setOrgName(orgDeptInfo.getOrgName()); aVo.setTaskName(coscoEvaluateTask.getEvaluateTheme()); CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = new CoscoEvaluateTaskSupplier(); coscoEvaluateTaskSupplier.setEvaluateTaskId(coscoEvaluateTask.getId()); @@ -360,6 +364,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { List coscoEvaluateTaskSuppliers = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierList(coscoEvaluateTaskSupplier); List supplierIds = coscoEvaluateTaskSuppliers.stream().map(CoscoEvaluateTaskSupplier::getSupplierId).collect(Collectors.toList()); aVo.setSupplierIds(supplierIds); + aVo.setSuppliers(coscoEvaluateTaskSuppliers); return aVo; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java index 19783ef..9fe91b9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java @@ -1,6 +1,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier; import lombok.Data; import java.io.Serializable; @@ -16,6 +17,10 @@ public class ApproveVo implements Serializable { * 部门名称 */ private String deptName; + /** + * 单位名称 + */ + private String orgName; /** * 评价任务名称 */ @@ -24,6 +29,8 @@ public class ApproveVo implements Serializable { * 供应商id */ private List supplierIds; + + private List suppliers; /** * 结果 */ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml index e47cf2c..d7fa86e 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml @@ -16,6 +16,9 @@ + + + @@ -68,8 +71,20 @@ - + select cbs.blacklist_id, cbs.supplier_id, csb.name as supplier_name + from cosco_blacklist_supplier cbs + left join cosco_supplier_base csb on csb.id = cbs.supplier_id - blacklist_id = #{blacklistId} + cbs.blacklist_id = #{blacklistId} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml index 04ad2bc..b4e7054 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml @@ -4,45 +4,72 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - + + + + + + + + + + + + + - select id, category_library_id, approve_status, work_flow_id, del_flag, create_by, create_time, update_by, update_time, last_update_time + select id, + category_library_id, + approve_status, + work_flow_id, + del_flag, + create_by, + create_time, + update_by, + update_time, + last_update_time from cosco_category_library_supplier_apply - - - and category_library_id = #{categoryLibraryId} - - - and approve_status = #{approveStatus} - - - and work_flow_id = #{workFlowId} - - - and last_update_time = #{lastUpdateTime} - + + and category_library_id = #{categoryLibraryId} + + + and approve_status = #{approveStatus} + + + and work_flow_id = #{workFlowId} + + + and last_update_time = #{lastUpdateTime} + - select csb.name as name, - csb.enterprise_type as area, + - select csb.name as name, csb.enterprise_type as area, @@ -160,8 +196,8 @@ csb.supplier_type as supplierCategory, csb.id from - cosco_supplier_base csb - left join cosco_access_supplier_category casc on csb.id=casc.supplier_id + cosco_supplier_base csb + left join cosco_access_supplier_category casc on csb.id=casc.supplier_id where casc.del_flag='normal' and csb.del_flag='normal' AND csb.id IN ( SELECT @@ -182,39 +218,40 @@ group by csb.id - select cclsa.id, ccl.name,ccl.area AS area,cclsa.create_by as createBy , - ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId, - case when cclsa.approve_status=0 and cclsa.work_flow_id is null then '未开始' - when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中' - else '已结束' - end as processStatusName, - case when cclsa.approve_status=1 then '通过' - when cclsa.approve_status=2 then '驳回' - end as approveResult, - CASE - WHEN COUNT(csb.id) = 0 THEN NULL - WHEN COUNT(csb.id) = 1 THEN MAX(csb.name) - ELSE CONCAT(MAX(csb.name), ' 等', COUNT(csb.id), '家公司') - END AS supplierName + ccl.create_time as applyTime,cclsa.approve_status as approveStatus,ccl.dept_id as deptId, + case when cclsa.approve_status=0 and cclsa.work_flow_id is null then '未开始' + when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中' + else '已结束' + end as processStatusName, + case when cclsa.approve_status=1 then '通过' + when cclsa.approve_status=2 then '驳回' + end as approveResult, + CASE + WHEN COUNT(csb.id) = 0 THEN NULL + WHEN COUNT(csb.id) = 1 THEN MAX(csb.name) + ELSE CONCAT(MAX(csb.name), ' 等', COUNT(csb.id), '家公司') + END AS supplierName from cosco_category_library_supplier_apply cclsa - join cosco_category_library ccl on cclsa.category_library_id=ccl.id - left join cosco_category_library_supplier ccls on ccls.category_library_supplier_apply_id=cclsa.id - left join cosco_supplier_base csb on csb.id= ccls.supplier_id + join cosco_category_library ccl on cclsa.category_library_id=ccl.id + left join cosco_category_library_supplier ccls on ccls.category_library_supplier_apply_id=cclsa.id + left join cosco_supplier_base csb on csb.id= ccls.supplier_id where cclsa.del_flag ='normal' - and ccl.name like concat('%',#{vo.name},'%') + and ccl.name like concat('%',#{vo.name},'%') - and ccl.area = #{vo.area} + and ccl.area = #{vo.area} - and cclsa.approveStatus = #{vo.approveStatus} + and cclsa.approveStatus = #{vo.approveStatus} GROUP BY - cclsa.id + cclsa.id order by cclsa.create_time desc diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml index 1da8bbe..025f9e3 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierMapper.xml @@ -10,6 +10,7 @@ + @@ -20,7 +21,10 @@ - select csb.name, csb.enterprise_type area, csb.supplier_type supplierCategory, csb.id , + select csb.name, + csb.enterprise_type area, + csb.supplier_type supplierCategory, + csb.id, csb.social_credit_code unifiedSocialCreditCode from cosco_category_library_supplier ccls join cosco_supplier_base csb on ccls.supplier_id = csb.id