From 915847639ea115e2ecae9428c0fc635698699316 Mon Sep 17 00:00:00 2001 From: z Date: Mon, 17 Feb 2025 18:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B2=A1=E6=9C=89=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=BA=BA=E6=B2=A1=E6=9C=89=E5=8F=91=E9=80=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java | 7 +++---- .../resources/mapper/attentiontodo/AttentiontodoMapper.xml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) 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 5002faf..e55b965 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 @@ -402,7 +402,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { LocalDateTime projectEndTime = deliverOrderDO.getProjectEndTime(); LocalDate projectEndDay = projectEndTime.toLocalDate(); if (today5.equals(projectEndDay.minusDays(1))) { - BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"装配任务单明天到期");//事件名称 + BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"明天到期");//事件名称 } else if (today5.equals(projectEndDay)) { BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"今日到期");//事件名称 } else if (today5.isAfter(projectEndDay)) { @@ -428,7 +428,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { BdgzsomthingDO.setClick(user.getNickname()); } } - }else { BdgzsomthingDO.setClick(attentiontodoRespVO.getAttr4()); }//提醒人 @@ -812,7 +811,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 BdgzsomthingDO.setAttr4("0");//是否点击 - BdgzsomthingDO.setThings("计划单号:"+materialPlanDetailDO.getProjectMaterialPlanNo()+" 物料："+materialPlanDetailDO.getName()+"临近到货日期");//事件名称 + BdgzsomthingDO.setThings("计划单号:"+materialPlanDetailDO.getProjectMaterialPlanNo()+" 物料:"+materialPlanDetailDO.getName()+"临近到货日期");//事件名称 BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); @@ -864,7 +863,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 BdgzsomthingDO.setAttr4("0");//是否点击 - BdgzsomthingDO.setThings("计划单号:"+materialPlanBoomDO.getProjectMaterialPlanNo()+" 加工件："+materialPlanBoomDO.getName()+"临近到货日期");//事件名称 + BdgzsomthingDO.setThings("计划单号:"+materialPlanBoomDO.getProjectMaterialPlanNo()+" 加工件:"+materialPlanBoomDO.getName()+"临近到货日期");//事件名称 BdgzsomthingDO.setAttr2(null);//因为不用跳转所以为null BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 BdgzsomthingDO.setTenantId(attentiontodoRespVO.getTxrid()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml index a8e29a2..546c655 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml @@ -20,7 +20,7 @@ resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO"> -SELECT a.*, b.tenant_id as txrid +SELECT a.*, a.tenant_id as txrid FROM db_attentiontodo a LEFT JOIN system_users b ON a.attr4 = b.nickname WHERE a.attr2 = #{param1}