Переглянути джерело

即将到期改成近期到期,开始日期从当天改成前天

yusm 1 місяць тому
батько
коміт
cc7fb24939

+ 1 - 1
fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -16,7 +16,7 @@
                         <el-radio-group v-model="isMeal" size="small" @change="selIsmeal()">
                             <el-radio-button :label="0">全部</el-radio-button>
                             <el-radio-button :label="1">已签约</el-radio-button>
-                            <el-radio-button :label="2">即将到期</el-radio-button>
+                            <el-radio-button :label="2">近期到期</el-radio-button>
                         </el-radio-group>
                         <el-checkbox v-model="onlyContract" v-if="isMeal == 2" style="margin-left: 20px" @change="selIsmeal()">仅显示已签约</el-checkbox>
                         <!-- <el-checkbox style="margin-left:20px" size="small" v-model="checked" @change="selIsmeal()">即将到期</el-checkbox> -->

+ 2 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/CompanyController.java

@@ -176,7 +176,8 @@ public class CompanyController {
         }
         if(key==1){
             LocalDateTime now= LocalDate.now().atTime(LocalTime.MIN);
-            queryWrapper.between("expiration_date",now,now.plusMonths(3));
+            LocalDateTime nowSub= now.plusDays(-2);
+            queryWrapper.between("expiration_date",nowSub,now.plusMonths(3));
             queryWrapper.orderByAsc("expiration_date");
             if (keyForIsMeal) {
                 queryWrapper.eq("set_meal", 1);