Merge remote-tracking branch 'origin/master' into dev_redis_multidb

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -293,8 +293,8 @@ public class PerformancesExpressController extends BaseController {
     @RequiresPermissions("kylin:performancesExpress:batchPrintExpress")
     @PostMapping("/batchPrintExpress")
     @ResponseBody
-    public ResponseDto<KylinOrderExpressPrintVo> batchPrintExpress(@RequestParam("ids") String performanceId, @RequestParam("ticketId") String ticketId) {
-        KylinOrderExpressPrintVo res = performancesExpressServiceImpl.batchPrintExpress(performanceId, ticketId);
+    public ResponseDto<KylinOrderExpressPrintVo> batchPrintExpress(@RequestParam("ids") String performanceId, @RequestParam("ticketId") String ticketId, @RequestParam("printNum") Integer printNum) {
+        KylinOrderExpressPrintVo res = performancesExpressServiceImpl.batchPrintExpress(performanceId, ticketId, printNum);
         try {
             return ResponseDto.success(res);
         } catch (Exception e) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -47,7 +47,7 @@ var table = {
                     paginationLoop: false,
                     pageSize: 10,
                     pageNumber: 1,
-                    pageList: [10, 25, 50, 200],
+                    pageList: [10, 25, 50, 200, 500, 2000],
                     toolbar: "toolbar",
                     loadingFontSize: 13,
                     striped: false,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html

@@ -53,6 +53,12 @@
                     </select>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label is-required">数量：</label>
+                <div class="col-sm-10">
+                    <input class="form-control" type="text" name="printNum" id="printNum">
+                </div>
+            </div>
         </div>
     </form>
 </div>
@@ -266,7 +272,7 @@
         LODOP.PRINT();
     }
 
-    function printExpress(performanceId, ticketId) {
+    function printExpress(performanceId, ticketId, printNum) {
         var message = "确定打印吗？";
         $.modal.confirm(message, function () {
             try {
@@ -279,7 +285,7 @@
             }
             var data = '';
             var ids = [performanceId];
-            data = {"ids": ids.join(), "ticketId": ticketId};
+            data = {"ids": ids.join(), "ticketId": ticketId, "printNum": printNum};
             var configPrint = {
                 url: prefix + "/batchPrintExpress",
                 type: "post",
@@ -355,7 +361,8 @@
             shadeClose: true,
             btn1: function (index, layero) {
                 var ticketId = layero.find('#openTicketListTplSelect').val();
-                printExpress(performanceId, ticketId);
+                var printNum = layero.find('#printNum').val();
+                printExpress(performanceId, ticketId, printNum);
             }
         });
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -622,13 +622,13 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return kylinOrderExpressPrintVo;
     }
 
-    public KylinOrderExpressPrintVo batchPrintExpress(String performanceId, String ticketId) {
+    public KylinOrderExpressPrintVo batchPrintExpress(String performanceId, String ticketId, Integer printNum) {
         List<OrderExpressListDao> newList = new ArrayList<>();
         int count = 0;
         int limitNum = 1000;
         int mid = 0;
         do {
-            List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintListOfPerformanceId(performanceId, ticketId, mid, limitNum);
+            List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintListOfPerformanceId(performanceId, ticketId, mid, limitNum, printNum);
 
             if (!CollectionUtil.isEmpty(list)) {
                 newList.addAll(list);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderExpressMapper.java

@@ -23,7 +23,8 @@ public interface KylinOrderExpressMapper extends BaseMapper<KylinOrderExpress> {
             @Param("performanceId") String performanceId,
             @Param("ticketId") String ticketId,
             @Param("mid") Integer mid,
-            @Param("limitNum") Integer limitNum
+            @Param("limitNum") Integer limitNum,
+            @Param("printNum") Integer printNum
     );
 
     List<KylinOrderExpress> getCanCancelExpressList(

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderExpressMapper.xml

@@ -38,6 +38,7 @@
             AND a.performances_id = #{performanceId}
             <if test="ticketId != ''">AND e.tickets_id = #{ticketId}</if>
             AND a.mid > ${mid}
+            <if test="printNum != '' and  printNum > 0">AND a.mid > ${printNum}</if>
         </where>
         ORDER BY a.mid ASC
         LIMIT ${limitNum}