fix
This commit is contained in:
sxu
parent
a3fc5f041a
commit
cc8fe8f4cf
|
|
@ -1,5 +1,6 @@
|
|||
package com.bonus.zlpt.common.core.domain.order.vo;
|
||||
|
||||
import com.bonus.zlpt.common.core.annotation.Excel;
|
||||
import com.bonus.zlpt.common.core.domain.order.OrderInfo;
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
|
|
@ -17,4 +18,79 @@ public class OrderInfoVo extends OrderInfo {
|
|||
private Long maId;
|
||||
private String orderPhone;
|
||||
private String supplierCompany;
|
||||
/** 需求单位 */
|
||||
@Excel(name = "需求单位")
|
||||
private String needCompany;
|
||||
|
||||
/** 设备计划进场时间 */
|
||||
@Excel(name = "设备计划进场时间")
|
||||
private String planStartTime;
|
||||
|
||||
/** 是否需要机手 */
|
||||
@Excel(name = "是否需要机手")
|
||||
private String isMachinist;
|
||||
|
||||
/** 详细地址 */
|
||||
@Excel(name = "设备进场省市县")
|
||||
private Integer addressId;
|
||||
|
||||
/** 详细地址 */
|
||||
@Excel(name = "详细地址")
|
||||
private String address;
|
||||
|
||||
/** 工期时长 */
|
||||
@Excel(name = "工期时长")
|
||||
private String duration;
|
||||
|
||||
/** 发票类型 */
|
||||
@Excel(name = "发票类型")
|
||||
private String invoiceType;
|
||||
|
||||
/** 项目说明 */
|
||||
@Excel(name = "项目说明")
|
||||
private String description;
|
||||
|
||||
/** 租赁类型 */
|
||||
@Excel(name = "租赁类型")
|
||||
private Long leaseType;
|
||||
|
||||
/** 租赁单价 */
|
||||
@Excel(name = "租赁单价")
|
||||
private String leasePrice;
|
||||
|
||||
/** 机手单价 */
|
||||
@Excel(name = "机手单价")
|
||||
private String machinistPrice;
|
||||
|
||||
/** 订单合同 */
|
||||
@Excel(name = "订单合同")
|
||||
private String orderContract;
|
||||
|
||||
/** 机手姓名 */
|
||||
@Excel(name = "机手姓名")
|
||||
private String machinistName;
|
||||
|
||||
/** 联系电话 */
|
||||
@Excel(name = "联系电话")
|
||||
private String phone;
|
||||
|
||||
/** 物流司机电话 */
|
||||
@Excel(name = "物流司机电话")
|
||||
private String logisticsPhone;
|
||||
|
||||
/** 设备实际进场时间 */
|
||||
@Excel(name = "设备实际进场时间")
|
||||
private String realStartTime;
|
||||
|
||||
/** 租方进场确认人 */
|
||||
@Excel(name = "租方进场确认人")
|
||||
private String renterName;
|
||||
|
||||
/** 出租方进场确认人 */
|
||||
@Excel(name = "出租方进场确认人")
|
||||
private String tenantName;
|
||||
|
||||
/** 进场附件 */
|
||||
@Excel(name = "进场附件")
|
||||
private String entryAttachment;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,21 @@ public class OrderInfoController extends BaseController
|
|||
@GetMapping(value = "/{orderId}")
|
||||
public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
|
||||
{
|
||||
return success(orderInfoService.selectOrderInfoByOrderId(orderId));
|
||||
OrderInfoVo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderId);
|
||||
Map map1 = (Map) equipClient.getInfo(orderInfo.getMaId());
|
||||
if (map1 != null) {
|
||||
Map map2 = (Map) map1.get(DATA_TAG);
|
||||
if (map2 != null) {
|
||||
String typeName = (String) map2.get("typeName");
|
||||
String groupName = (String) map2.get("groupName");
|
||||
String modelName = (String) map2.get("modelName");
|
||||
String deviceName = (String) map2.get("deviceName");
|
||||
orderInfo.setTypeName(typeName);
|
||||
orderInfo.setGroupName(groupName);
|
||||
orderInfo.setDeviceName(modelName + deviceName);
|
||||
}
|
||||
}
|
||||
return success(orderInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public interface OrderInfoMapper
|
|||
* @param orderId 订单信息主键
|
||||
* @return 订单信息
|
||||
*/
|
||||
public OrderInfo selectOrderInfoByOrderId(Long orderId);
|
||||
public OrderInfoVo selectOrderInfoByOrderId(Long orderId);
|
||||
|
||||
/**
|
||||
* 查询订单信息列表
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public interface IOrderInfoService
|
|||
* @param orderId 订单信息主键
|
||||
* @return 订单信息
|
||||
*/
|
||||
public OrderInfo selectOrderInfoByOrderId(Long orderId);
|
||||
public OrderInfoVo selectOrderInfoByOrderId(Long orderId);
|
||||
|
||||
/**
|
||||
* 查询订单信息列表
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
|
|||
* @return 订单信息
|
||||
*/
|
||||
@Override
|
||||
public OrderInfo selectOrderInfoByOrderId(Long orderId)
|
||||
public OrderInfoVo selectOrderInfoByOrderId(Long orderId)
|
||||
{
|
||||
return orderInfoMapper.selectOrderInfoByOrderId(orderId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,9 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectOrderInfoByOrderId" parameterType="Long" resultMap="OrderInfoResult">
|
||||
<include refid="selectOrderInfoVo"/>
|
||||
where order_id = #{orderId}
|
||||
<select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
|
||||
select d.*,o.code,o.time as order_time,o.order_status
|
||||
from ma_order_info o
|
||||
left join ma_order_details d on d.order_id = o.order_id
|
||||
where o.order_id = #{orderId}
|
||||
</select>
|
||||
|
||||
<insert id="insertOrderInfo" parameterType="com.bonus.zlpt.common.core.domain.order.OrderInfo">
|
||||
|
|
|
|||
Loading…
Reference in New Issue