订单查询和导出修改

src/main/java/com/template/controller/HouseOrderController.java

@@ -670,6 +670,7 @@ public class HouseOrderController implements HouseOrderAPI {
     @Override
     public CommonResult pageList(int adminId, int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime,
                                  String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime,
+                                 String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,
                                  String reserveLiveStartTime, String reserveLiveEndTime, String reserveLeaveStartTime, String reserveLeaveEndTime,
                                  String houseId, Integer keyType, Integer giveBack, Integer buildingId, Integer orgId) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
@@ -692,6 +693,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
         PageUtils<HouseOrderPageListVo> pageList = houseOrderService.pageList(page, size, keyWord, houseType, orderStatus, payPriceStartTime,
                 payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime,
+                liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,
                 reserveLiveStartTime, reserveLiveEndTime, reserveLeaveStartTime, reserveLeaveEndTime, houseId, keyType, giveBack, buildingId, orgId);
         List<HouseOrderPageListVo> list = pageList.getList();
         for (int i = 0; i < list.size(); i++) {
@@ -1593,7 +1595,9 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String reserveLiveStartTime, String reserveLiveEndTime, String reserveLeaveStartTime, String reserveLeaveEndTime, String houseId, Integer keyType, Integer giveBack, Integer buildingId, Integer orgId) {
+    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime,
+                            String cancelEndTime,String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,
+                            String reserveLiveStartTime, String reserveLiveEndTime, String reserveLeaveStartTime, String reserveLeaveEndTime, String houseId, Integer keyType, Integer giveBack, Integer buildingId, Integer orgId) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -1604,7 +1608,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //            return CommonResult.fail("此账号暂无该权限");
 //        }
 
-        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, reserveLiveStartTime, reserveLiveEndTime, reserveLeaveStartTime, reserveLeaveEndTime, houseId, keyType, giveBack, buildingId, orgId);
+        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime,liveStartTime, liveEndTime, leaveStartTime, leaveEndTime, reserveLiveStartTime, reserveLiveEndTime, reserveLeaveStartTime, reserveLeaveEndTime, houseId, keyType, giveBack, buildingId, orgId);
 
         //        导出
         Workbook workbook = new XSSFWorkbook();
@@ -3735,7 +3739,7 @@ public class HouseOrderController implements HouseOrderAPI {
                         count = 0;
                         break;
                     }
-                    idList.add(scheduleList.get(0).getId());
+                    idList.add(Integer.valueOf(scheduleList.get(0).getId()));
                 }
 
             }

src/main/java/com/template/mapper/TbCourseSchedulingMapper.java

@@ -24,7 +24,7 @@ import java.util.Map;
 public interface TbCourseSchedulingMapper extends BaseMapper<TbCourseScheduling> {
 
     @Select("select * from(\n" +
-            "select a.push_jc jc,a.push_zj zj,a.push_djz djz,a.push_xq xq,a.push_xn xn,a.push_jsxm jsxm,a.push_jsgh jsgh,\n" +
+            "select concat('a',a.id) id,a.push_jc jc,a.push_zj zj,a.push_djz djz,a.push_xq xq,a.push_xn xn,a.push_jsxm jsxm,a.push_jsgh jsgh,\n" +
             "a.dt `dateTime`,'自动导入' remark,now() createTime,now() updateTime,'0' createUser,'0' updateUser, 0 deleted  from \n" +
             "(select \n" +
             "date_add((select cfg_value from tb_config tc where cfg_key='termBeginsTime' ),interval (push_djz -1)*7+push_zj-1 day)  `dt`,a.*\n" +
@@ -35,7 +35,7 @@ public interface TbCourseSchedulingMapper extends BaseMapper<TbCourseScheduling>
             "where  TIMESTAMPDIFF(DAY,a.dt,b.dt)=1 and a.push_jsgh=b.push_jsgh\n" +
             "union all\n" +
             "select \n" +
-            "push_jc jc,push_zj zj,push_djz djz,push_xq xq,push_xn xn,push_jsxm jsxm,push_jsgh jsgh,\n" +
+            "concat('a',id) id,push_jc jc,push_zj zj,push_djz djz,push_xq xq,push_xn xn,push_jsxm jsxm,push_jsgh jsgh,\n" +
             "date_add((select cfg_value from tb_config tc where cfg_key='termBeginsTime' ),interval (push_djz -1)*7+push_zj-1 day)  `dateTime`,\n" +
             "'自动导入' remark,now() createTime,now() updateTime,'0' createUser,'0' updateUser,0 deleted\n" +
             "from  tb_course_scheduling where push_xq =#{xueqi} AND push_xn = #{xuenian} and IFNULL(OPERATION_TYPE,'') !='deleted' and SUBSTRING_INDEX(push_jc,\"-\", -1)>=8 \n" +

src/main/java/com/template/model/pojo/ClassSchedule.java

@@ -26,8 +26,8 @@ public class ClassSchedule implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id", type = IdType.UUID)
+    private String id;
 
     @ApiModelProperty(value = "节次")
     private String jc;

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -79,14 +79,24 @@
                 AND #{cancelEndTime} >= ho.cancel_time
             </if>
 
+            <if test="reserveLiveStartTime != null and reserveLiveStartTime != '' and reserveLiveEndTime != null and reserveLiveEndTime != ''  ">
+                AND #{reserveLiveEndTime} >= ho.reserve_live_time
+                AND ho.reserve_live_time >= #{reserveLiveStartTime}
+            </if>
+
+            <if test="reserveLeaveStartTime != null and reserveLeaveStartTime != '' and reserveLeaveEndTime != null and reserveLeaveEndTime != ''  ">
+                AND #{reserveLeaveEndTime} >= ho.reserve_leave_time
+                AND ho.reserve_leave_time >= #{reserveLeaveStartTime}
+            </if>
+
             <if test="liveStartTime != null and liveStartTime != '' and liveEndTime != null and liveEndTime != ''  ">
-                AND #{liveEndTime} >= ho.reserve_live_time
-                AND ho.reserve_live_time >= #{liveStartTime}
+                AND #{liveEndTime} >= ho.live_time
+                AND ho.live_time >= #{liveStartTime}
             </if>
 
             <if test="leaveStartTime != null and leaveStartTime != '' and leaveEndTime != null and leaveEndTime != ''  ">
-                AND #{leaveEndTime} >= ho.reserve_leave_time
-                AND ho.reserve_leave_time >= #{leaveStartTime}
+                AND #{leaveEndTime} >= ho.leave_time
+                AND ho.leave_time >= #{leaveStartTime}
             </if>
 
             <if test="houseId != null and houseId != ''">
@@ -186,6 +196,16 @@
                 AND #{cancelEndTime} >= ho.cancel_time
             </if>
 
+            <if test="reserveLiveStartTime != null and reserveLiveStartTime != '' and reserveLiveEndTime != null and reserveLiveEndTime != ''  ">
+                AND #{reserveLiveEndTime} >= ho.reserve_live_time
+                AND ho.reserve_live_time >= #{reserveLiveStartTime}
+            </if>
+
+            <if test="reserveLeaveStartTime != null and reserveLeaveStartTime != '' and reserveLeaveEndTime != null and reserveLeaveEndTime != ''  ">
+                AND #{reserveLeaveEndTime} >= ho.reserve_leave_time
+                AND ho.reserve_leave_time >= #{reserveLeaveStartTime}
+            </if>
+
             <if test="liveStartTime != null and liveStartTime != '' and liveEndTime != null and liveEndTime != ''  ">
                 AND #{liveEndTime} >= ho.live_time
                 AND ho.live_time >= #{liveStartTime}