licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办配置操作类型为待办时可以不选择提醒人

Browse Source
This commit is contained in:
z 2025-02-13 18:18:28 +08:00
parent 2fa51a0da6
commit b13d75a7c3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java
View File

@ -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<String, Object> map = (Map<String, Object>) 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);

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
View File

@ -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)