Răsfoiți Sursa

协议添加外部订单搜索

785834757 2 ani în urmă
părinte
comite
1bfd585d55

+ 2 - 0
src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementPageVo.java

@@ -68,5 +68,7 @@ public class PtlAgreementPageVo extends PageRequest {
     @ApiModelProperty("费用描述")
     private String costsDescription;
 
+    @ApiModelProperty("外部订单")
+    private Integer IsExternal;
 
 }

+ 4 - 1
src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -438,7 +438,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                         ptlAgreementPageVo.getAgreementStartDate())
                 // 协议止期
                 .ge(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAgreementEndDate()), PtlAgreement::getEndDate,
-                        ptlAgreementPageVo.getAgreementEndDate());
+                        ptlAgreementPageVo.getAgreementEndDate())
+                // 外部订单
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getIsExternal()), PtlAgreement::getIsExternal,
+                        ptlAgreementPageVo.getIsExternal());
         // 录入时间
         if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())) {
             LocalDateTime startDateTime = ptlAgreementPageVo.getStartDate().atTime(LocalTime.MIN);