From 7d101434422b7fe96cc1ceb456a751fe6f44ac23 Mon Sep 17 00:00:00 2001 From: Ledo Date: Sat, 15 Feb 2025 09:41:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=AE=89=E5=85=A8=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=B2=A1=E8=AE=BE=E7=BD=AE=E5=BE=85=E5=8A=9E=E4=BA=BA?= =?UTF-8?q?=E5=91=98=EF=BC=8C=E5=8F=91=E7=BB=99=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectorder/ProjectOrderMapper.java | 8 ++ .../bdgzsomthing/bdgzsomthingServiceImpl.java | 103 +++++++++++++----- .../bdgzsomthing/bdgzsomthingMapper.xml | 4 +- 3 files changed, 87 insertions(+), 28 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java index d2718ca..343eb27 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java @@ -53,6 +53,14 @@ public interface ProjectOrderMapper extends BaseMapperX { return selectPage(reqVO, query); } + default ProjectOrderDO selectProjectOrderById(Long id){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(ProjectOrderDO.class) + .select("a.nickname as businessManName") + .leftJoin(AdminUserDO.class,"a",AdminUserDO::getId,ProjectOrderDO::getBusinessMan) + .eq(ProjectOrderDO::getId,id); + return selectOne(query); + } default PageResult selectPage(ProjectOrderPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index 1fce629..014efa7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -862,10 +862,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { attentiontodoDO.setLevel("1"); attentiontodook.add(attentiontodoDO); } - - - - } for (AttentiontodoDO attentiontodoRespVO : attentiontodook) { List pageResult = storageLogNowMapper.selectPagesmall(attentiontodoRespVO.getTxrid());//查询符合条件的值 @@ -934,28 +930,33 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { // List pageResult = storageLogNowMapper.selectPagesmall();//查询符合条件的值 List attentiontodook3 = attentiontodoService.getAttentiontodolistdaiban(3); - if (attentiontodook3.size()<1){ - - List pageResult = deliverOrderMapper.selectPagemyn1();//查询符合条件的值 - Map> groupedBySale = pageResult.stream() - .filter(order -> order.getSaleOrderIds() != null && !order.getSaleOrderIds().isEmpty()) // 过滤掉msd为空的条目 - .collect(Collectors.groupingBy(DeliverOrderDO::getSaleOrderIds)); - groupedBySale.forEach((ids,list)->{ - AdminUserRespDTO user = userApi.getUser(list.get(0).getDeliverPerson()); - if (user != null ){ - AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); - attentiontodoDO.setEvent("订单发货满一年"); - attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(user.getNickname()); - attentiontodoDO.setLevel("1"); - attentiontodookddfh.add(attentiontodoDO); - } - }); -// for (DeliverOrderDO storageLogNowDO : pageResult) { -// -// } - + boolean hasDbPerson = true; + if (CollUtil.isEmpty(attentiontodook3)){ + //如果待办人员配置为空 + hasDbPerson = false; } +// if (attentiontodook3.size()<1){ +// //如果没有配置待办人员： +// List pageResult = deliverOrderMapper.selectPagemyn1();//查询符合条件的值 +// Map> groupedBySale = pageResult.stream() +// .filter(order -> order.getSaleOrderIds() != null && !order.getSaleOrderIds().isEmpty()) // 过滤掉msd为空的条目 +// .collect(Collectors.groupingBy(DeliverOrderDO::getSaleOrderIds)); +// +// groupedBySale.forEach((ids,list)->{ +// AdminUserRespDTO user = userApi.getUser(list.get(0).get()); +// if (user != null ){ +// AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); +// attentiontodoDO.setEvent("订单发货满一年"); +// attentiontodoDO.setAttr5("1"); +// attentiontodoDO.setAttr4(user.getNickname()); +// attentiontodoDO.setLevel("1"); +// attentiontodookddfh.add(attentiontodoDO); +// } +// }); +//// for (DeliverOrderDO storageLogNowDO : pageResult) { +//// +//// } +// } for (AttentiontodoDO attentiontodoRespVO : attentiontodookddfh) { List deliverOrderDOS = deliverOrderMapper.selectPagemyn(attentiontodoRespVO.getTxrid()); Map> groupedBySale = deliverOrderDOS.stream() @@ -967,7 +968,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { List list = entry.getValue(); String[] split = ids.split(","); for (String s : split) { - ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(s); + ProjectOrderDO projectOrderDO = projectOrderMapper.selectProjectOrderById(Long.valueOf(s)); bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 BdgzsomthingDO.setThings("订单编号:"+projectOrderDO.getCode()+"发货日期到期一年");//事件名称 @@ -1020,6 +1021,56 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { bdgzsomthingMapper.insert(BdgzsomthingDO); } } + if (!hasDbPerson){ + //如果没有配置待办人员，要给对应的业务员发 + bdgzsomthingDO BdgzsomthingDO1 = new bdgzsomthingDO(); + BdgzsomthingDO1.setThingname(attentiontodoRespVO.getEvent());//事件名称 + BdgzsomthingDO1.setThings("订单编号:"+projectOrderDO.getCode()+"发货日期到期一年");//事件名称 + BdgzsomthingDO1.setAttr2(projectOrderDO.getCode());//因为不用跳转所以为null + BdgzsomthingDO1.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 + BdgzsomthingDO1.setTenantId(attentiontodoRespVO.getTxrid()); +// BdgzsomthingDO.setShowname(new Date());比较创建时间,不用单独填写 + BdgzsomthingDO1.setDborgz("待办"); + BdgzsomthingDO1.setClick(projectOrderDO.getBusinessManName());//提醒人 + if(attentiontodoRespVO.getLevel().equals("1")){ + BdgzsomthingDO1.setLevel("紧急"); + } + else if(attentiontodoRespVO.getLevel().equals("2")){ + BdgzsomthingDO1.setLevel("一般"); + } + else if(attentiontodoRespVO.getLevel().equals("3")){ + BdgzsomthingDO1.setLevel("非紧急"); + } + BdgzsomthingDO1.setYesorno("0");//是否点击 + BdgzsomthingDO1.setAttr4("0");//是否点击 + BdgzsomthingDO1.setAttr3(projectOrderDO.getCode());//获取数据当前表的id 改 + BdgzsomthingDO1.setShowname(list.get(0).getCreateTime());//获取数据当前表的创建事件 改 + //去重查询,重复则不加 + List selecteqint1 = bdgzsomthingMapper.selecteqintDeletedButNoOver(BdgzsomthingDO1); + if(CollUtil.isNotEmpty(selecteqint1)){ + if (hasRemindTimeSafeStorage){ + LocalDate today = LocalDate.now(); +// List updateBatch = new ArrayList<>(); + for (bdgzsomthingDO bdgzsomthingDO : selecteqint1) { + LocalDate updatetime = bdgzsomthingDO.getUpdateTime().toLocalDate(); + // 计算两个日期之间的天数差 + long daysBetween = ChronoUnit.DAYS.between(updatetime, today); + if (daysBetween == Long.valueOf(remindTimeSafe)){ + + bdgzsomthingMapper.updateYnAndAttr4(bdgzsomthingDO.getId().toString(),"0","0"); +// updateBatch.add(bdgzsomthingDO); + } + } +// bdgzsomthingMapper.updateBatch(updateBatch); + } + }else{ + List bdgzsomthingDOList = bdgzsomthingMapper.selecteqintNoDeletedAndNoOver(BdgzsomthingDO1); + if (!CollUtil.isNotEmpty(bdgzsomthingDOList)){ + //插入方法 + bdgzsomthingMapper.insert(BdgzsomthingDO1); + } + } + } } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml index 20f0775..dfe255d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml @@ -91,12 +91,12 @@