From bbaac6afd47b39d7db78a98f6bf06b9eb88f0ffe Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sun, 10 Dec 2023 01:49:38 +0800 Subject: [PATCH] fix --- .../core/domain/order/vo/OrderInfoVo.java | 14 +++++++++++++ .../zlpt/order/mapper/OrderInfoMapper.java | 5 +++++ .../service/impl/OrderInfoServiceImpl.java | 20 ++++++++++++++++++- .../main/resources/mapper/OrderInfoMapper.xml | 17 ++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java index 98877a4..813beb8 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java @@ -84,4 +84,18 @@ public class OrderInfoVo extends OrderInfo { private String contractUrl; @ApiModelProperty(value = "订单状态文字") private String orderStatusStr; + @ApiModelProperty(value = "设备进场省ID") + private Integer provinceId; + @ApiModelProperty(value = "设备进场市ID") + private Integer cityId; + @ApiModelProperty(value = "设备进场区ID") + private Integer areaId; + @ApiModelProperty(value = "省份名称") + private String provinceStr; + @ApiModelProperty(value = "市名称") + private String cityStr; + @ApiModelProperty(value = "区名称") + private String areaStr; + @ApiModelProperty(value = "工期时长包括单位") + private String durationStr; } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java index fbaa5ed..20f4b02 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.bonus.zlpt.common.core.domain.order.OrderInfo; import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; +import com.bonus.zlpt.system.api.domain.BaseAddress; /** * 订单信息Mapper接口 @@ -70,4 +71,8 @@ public interface OrderInfoMapper public long count(Long userId); public DevInfoVo getDevInfoVo(Long maId); + + public List getBaseAddress(); + + public BaseAddress getBaseAddressByCode(String code); } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java index 46b8682..449b41a 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.zlpt.common.core.utils.uuid.UUID; import com.bonus.zlpt.common.security.utils.SecurityUtils; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.order.mapper.OrderDetailsMapper; +import com.bonus.zlpt.system.api.domain.BaseAddress; import com.bonus.zlpt.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +31,7 @@ import javax.annotation.Resource; public class OrderInfoServiceImpl implements IOrderInfoService { private final Integer ORDER_ATTACHMENT_DIC_ID = 21; + private final String ORDER_STATUS_INIT = "31"; SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Resource private OrderInfoMapper orderInfoMapper; @@ -45,7 +47,22 @@ public class OrderInfoServiceImpl implements IOrderInfoService @Override public OrderInfoVo selectOrderInfoByOrderId(Long orderId) { - return orderInfoMapper.selectOrderInfoByOrderId(orderId); + OrderInfoVo orderInfoVo = orderInfoMapper.selectOrderInfoByOrderId(orderId); + List addressList = orderInfoMapper.getBaseAddress(); + for (BaseAddress address : addressList) { + if (address.getCode().equals(String.valueOf(orderInfoVo.getProvinceId()))) { + orderInfoVo.setProvinceStr(address.getName()); + } + if (address.getCode().equals(String.valueOf(orderInfoVo.getCityId()))) { + orderInfoVo.setCityStr(address.getName()); + } + if (address.getCode().equals(String.valueOf(orderInfoVo.getAreaId()))) { + orderInfoVo.setAreaStr(address.getName()); + } + } + //时长+单位 + orderInfoVo.setDurationStr(orderInfoVo.getDuration()+orderInfoVo.getDurationType()); + return orderInfoVo; } /** @@ -74,6 +91,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderInfo.setTime(dateFormat.format(new Date())); DevInfoVo devInfoVo = orderInfoMapper.getDevInfoVo(orderInfo.getMaId()); orderInfo.setSupplier(String.valueOf(devInfoVo.getOwnCo())); + orderInfo.setOrderStatus(ORDER_STATUS_INIT); orderInfoMapper.insertOrderInfo(orderInfo); Long orderId = orderInfoMapper.selectLastInsertId(); orderInfo.setOrderId(orderId); diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml index 9fe2b61..4ea3a88 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml @@ -92,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" plan_start_time, is_machinist, address_id, + province_id, + city_id, + area_id, address, duration, duration_type, @@ -116,6 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{planStartTime}, #{isMachinist}, #{addressId}, + #{provinceId}, + #{cityId}, + #{areaId}, #{address}, #{duration}, #{durationType}, @@ -164,6 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" plan_start_time = #{planStartTime}, is_machinist = #{isMachinist}, address_id = #{addressId}, + address_id = #{provinceId}, + city_id = #{cityId}, + area_id = #{areaId}, address = #{address}, duration = #{duration}, duration_type = #{durationType}, @@ -209,4 +218,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ma_dev_info d where d.ma_id = #{maId} + + + + \ No newline at end of file