Merge branch 'dev_smile_0706' into pre

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -86,11 +87,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public TableDataInfo listShow(SmileShowParam smileShowParam) {
-        PageInfo<KylinPerformances> pageInfo;
         TableDataInfo rspData = new TableDataInfo();
         //查询所有代理的演出id
-        List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
-        pageInfo = new PageInfo<>(kylinPerformancesList);
+        List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent((smileShowParam.getPageNum()-1)* smileShowParam.getPageSize(),smileShowParam.getPageSize());
         List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformances -> {
             ShowVo vo = new ShowVo();
             //演出id
@@ -126,7 +125,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         }).collect(Collectors.toList());
         rspData.setCode(0);
         rspData.setRows(showVoList);
-        rspData.setTotal(pageInfo.getTotal());
+        rspData.setTotal(smileAgentMapper.selectCountPerId());
         return rspData;
     }
 
@@ -427,6 +426,14 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         showAgentVo.setPerformanceId(performancesId);
         showAgentVo.setTicketId(ticketAndStatusDao.getTicketsId());
         showAgentVo.setTitle(ticketAndStatusDao.getTitle());
+        //开始结束时间转换年月日
+        String start = ticketAndStatusDao.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String end = ticketAndStatusDao.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        if (start.equals(end)) {
+            showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat(")"));
+        } else {
+            showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat("--").concat(end).concat(")"));
+        }
         //总代票提
         showAgentVo.setTotalCarry(smileAgent.getTotalCarry());
         //普代票提

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

@@ -67,7 +67,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
 
     List<KylinPerformances> selectByComment();
 
-    List<KylinPerformances> selectPerIdByAgent();
+    List<KylinPerformances> selectPerIdByAgent(@Param("pageNumber") Integer pageNumber, @Param("pageSize")Integer pageSize);
 
     List<KylinPerformancesDao> selectTicketIdByPerId(@Param("performancesId") String performancesId);
 

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

@@ -720,6 +720,7 @@ GROUP BY user_mobile;
           AND kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
         group by kp.performances_id
         order by kp.comment desc, kp.time_start asc
+        limit #{pageNumber},#{pageSize}
     </select>
 
     <select id="selectTicketIdByPerId" resultType="com.liquidnet.service.kylin.dao.KylinPerformancesDao">

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java

@@ -31,4 +31,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
     List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
 
     List<SmileAgent> selectAgentCarryGtZeroByPerId(@Param("performancesId")String performancesId);
+
+    int selectCountPerId();
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -117,4 +117,8 @@
           AND del_tag = 0
     </select>
 
+    <select id="selectCountPerId"  resultType="int">
+        SELECT COUNT(sa.id) FROM (SELECT id FROM smile_agent WHERE del_tag = 0 GROUP BY performance_id) sa;
+    </select>
+
 </mapper>