Min 1 年之前
父節點
當前提交
7784794069

+ 7 - 1
fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -80,7 +80,13 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         HttpRespMsg msg=new HttpRespMsg();
         QueryWrapper<Plan> queryWrapper=new QueryWrapper();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        queryWrapper.eq("plan_type",planType);
+        if(planType==0){
+            queryWrapper.eq("start_date",LocalDate.now());
+        }else if(planType==1){
+            queryWrapper.eq("start_date",LocalDate.now().plusDays(1));
+        }else {
+            queryWrapper.eq("plan_type",planType);
+        }
         if(planType!=2){
             queryWrapper.eq("station_id",deptId);
         }

File diff suppressed because it is too large
+ 709 - 589
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue


+ 10 - 4
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/today.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='layout-container'>
-    <PlanComponent :planType="'0'"></PlanComponent>
+    <PlanComponent :planType="'0'" :titleText="'今日计划'" :todayDate="todayDate"></PlanComponent>
   </div>
 </template>
 
@@ -13,13 +13,19 @@ export default {
   },
   props: {},
   data() {
-    return {}
+    return {
+      todayDate: this.dayjs().format('YYYY-MM-DD')
+    }
   },
   computed: {},
   watch: {},
   created() { },
-  mounted() { },
-  methods: {},
+  mounted() { 
+    console.log(this.todayDate)
+   },
+  methods: {
+    
+  },
 }
 </script>
 <style scoped lang='scss'>

+ 4 - 2
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/tomorrow.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='layout-container'>
-    <PlanComponent :planType="'1'"></PlanComponent>
+    <PlanComponent :planType="'1'" :titleText="'明日计划'" :todayDate="todayDate"></PlanComponent>
   </div>
 </template>
 
@@ -13,7 +13,9 @@ export default {
   },
   props: {},
   data() {
-    return {}
+    return {
+       todayDate: this.dayjs().add(1,'day').format('YYYY-MM-DD') 
+    }
   },
   computed: {},
   watch: {},