feat: 开票-调整

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/controller/SysDeptRechargeController.java

@@ -10,7 +10,6 @@ import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptInvoice;
 import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptRecharge;
 import com.qunzhixinxi.hnqz.admin.recharge.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.recharge.enums.InvoiceApprovalStatus;
-import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptInvoiceRelationMapper;
 import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptInvoiceService;
 import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptRechargeRecordService;
 import com.qunzhixinxi.hnqz.admin.recharge.service.SysDeptRechargeService;
@@ -18,7 +17,6 @@ import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceRelationVO;
 import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptRechargeRecordForDeptVO;
 import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptRechargeRecordVO;
 import com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptRechargeVO;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -94,18 +92,6 @@ public class SysDeptRechargeController {
         return R.ok(deptRechargeService.pageRechargeForAdmin(page, toPage));
     }
 
-//    /**
-//     * 分页查询(园区)
-//     *
-//     * @param page 分页参数
-//     * @param toPage 条件参数
-//     * @return 分页结果
-//     */
-//    @GetMapping("/page-for-park")
-//    public R<IPage<SysDeptRechargeForParkVO>> pageRechargeForPark(Page<SysDeptRechargeForParkVO> page, SysDeptRechargeRequest.ToPage toPage) {
-//        return R.ok(deptRechargeService.pageRechargeForPark(page, toPage));
-//    }
-
     /**
      * 积分充值/分配/发包记录(平台财务/园区)
      *

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/SysDeptInvoiceService.java

@@ -35,7 +35,7 @@ public interface SysDeptInvoiceService extends IService<SysDeptInvoice> {
     IPage<SysDeptInvoiceVO> pageInvoiceForAdmin(Page<SysDeptInvoiceVO> page, SysDeptInvoiceRequest.ToInvoicePage toInvoicePage);
 
     /**
-     * 园区-开票列表
+     * 开票记录
      *
      * @param page 分页参数
      * @param toInvoicePage 请求参数

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/impl/SysDeptInvoiceServiceImpl.java

@@ -196,6 +196,7 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
             Set<Integer> likeDeptIds = queryLikeDepts.stream().map(SysDept::getDeptId).collect(Collectors.toSet());
             queryWrapper.in(SysDeptInvoice::getDeptId, likeDeptIds);
         }
+        queryWrapper.orderByDesc(SysDeptInvoice::getCreateTime);
 
         Page<SysDeptInvoice> invoicePage = this.page(new Page<>(page.getCurrent(), page.getSize()), queryWrapper);
 
@@ -223,7 +224,7 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
     }
 
     /**
-     * 园区-开票列表
+     * 开票记录
      *
      * @param page 分页参数
      * @param toInvoicePage 请求参数
@@ -251,6 +252,7 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
             Set<Integer> likeDeptIds = queryLikeDepts.stream().map(SysDept::getDeptId).collect(Collectors.toSet());
             queryWrapper.in(SysDeptInvoice::getDeptId, likeDeptIds);
         }
+        queryWrapper.orderByDesc(SysDeptInvoice::getCreateTime);
 
         Page<SysDeptInvoice> invoicePage = this.page(new Page<>(page.getCurrent(), page.getSize()), queryWrapper);