记得上下班打卡 | git大法好,push需谨慎

Commit 5572cf87 authored by jiangxiulong's avatar jiangxiulong

打印

parent 83657b70
package com.liquidnet.service.kylin.dto.vo.express;
import com.liquidnet.service.kylin.dao.OrderExpressListDao;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* <p>
* 快递信息
* </p>
*
* @author jiangxiulong
* @since 2021-07-01
*/
@Data
@ApiModel
public class KylinOrderExpressPrintVo implements Serializable {
private List<OrderExpressListDao> expressList;
private String jContact;
private String jAddress;
private String jTel;
}
...@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dao.OrderExpressListDao; ...@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dao.OrderExpressListDao;
import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao; import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao; import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam; import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressPrintVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -273,8 +274,8 @@ public class PerformancesExpressController extends BaseController { ...@@ -273,8 +274,8 @@ public class PerformancesExpressController extends BaseController {
@RequiresPermissions("kylin:performancesExpress:batchPrintExpress") @RequiresPermissions("kylin:performancesExpress:batchPrintExpress")
@PostMapping("/batchPrintExpress") @PostMapping("/batchPrintExpress")
@ResponseBody @ResponseBody
public ResponseDto<List<OrderExpressListDao>> batchPrintExpress(@RequestParam("ids") String performanceId) { public ResponseDto<KylinOrderExpressPrintVo> batchPrintExpress(@RequestParam("ids") String performanceId) {
List<OrderExpressListDao> res = performancesExpressServiceImpl.batchPrintExpress(performanceId); KylinOrderExpressPrintVo res = performancesExpressServiceImpl.batchPrintExpress(performanceId);
try { try {
return ResponseDto.success(res); return ResponseDto.success(res);
} catch (Exception e) { } catch (Exception e) {
...@@ -288,8 +289,8 @@ public class PerformancesExpressController extends BaseController { ...@@ -288,8 +289,8 @@ public class PerformancesExpressController extends BaseController {
@RequiresPermissions("kylin:performancesExpress:printExpress") @RequiresPermissions("kylin:performancesExpress:printExpress")
@PostMapping("/printExpress") @PostMapping("/printExpress")
@ResponseBody @ResponseBody
public ResponseDto<List<OrderExpressListDao>> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) { public ResponseDto<KylinOrderExpressPrintVo> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<OrderExpressListDao> res = performancesExpressServiceImpl.printExpress(performanceExpressSearchAdminParam); KylinOrderExpressPrintVo res = performancesExpressServiceImpl.printExpress(performanceExpressSearchAdminParam);
try { try {
return ResponseDto.success(res); return ResponseDto.success(res);
} catch (Exception e) { } catch (Exception e) {
......
...@@ -102,90 +102,132 @@ ...@@ -102,90 +102,132 @@
$.ajax(configPrint) $.ajax(configPrint)
} }
function printExpressData(list) { /**
* 打印
* @returns {string}
*/
function getNowFormatDate() {
var date = new Date();
var seperator1 = "-";
var seperator2 = ":";
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+ " " + date.getHours() + seperator2 + date.getMinutes()
+ seperator2 + date.getSeconds();
return currentdate;
}
function substrMailno(str) {
if (str != null && str != "" && str.length == 15) {
var newStr1 = (str.slice(0, 2) + "\xa0" + str.slice(2))
var newStr2 = (newStr1.slice(0, 6) + "\xa0" + newStr1.slice(6));
var newStr3 = (newStr2.slice(0, 10) + "\xa0" + newStr2.slice(10));
var newStr4 = (newStr3.slice(0, 14) + "\xa0" + newStr3.slice(14));
return newStr4
}
return str
}
function printExpressData(dataInfo, jContact, jAddress, jTel) {
var LODOP = getLodop(); var LODOP = getLodop();
LODOP.PRINT_INIT("运单打印"); LODOP.PRINT_INIT("运单打印");
// LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "100mm*148mm"); // LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "100mm*148mm");
LODOP.ADD_PRINT_TEXT(22, 115, 200, 20, "打印时间:"); // LODOP.ADD_PRINT_TEXT(22, 115, 200, 20, "打印时间:" + getNowFormatDate());
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); // LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); // LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_TEXT(32, 115, 200, 20, "第1次打印"); // LODOP.ADD_PRINT_TEXT(32, 115, 200, 20, "第1次打印");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); // LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); // LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_TEXT(98, 55, 42, 20, "1/1"); // LODOP.ADD_PRINT_TEXT(98, 55, 42, 20, "1/1");
LODOP.ADD_PRINT_TEXT(60, 20, 100, 20, "FQ"); LODOP.ADD_PRINT_TEXT(60, 20, 100, 20, "FQ");
LODOP.ADD_PRINT_TEXT(32, 190, 200, 20, "序号1"); // LODOP.ADD_PRINT_TEXT(32, 190, 200, 20, "序号1");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); // LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 5); // LODOP.SET_PRINT_STYLEA(0, "FontSize", 5);
LODOP.ADD_PRINT_BARCODE(45, 55, "80mm", "13mm", "128Auto", "mo6789056"); LODOP.ADD_PRINT_BARCODE(45, 55, "80mm", "13mm", "128Auto", dataInfo.mailno);
LODOP.SET_PRINT_STYLEA(0, "ShowBarText", 0); LODOP.SET_PRINT_STYLEA(0, "ShowBarText", 0);
LODOP.ADD_PRINT_TEXT(98, 95, 500, 15, "母单号69678"); LODOP.ADD_PRINT_TEXT(98, 95, 500, 15, "运单号 " + substrMailno(dataInfo.mailno));
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 9); LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(9, 290, 100, 40, "proCode"); LODOP.ADD_PRINT_TEXT(9, 290, 100, 40, dataInfo.proCode);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 26); LODOP.SET_PRINT_STYLEA(0, "FontSize", 26);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(125, 10, 500, 45, "destRouteLabel"); LODOP.ADD_PRINT_TEXT(125, 10, 500, 45, dataInfo.destRouteLabel);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 33); LODOP.SET_PRINT_STYLEA(0, "FontSize", 33);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_ELLIPSE(175, 18, 41, 39, 0, 1); LODOP.ADD_PRINT_ELLIPSE(175, 18, 41, 39, 0, 1);
LODOP.ADD_PRINT_TEXT(183, 27, 31, 31, "收"); LODOP.ADD_PRINT_TEXT(183, 27, 31, 31, "收");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 17); LODOP.SET_PRINT_STYLEA(0, "FontSize", 17);
LODOP.ADD_PRINT_TEXT(181, 76, 200, 20, "dcontact"); LODOP.ADD_PRINT_TEXT(181, 76, 200, 20, dataInfo.expressContacts);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(181, 230, 296, 20, "158***999"); LODOP.ADD_PRINT_TEXT(181, 230, 296, 20, dataInfo.expressPhone.substr(0, 3) + "****" + dataInfo.expressPhone.substr(8, 11));
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(195, 74, 296, 39, "beijing"); LODOP.ADD_PRINT_TEXT(195, 74, 296, 39, dataInfo.expressAddress);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "desc"); if (dataInfo.freightPrice > 0) {
LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付 " + dataInfo.freightPrice + "元");
} else {
LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付");
}
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2); LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1)
LODOP.ADD_PRINT_TEXT(263, 21, 120, 50, "codingMapping"); LODOP.ADD_PRINT_TEXT(263, 21, 120, 50, dataInfo.cargoTypeCode);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 30); LODOP.SET_PRINT_STYLEA(0, "FontSize", 30);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2); LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_BARCODE(228, 150, 115, 99, "QRCode", "7895678768"); LODOP.ADD_PRINT_BARCODE(228, 150, 115, 99, "QRCode", dataInfo.twoDimensionCode);
LODOP.SET_PRINT_STYLEA(0, "QRCodeVersion", 7); LODOP.SET_PRINT_STYLEA(0, "QRCodeVersion", 7);
LODOP.SET_PRINT_STYLEA(0, "DataCharset", "UTF-8"); LODOP.SET_PRINT_STYLEA(0, "DataCharset", "UTF-8");
LODOP.ADD_PRINT_TEXT("61.94mm", "67.47mm", "7.41mm", "21.17mm", "已\r\n\r\n视"); LODOP.ADD_PRINT_TEXT("61.94mm", "67.47mm", "7.41mm", "21.17mm", "已\r\n\r\n视");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 15); LODOP.SET_PRINT_STYLEA(0, "FontSize", 15);
LODOP.ADD_PRINT_TEXT(235, 300, 80, 50, "proName"); LODOP.ADD_PRINT_TEXT(235, 300, 80, 50, dataInfo.proName);
LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(295, 300, 80, 20, dataInfo.expressTypeCode);
LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10); LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_ELLIPSE(329, 18, 41, 38, 0, 1); LODOP.ADD_PRINT_ELLIPSE(329, 18, 41, 38, 0, 1);
LODOP.ADD_PRINT_TEXT(336, 27, 31, 31, "寄"); LODOP.ADD_PRINT_TEXT(336, 27, 31, 31, "寄");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 17); LODOP.SET_PRINT_STYLEA(0, "FontSize", 17);
LODOP.ADD_PRINT_TEXT(335, 76, 200, 15, "jcontact"); LODOP.ADD_PRINT_TEXT(335, 76, 200, 15, jContact);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(335, 230, 200, 15, "158***9999"); LODOP.ADD_PRINT_TEXT(335, 230, 200, 15, jTel);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(350, 74, 296, 30, "beijingshi"); LODOP.ADD_PRINT_TEXT(350, 74, 296, 30, jAddress);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 8); LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1) LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(388, 10, 57, 15, "托寄物:"); LODOP.ADD_PRINT_TEXT(388, 10, 57, 15, "托寄物:");
LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 7); LODOP.SET_PRINT_STYLEA(0, "FontSize", 7);
LODOP.ADD_PRINT_TEXT(400, 10 , 180, 70, "mailingContent"); LODOP.ADD_PRINT_TEXT(400, 10, 180, 70, "演出票");
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 7); LODOP.SET_PRINT_STYLEA(0, "FontSize", 7);
...@@ -197,13 +239,13 @@ ...@@ -197,13 +239,13 @@
LODOP.ADD_PRINT_TEXT(433, 200, 57, 15, "重量:"); LODOP.ADD_PRINT_TEXT(433, 200, 57, 15, "重量:");
LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 7); LODOP.SET_PRINT_STYLEA(0, "FontSize", 7);
LODOP.ADD_PRINT_TEXT(433, 225, 80, 15, "2kg"); LODOP.ADD_PRINT_TEXT(433, 225, 80, 15, "1kg");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 7); LODOP.SET_PRINT_STYLEA(0, "FontSize", 7);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
LODOP.ADD_PRINT_TEXT(483, 10, 55, 15, "备注:"); LODOP.ADD_PRINT_TEXT(483, 10, 55, 15, "备注:");
LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "宋体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 7); LODOP.SET_PRINT_STYLEA(0, "FontSize", 7);
LODOP.ADD_PRINT_TEXT(494, 10, 180, 55, "remarks"); LODOP.ADD_PRINT_TEXT(494, 10, 180, 55, dataInfo.timeTitle + " " + dataInfo.ticketsTitle + "\r\n数量 " + dataInfo.number);
LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体"); LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 7); LODOP.SET_PRINT_STYLEA(0, "FontSize", 7);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
...@@ -232,23 +274,41 @@ ...@@ -232,23 +274,41 @@
LODOP.ADD_PRINT_LINE("147mm", "0mm", "147mm", "100mm", 0, 1); LODOP.ADD_PRINT_LINE("147mm", "0mm", "147mm", "100mm", 0, 1);
LODOP.PRINT(); LODOP.PRINT();
} }
function printExpress(orderExpressId) { function printExpress(orderExpressId) {
/*var configPrint = { var data = '';
url: prefix + "/print", if (orderExpressId) {
var ids = [orderExpressId];
data = {"ids": ids.join()};
} else {
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
data = {"ids": rows.join()};
}
var configPrint = {
url: prefix + "/printExpress",
type: "post", type: "post",
dataType: "json", dataType: "json",
data: {ids: orderExpressId}, data: data,
beforeSend: function () { beforeSend: function () {
$.modal.loading("正在处理中,请稍后..."); $.modal.loading("正在获取数据中,请稍后...");
}, },
success: function (result) { success: function (result) {
$.modal.closeLoading(); $.modal.closeLoading();
var url = "https://img.zhengzai.tv/" + result.data; $.modal.loading("正在打印中,请稍后...");
window.location.href = url; var expressList = result.data.expressList;
var listLen = expressList.length;
var jContact = result.data.jcontact;
var jAddress = result.data.jaddress;
var jTel = result.data.jtel;
if (listLen > 0) {
$.each(expressList, function (index, value) {
printExpressData(value, jContact, jAddress, jTel);
});
}
$.modal.closeLoading();
} }
}; };
$.ajax(configPrint)*/ $.ajax(configPrint)
printExpressData();
} }
$(function () { $(function () {
...@@ -265,6 +325,10 @@ ...@@ -265,6 +325,10 @@
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{
field: 'orderExpressId',
title: '订单ID'
},
{ {
field: 'orderTicketsId', field: 'orderTicketsId',
title: '订单ID' title: '订单ID'
......
...@@ -16,6 +16,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst; ...@@ -16,6 +16,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.*; import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*; import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo; import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressPrintVo;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo; import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo; import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
...@@ -613,15 +614,21 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -613,15 +614,21 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
return ossPath; return ossPath;
} }
public List<OrderExpressListDao> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) { public KylinOrderExpressPrintVo printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds(); List<String> ids = performanceExpressSearchAdminParam.getIds();
List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintList(ids); List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintList(ids);
return list; KylinOrderExpressPrintVo kylinOrderExpressPrintVo = new KylinOrderExpressPrintVo();
kylinOrderExpressPrintVo.setExpressList(list);
kylinOrderExpressPrintVo.setJContact(jContact);
kylinOrderExpressPrintVo.setJAddress(jAddress);
kylinOrderExpressPrintVo.setJTel(jTel);
return kylinOrderExpressPrintVo;
} }
public List<OrderExpressListDao> batchPrintExpress(String performanceId) { public KylinOrderExpressPrintVo batchPrintExpress(String performanceId) {
List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999); List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999);
String ossPath = ""; String ossPath = "";
......
...@@ -54,4 +54,20 @@ public class OrderExpressListDao implements Serializable { ...@@ -54,4 +54,20 @@ public class OrderExpressListDao implements Serializable {
private String newAbflag; private String newAbflag;
private String createdAt; private String createdAt;
private String updatedAt; private String updatedAt;
private String expressContacts;
private String expressAddress;
private String expressPhone;
private String province;
private String city;
private String county;
private String number;
private String useStart;
private String timeTitle;
private String timeType;
private String ticketsTitle;
private String ticketsType;
} }
...@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.mapper; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.dao.OrderExpressListDao; import com.liquidnet.service.kylin.dao.OrderExpressListDao;
import com.liquidnet.service.kylin.entity.KylinOrderExpress; import com.liquidnet.service.kylin.entity.KylinOrderExpress;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -16,5 +17,6 @@ import java.util.List; ...@@ -16,5 +17,6 @@ import java.util.List;
*/ */
public interface KylinOrderExpressMapper extends BaseMapper<KylinOrderExpress> { public interface KylinOrderExpressMapper extends BaseMapper<KylinOrderExpress> {
List<OrderExpressListDao> selectPrintList(List<String> ids); List<OrderExpressListDao> selectPrintList(@Param("ids") List<String> ids);
} }
...@@ -4,18 +4,18 @@ ...@@ -4,18 +4,18 @@
<select id="selectPrintList" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao"> <select id="selectPrintList" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
SELECT a.*, SELECT a.*,
b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.numger b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number,
d.use_start, d.title, d.type, d.use_start, d.title AS time_title, d.type AS time_type,
e.title, e.type e.title AS tickets_title, e.type AS tickets_type
FROM kylin_order_express a FROM kylin_order_express a
INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
INNER JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id INNER JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
INNER JOIN kylin_tickets e ON c.ticket_id = e.tickets_id INNER JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
<where> <where>
AND a.order_express_id IN a.order_express_id IN
<foreach collection="ids" item="orderExpressId" index="index" open="(" close=")" separator=","> <foreach collection="ids" item="orderExpressId" index="index" open="(" close=")" separator=",">
${order_express_id} ${orderExpressId}
</foreach> </foreach>
</where> </where>
ORDER BY mid DESC ORDER BY mid DESC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment