提交 1ab6936f authored 作者: 艾庆国's avatar 艾庆国

运单预警

上级 f0d109fa
...@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.OrderChildDao; import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao; import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao; import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao;
import com.clx.performance.dao.vehiclewarn.VehicleWarnRangeDao;
import com.clx.performance.enums.ResultEnum; import com.clx.performance.enums.ResultEnum;
import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum; import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
import com.clx.performance.enums.vehiclewarn.VehicleWarnLogEnum; import com.clx.performance.enums.vehiclewarn.VehicleWarnLogEnum;
import com.clx.performance.enums.vehiclewarn.VehicleWarnRangEnum;
import com.clx.performance.model.OrderChild; import com.clx.performance.model.OrderChild;
import com.clx.performance.model.vehiclewarn.VehicleWarnInfo; import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
import com.clx.performance.model.vehiclewarn.VehicleWarnLog; import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
import com.clx.performance.model.vehiclewarn.VehicleWarnRang;
import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam; import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoResolveUpdateParam; import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoResolveUpdateParam;
import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoSuspendUpdateParam; import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoSuspendUpdateParam;
...@@ -32,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -32,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
...@@ -44,6 +48,8 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService { ...@@ -44,6 +48,8 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
@Autowired @Autowired
private VehicleWarnLogDao vehicleWarnLogDao; private VehicleWarnLogDao vehicleWarnLogDao;
@Autowired @Autowired
private VehicleWarnRangeDao vehicleWarnRangeDao;
@Autowired
private OrderChildDao orderChildDao; private OrderChildDao orderChildDao;
@Autowired @Autowired
...@@ -56,10 +62,11 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService { ...@@ -56,10 +62,11 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
@Override @Override
public void updateSuspend(VehicleWarnInfoSuspendUpdateParam param) { public void updateSuspend(VehicleWarnInfoSuspendUpdateParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
LocalDateTime endTime = LocalDateTimeUtils.parseTime(param.getWarnEndTime());
VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND); VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
vehicleWarnInfo.setSuspendTime(LocalDateTimeUtils.parseTime(param.getWarnEndTime())); vehicleWarnInfo.setSuspendTime(endTime);
vehicleWarnInfoDao.updateSuspendTime(vehicleWarnInfo, param.getWarnRang()); vehicleWarnInfoDao.updateSuspendTime(vehicleWarnInfo, param.getWarnRang());
VehicleWarnLog vehicleWarnLog = new VehicleWarnLog(); VehicleWarnLog vehicleWarnLog = new VehicleWarnLog();
...@@ -69,11 +76,23 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService { ...@@ -69,11 +76,23 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
vehicleWarnLog.setChildNo(vehicleWarnInfo.getChildNo()); vehicleWarnLog.setChildNo(vehicleWarnInfo.getChildNo());
vehicleWarnLog.setWarnName(vehicleWarnInfo.getWarnName()); vehicleWarnLog.setWarnName(vehicleWarnInfo.getWarnName());
vehicleWarnLog.setWarnRang(param.getWarnRang()); vehicleWarnLog.setWarnRang(param.getWarnRang());
vehicleWarnLog.setWarnEndTime(LocalDateTimeUtils.parseTime(param.getWarnEndTime())); vehicleWarnLog.setWarnEndTime(endTime);
vehicleWarnLog.setWarnTime(vehicleWarnInfo.getWarnTime()); vehicleWarnLog.setWarnTime(vehicleWarnInfo.getWarnTime());
vehicleWarnLog.setCreateBy(loginUserInfo.getUserName()); vehicleWarnLog.setCreateBy(loginUserInfo.getUserName());
vehicleWarnLogDao.saveEntity(vehicleWarnLog); vehicleWarnLogDao.saveEntity(vehicleWarnLog);
VehicleWarnRang vehicleWarnRang = new VehicleWarnRang();
vehicleWarnRang.setWarnConfigId(vehicleWarnInfo.getWarnConfigId());
vehicleWarnRang.setWarnName(vehicleWarnInfo.getWarnName());
vehicleWarnRang.setWarnRang(param.getWarnRang());
vehicleWarnRang.setOrderGoodsNo(
Objects.equals(param.getWarnRang(), VehicleWarnRangEnum.WarnRange.ORDER_GOODS.getCode())
? vehicleWarnInfo.getOrderGoodsNo() : null);
vehicleWarnRang.setChildNo(
Objects.equals(param.getWarnRang(), VehicleWarnRangEnum.WarnRange.CHILD.getCode())
? vehicleWarnInfo.getChildNo() : null);
vehicleWarnRang.setWarnEndTime(endTime);
vehicleWarnRangeDao.saveEntity(vehicleWarnRang);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论