私有协议订单功能开发-过滤应收开票数据功能开发

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -57,6 +57,10 @@ public class InsPlyIncome extends BaseModel {
     @TableField(exist = false)
     private String signYear;
 
+    @Schema(description = "签单日期 yyyy-mm-dd 格式")
+    @TableField(exist = false)
+    private String signDate;
+
     @Schema(description = "保司ID")
     @ExcelProperty("保司ID")
     private String companyId;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1020,7 +1020,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setCompanyName(companyName);
         insOrders.setProductId(quoteVo.getOrder().getProductId());
         insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getOrder().getProductId()));
-        // 如果和报价人和登录人 不一致则判断为代课录单
+        // 如果和报价人和登录人 不一致则判断为代客录单
         if (!baseController.getUserName().equals(quoteVo.getOrder().getRealQuoteUserId())) {
             insOrders.setEntryStatus(2);
         } else {

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -252,7 +252,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     if(!names.contains(IncomeDataVO.SearchVO.signDate)){
                         return true;
                     }
-                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.ptlAgreement);
+                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.signDate);
                     String type = searchVO.getType();
                     String search = searchVO.getSearch();
                     if("为空".equals(type)|| "不为空".equals(type)){
@@ -262,12 +262,24 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     if(StrUtil.isEmpty(search)){
                         return true;
                     }
-
+                    if(StrUtil.isEmpty(insPlyIncome.getSignDate())){
+                        return true;
+                    }
+                    String[] split = search.split(",");
+                    String signDateStart = split.length>=1 && StrUtil.isNotEmpty(split[0]) ? split[0].substring(0,10):"";
+                    String signDateEnd = split.length>=2 && StrUtil.isNotEmpty(split[1]) ? split[1].substring(0,10):"";
                     if("大于等于".equals(type)){
-
+                        return insPlyIncome.getSignDate().compareTo(signDateStart) >=0;
+                    }
+                    if("小于等于".equals(type)){
+                        return insPlyIncome.getSignDate().compareTo(signDateEnd) <=0;
+                    }
+                    if("固定范围".equals(type)){
+                        return insPlyIncome.getSignDate().compareTo(signDateStart) >=0 && insPlyIncome.getSignDate().compareTo(signDateEnd) <=0;
+                    }
+                    if("不在固定范围".equals(type)){
+                        return insPlyIncome.getSignDate().compareTo(signDateStart) <0 || insPlyIncome.getSignDate().compareTo(signDateEnd) > 0;
                     }
-
-
                     return true;
                 };
                 // 出单协议
@@ -296,12 +308,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     return true;
                 };
 
-                // 订单类型 entryStatus
+                // 订单类型 entryStatus/orderType
                 Predicate<InsPlyIncome> orderTypePredicate = insPlyIncome -> {
-                    if(!names.contains(IncomeDataVO.SearchVO.companyId)){
+                    if(!names.contains(IncomeDataVO.SearchVO.orderType)){
                         return true;
                     }
-                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.companyId);
+                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.orderType);
                     String type = searchVO.getType();
                     String search = searchVO.getSearch();
                     if("为空".equals(type)|| "不为空".equals(type)){
@@ -324,10 +336,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
                 // 签单年份
                 Predicate<InsPlyIncome> signYearPredicate = insPlyIncome ->{
-                    if(!names.contains(IncomeDataVO.SearchVO.companyId)){
+                    if(!names.contains(IncomeDataVO.SearchVO.signYear)){
                         return true;
                     }
-                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.companyId);
+                    IncomeDataVO.SearchVO searchVO = searchVOMap.get(IncomeDataVO.SearchVO.signYear);
                     String type = searchVO.getType();
                     String search = searchVO.getSearch();
                     if("为空".equals(type)|| "不为空".equals(type)){

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -200,13 +200,16 @@
     <sql id="query">
         SELECT
         io.signing_time,
+        date(io.signing_time ) as sign_date,
         year(io.signing_time) as sign_year,
         ipi.id,
         io.id as 'orderNo',
         io.company_name,
         ipi.dept_name,
         ipi.agreement_name,
+        ipi.agreement_id,
         io.product_name,
+        io.entry_status,
         CASE io.entry_status
         WHEN 1 THEN '车险出单'
         WHEN 2 THEN '代客录单'