yuansh 3 mēneši atpakaļ
vecāks
revīzija
5db48db6b5
18 mainītis faili ar 54 papildinājumiem un 0 dzēšanām
  1. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProjectArchiveController.java
  2. 1 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java
  3. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurCommissionRequestController.java
  4. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurDeliveryNoteController.java
  5. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurInquiryFormController.java
  6. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurOrderController.java
  7. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPaymentController.java
  8. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPaymentRequestController.java
  9. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPurchaseQuotationController.java
  10. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurQuotationSelectionController.java
  11. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurShippingFeeController.java
  12. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleContractController.java
  13. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleDeliveryController.java
  14. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInquiryFormController.java
  15. 11 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInvoiceController.java
  16. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleOrderController.java
  17. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleQuotationController.java
  18. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleRfpController.java

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProjectArchiveController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -54,6 +55,7 @@ public class BaseProjectArchiveController extends JeecgController<BaseProjectArc
     //@AutoLog(value = "项目档案-分页列表查询")
     @ApiOperation(value = "项目档案-分页列表查询", notes = "项目档案-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="baseCode/ProjectArchive/BaseProjectArchiveList")
     public Result<IPage<BaseProjectArchive>> queryPageList(BaseProjectArchive baseProjectArchive,
                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 1 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java

@@ -43,6 +43,7 @@ public class BaseProjectArchive implements Serializable {
     @ApiModelProperty(value = "创建人")
     @Excel(name = "创建人(create by)", width = 15)
     private String createBy;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurCommissionRequestController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurPayment;
 import org.jeecg.modules.purCode.service.IPurPaymentService;
@@ -83,6 +84,7 @@ public class PurCommissionRequestController {
     //@AutoLog(value = "佣金付款申请-分页列表查询")
     @ApiOperation(value = "佣金付款申请-分页列表查询", notes = "佣金付款申请-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/commissionPayRequest/commissionPayRequestList")
     public Result<IPage<PurCommissionRequest>> queryPageList(PurCommissionRequest purCommissionRequest,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurDeliveryNoteController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.*;
 import org.jeecg.modules.purCode.vo.PurDeliveryNoteAlert;
@@ -88,6 +89,7 @@ public class PurDeliveryNoteController {
 	//@AutoLog(value = "到货单(delivery note)-分页列表查询")
 	@ApiOperation(value="到货单(delivery note)-分页列表查询", notes="到货单(delivery note)-分页列表查询")
 	@GetMapping(value = "/list")
+	@PermissionData(pageComponent="purchase/arrivedGoods/ArriveGoodsList")
 	public Result<IPage<PurDeliveryNote>> queryPageList(PurDeliveryNote purDeliveryNote,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -108,6 +110,7 @@ public class PurDeliveryNoteController {
 	  */
 	 @ApiOperation(value = "到货单弹框明细", notes = "到货单弹框明细")
 	 @GetMapping(value = "/purDeliveryNoteArrivalAlert")
+	 @PermissionData(pageComponent="purchase/arrivedGoods/ArriveGoodsList")
 	 public Result<IPage<PurDeliveryNoteAlert>> purDeliveryNoteArrivalAlert(PurDeliveryNoteAlert saleInquiryForm,
 																   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 																   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurInquiryFormController.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
 import org.jeecg.modules.baseCode.service.IBaseExchangeRateService;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
@@ -88,6 +89,7 @@ public class PurInquiryFormController {
     //@AutoLog(value = "采购询价单-分页列表查询")
     @ApiOperation(value = "采购询价单-分页列表查询", notes = "采购询价单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/purchaseInquiryForm/purchaseInquiryFormList")
     public Result<IPage<PurInquiryForm>> queryPageList(PurInquiryForm purInquiryForm,
                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -109,6 +111,7 @@ public class PurInquiryFormController {
      */
     @ApiOperation(value = "采购询价单-弹框分页列表查询", notes = "采购询价单-弹框分页列表查询")
     @GetMapping(value = "/alertPurInquiryList")
+    @PermissionData(pageComponent="purchase/purchaseInquiryForm/purchaseInquiryFormList")
     public Result<IPage<SaleInquiryFormAlert>> alertPurInquiryList(SaleInquiryFormAlert saleInquiryForm,
                                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurOrderController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.*;
 import org.jeecg.modules.purCode.service.*;
@@ -82,6 +83,7 @@ public class PurOrderController {
     //@AutoLog(value = "采购订单-分页列表查询")
     @ApiOperation(value = "采购订单-分页列表查询", notes = "采购订单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/purchaseOrder/PurchaseOrderFormList")
     public Result<IPage<PurOrder>> queryPageList(PurOrder purOrder,
                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -103,6 +105,7 @@ public class PurOrderController {
      */
     @ApiOperation(value = "采购订单弹框明细", notes = "采购订单弹框明细")
     @GetMapping(value = "/selectPurOrderDetailAlert")
+    @PermissionData(pageComponent="purchase/purchaseOrder/PurchaseOrderFormList")
     public Result<IPage<PurOrderAlert>> selectContractDetailAlert(PurOrderAlert saleInquiryForm,
                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPaymentController.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.util.oConvertUtils;
@@ -72,6 +73,7 @@ public class PurPaymentController extends JeecgController<PurPayment, IPurPaymen
     //@AutoLog(value = "付款单-分页列表查询")
     @ApiOperation(value = "付款单-分页列表查询", notes = "付款单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/payment/paymentList")
     public Result<IPage<PurPayment>> queryPageList(PurPayment purPayment,
                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPaymentRequestController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurPayment;
 import org.jeecg.modules.purCode.service.IPurPaymentService;
@@ -84,6 +85,7 @@ public class PurPaymentRequestController {
     //@AutoLog(value = "采购付款申请-分页列表查询")
     @ApiOperation(value = "采购付款申请-分页列表查询", notes = "采购付款申请-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/purPaymentRequest/purPaymentRequesttList")
     public Result<IPage<PurPaymentRequest>> queryPageList(PurPaymentRequest purPaymentRequest,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurPurchaseQuotationController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
 import org.jeecg.modules.baseCode.service.IBaseExchangeRateService;
@@ -88,6 +89,7 @@ public class PurPurchaseQuotationController {
     //@AutoLog(value = "采购报价单-分页列表查询")
     @ApiOperation(value = "采购报价单-分页列表查询", notes = "采购报价单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/purchaseQuotationFrm/purchaseQuotationFormList")
     public Result<IPage<PurPurchaseQuotation>> queryPageList(PurPurchaseQuotation purPurchaseQuotation,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -244,6 +246,7 @@ public class PurPurchaseQuotationController {
      */
     @ApiOperation(value = "供应商报价明细弹框", notes = "供应商报价明细弹框")
     @GetMapping(value = "/supplierQuotationDetails2")
+    @PermissionData(pageComponent="purchase/purchaseQuotationFrm/purchaseQuotationFormList")
     public Result<IPage<SupplierQuotationDetails>> supplierQuotationDetails2(SupplierQuotationDetails saleInquiryForm,
                                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurQuotationSelectionController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurOrder;
 import org.jeecg.modules.purCode.entity.PurQuotationSelection;
@@ -93,6 +94,7 @@ public class PurQuotationSelectionController {
     //@AutoLog(value = "采购报价选定-分页列表查询")
     @ApiOperation(value = "采购报价选定-分页列表查询", notes = "采购报价选定-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="purchase/selectionQuotationForm/selectionQuotationFormList")
     public Result<IPage<PurQuotationSelection>> queryPageList(PurQuotationSelection purQuotationSelection,
                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -105,6 +107,7 @@ public class PurQuotationSelectionController {
 
     @ApiOperation(value = "供应商报价选定", notes = "供应商报价选定")
     @GetMapping(value = "/purQuotationSelectionProductAlert")
+    @PermissionData(pageComponent="purchase/selectionQuotationForm/selectionQuotationFormList")
     public Result<IPage<PurQuotationSelectionAlert>> purQuotationSelectionProductAlert(PurQuotationSelectionAlert quotationProject,
                                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurShippingFeeController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurShippingFee;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -79,6 +80,7 @@ public class PurShippingFeeController {
 	//@AutoLog(value = "运费采购订单-分页列表查询")
 	@ApiOperation(value="运费采购订单-分页列表查询", notes="运费采购订单-分页列表查询")
 	@GetMapping(value = "/list")
+	@PermissionData(pageComponent="purchase/freightPurchaseOrder/FreightPurchaseOrderList")
 	public Result<IPage<PurShippingFee>> queryPageList(PurShippingFee purShippingFee,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleContractController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.saleCode.entity.*;
 import org.jeecg.modules.saleCode.service.*;
@@ -83,6 +84,7 @@ public class SaleContractController {
     //@AutoLog(value = "销售合同主表-分页列表查询")
     @ApiOperation(value = "销售合同主表-分页列表查询", notes = "销售合同主表-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="saleCode/saleContract/SaleContractList")
     public Result<IPage<SaleContract>> queryPageList(SaleContract saleContract,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -104,6 +106,7 @@ public class SaleContractController {
      */
     @ApiOperation(value = "销售合同弹框明细", notes = "销售合同弹框明细")
     @GetMapping(value = "/selectContractDetailAlert")
+    @PermissionData(pageComponent="saleCode/saleContract/SaleContractList")
     public Result<IPage<SaleContractAlert>> selectContractDetailAlert(SaleContractAlert saleInquiryForm,
                                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleDeliveryController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.saleCode.entity.*;
 import org.jeecg.modules.saleCode.service.ISaleInvoiceService;
@@ -88,6 +89,7 @@ public class SaleDeliveryController {
     //@AutoLog(value = "发货通知单(delivery notice)-分页列表查询")
     @ApiOperation(value = "发货通知单(delivery notice)-分页列表查询", notes = "发货通知单(delivery notice)-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="saleCode/deliveryNotice/deliveryNoticeList")
     public Result<IPage<SaleDelivery>> queryPageList(SaleDelivery saleDelivery,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -100,6 +102,7 @@ public class SaleDeliveryController {
 
     @ApiOperation(value = "发货通知单弹框明细", notes = "发货通知单弹框明细")
     @GetMapping(value = "/selectSaleDeliveryAlert")
+    @PermissionData(pageComponent="saleCode/deliveryNotice/deliveryNoticeList")
     public Result<IPage<SaleDeliveryAlert>> selectSaleDeliveryAlert(SaleDeliveryAlert saleInquiryForm,
                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInquiryFormController.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurInquiryForm;
 import org.jeecg.modules.purCode.service.IPurInquiryFormService;
@@ -83,6 +84,7 @@ public class SaleInquiryFormController {
     //@AutoLog(value = "销售询价单-分页列表查询")
     @ApiOperation(value = "销售询价单-分页列表查询", notes = "销售询价单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="saleCode/saleInquiryForm/SaleInquiryFormList")
     public Result<IPage<SaleInquiryForm>> queryPageList(SaleInquiryForm saleInquiryForm,
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -104,6 +106,7 @@ public class SaleInquiryFormController {
      */
     @ApiOperation(value = "销售询价单-弹框分页列表查询", notes = "销售询价单-弹框分页列表查询")
     @GetMapping(value = "/alertSaleInquiryList")
+    @PermissionData(pageComponent="saleCode/saleInquiryForm/SaleInquiryFormList")
     public Result<IPage<SaleInquiryFormAlert>> alertSaleInquiryList(SaleInquiryFormAlert saleInquiryForm,
                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 11 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInvoiceController.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.saleCode.controller;
 import java.io.UnsupportedEncodingException;
 import java.io.IOException;
 import java.net.URLDecoder;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -103,7 +105,16 @@ public class SaleInvoiceController {
         IPage<SaleInvoice> pageList = saleInvoiceService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
+    public static long getDaysBetweenDates(LocalDate startDate, LocalDate endDate) {
+        return ChronoUnit.DAYS.between(startDate, endDate);
+    }
 
+    public static void main(String[] args) {
+        LocalDate startDate = LocalDate.of(2025, 1, 1);
+        LocalDate endDate = LocalDate.now();
+        long days = getDaysBetweenDates(startDate, endDate);
+        System.out.println("相差天数:" + days);
+    }
     /**
      * 添加
      *

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleOrderController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.purCode.entity.PurCommissionRequest;
 import org.jeecg.modules.purCode.entity.PurOrder;
@@ -92,6 +93,7 @@ public class SaleOrderController {
     //@AutoLog(value = "销售订单-分页列表查询")
     @ApiOperation(value = "销售订单-分页列表查询", notes = "销售订单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="saleCode/salesOrder/SaleOrderFormList")
     public Result<IPage<SaleOrder>> queryPageList(SaleOrder saleOrder,
                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -114,6 +116,7 @@ public class SaleOrderController {
      */
     @ApiOperation(value = "销售订单弹框明细", notes = "销售订单弹框明细")
     @GetMapping(value = "/selectSaleOrderDetailAlert")
+    @PermissionData(pageComponent="saleCode/salesOrder/SaleOrderFormList")
     public Result<IPage<SaleOrderAlert>> selectContractDetailAlert(SaleOrderAlert saleInquiryForm,
                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleQuotationController.java

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.modules.saleCode.entity.*;
 import org.jeecg.modules.saleCode.service.*;
@@ -77,6 +78,7 @@ public class SaleQuotationController {
     //@AutoLog(value = "销售报价单-分页列表查询")
     @ApiOperation(value = "销售报价单-分页列表查询", notes = "销售报价单-分页列表查询")
     @GetMapping(value = "/list")
+    @PermissionData(pageComponent="saleCode/quotation/quotation")
     public Result<IPage<SaleQuotation>> queryPageList(SaleQuotation saleQuotation,
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -97,6 +99,7 @@ public class SaleQuotationController {
      */
     @ApiOperation(value = "销售报价单弹框明细", notes = "销售报价单弹框明细")
     @GetMapping(value = "/saleQuotationDetailsAlert")
+    @PermissionData(pageComponent="saleCode/quotation/quotation")
     public Result<IPage<SaleQuotationAlert>> saleQuotationDetailsAlert(SaleQuotationAlert saleInquiryForm,
                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleRfpController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -54,6 +55,7 @@ public class SaleRfpController extends JeecgController<SaleRfp, ISaleRfpService>
 	//@AutoLog(value = "招标书(RFP)-分页列表查询")
 	@ApiOperation(value="招标书(RFP)-分页列表查询", notes="招标书(RFP)-分页列表查询")
 	@GetMapping(value = "/list")
+	@PermissionData(pageComponent="saleCode/rfp/SaleRfpList")
 	public Result<IPage<SaleRfp>> queryPageList(SaleRfp saleRfp,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,