Merge branch 'dev' into 'mp-server-test'

导出盲票

See merge request quanshu/mp-server!126

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -187,18 +187,17 @@ public class TicketBoxMgrController extends BaseApiController {
 			int totalPage = totalSize%pageSize == 0 ? totalSize/pageSize : totalSize/pageSize+1;
 			for (int i = 0; i < totalPage; i++) {
 				LambdaQueryWrapper<Ticket> pageQueryWrapper = new LambdaQueryWrapper<Ticket>();
-				pageQueryWrapper.select(Ticket::getSerialNo, Ticket::getCipherLuckyNum, Ticket::getDrawNum);
 				pageQueryWrapper.eq(Ticket::getBoxId, ids.getIds().get(0));
 				pageQueryWrapper.orderByAsc(Ticket::getSerialNo);
 				pageQueryWrapper.last("limit "+ (i*pageSize) +", " + pageSize);
-				List<Ticket> list = ticketService.list(pageQueryWrapper);
+				List<Ticket> list = ticketService.listTicket(pageQueryWrapper);
 				if(null != list && list.size() > 0 ) {
 					listAll.addAll(list);
 				}
 			}
 		}else {
 			queryWrapper.orderByAsc(Ticket::getSerialNo);
-			listAll = ticketService.list(queryWrapper);
+			listAll = ticketService.listTicket(queryWrapper);
 		}
 
 		if(null != listAll && listAll.size() > 0 ) {

mp-service/src/main/java/com/qs/mp/admin/mapper/TicketMapper.java

@@ -16,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface TicketMapper extends BaseMapper<Ticket> {
   Ticket getRandOne(@Param(Constants.WRAPPER) Wrapper<Ticket> queryWrapper);
+
+  List<Ticket> listTicket(@Param(Constants.WRAPPER) Wrapper<Ticket> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/ITicketService.java

@@ -25,9 +25,9 @@ public interface ITicketService extends IService<Ticket> {
    * @param queryWrapper
    * @return
    */
-  Ticket getRandOne(@Param(Constants.WRAPPER) Wrapper<Ticket> queryWrapper);
-  
-  
+  Ticket getRandOne(Wrapper<Ticket> queryWrapper);
+
+
   /**
    * 盲票导入
    * 导入就是只根据盲票序号更新幸运数字和抽奖数字两个字段
@@ -35,4 +35,11 @@ public interface ITicketService extends IService<Ticket> {
    * @return 导入的条数
    */
   int importTicket(List<TicketExcel> ticketExcelList);
+
+  /**
+   * 查询盲票列表
+   * @param queryWrapper
+   * @return
+   */
+  List<Ticket> listTicket(Wrapper<Ticket> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketServiceImpl.java

@@ -64,8 +64,12 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
 				return ticketList.size();
 			}
 		}
-		
+
 		return 0;
 	}
 
+	@Override
+	public List<Ticket> listTicket(Wrapper<Ticket> queryWrapper) {
+		return getBaseMapper().listTicket(queryWrapper);
+	}
 }

mp-service/src/main/resources/mapper/admin/TicketMapper.xml

@@ -31,4 +31,15 @@
         order by rand() limit 1
     </select>
 
+    <select id="listTicket" resultMap="BaseResultMap">
+        select serial_no, cipher_lucky_num, draw_num
+        from mp_ticket t1
+        left join (
+            select ticket_id
+            from mp_ticket
+                     ${ew.customSqlSegment}
+        ) t2
+        on t1.ticket_id = t2.ticket_id
+
+    </select>
 </mapper>