From b13d75a7c3de141c0025d95e7b33f3d8441ea3aa Mon Sep 17 00:00:00 2001 From: z Date: Thu, 13 Feb 2025 18:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E9=85=8D=E7=BD=AE=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=BE=85=E5=8A=9E=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E9=80=89=E6=8B=A9=E6=8F=90=E9=86=92?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/attentiontodo/AttentiontodoServiceImpl.java | 7 ++++++- .../heli/service/projectorder/ProjectOrderServiceImpl.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java index 2f529b1..e52d6b6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.service.attentiontodo; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -63,7 +64,11 @@ public class AttentiontodoServiceImpl implements AttentiontodoService { Map map = (Map) taskDispatchDetail; Object remindmanValue = map.get("remindman"); Object type = map.get("type"); - updateReqVO.setAttr4(remindmanValue.toString()); + if ("1".equals(type.toString())&&remindmanValue==null){ + updateReqVO.setAttr4(null); + }else { + updateReqVO.setAttr4(remindmanValue.toString()); + } updateReqVO.setAttr5(type.toString()); updateReqVO.setAttr2(id + ""); updateReqVO.setId(null); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index 6db4ef6..8228998 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -24,6 +24,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderSubMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.orderys.OrderYsMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper; @@ -106,7 +107,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { @Autowired private AttentiontodoService attentiontodoService; @Autowired - private com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper bdgzsomthingMapper; + private bdgzsomthingMapper bdgzsomthingMapper; @Override @Transactional(rollbackFor = Exception.class)