From 49b801497042e83b39e4541aa6e74a8ff80dec97 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Sat, 29 Aug 2020 10:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=20=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/benyi/planweek/data.vue             | 10 +++++-----
 ruoyi-ui/src/views/benyi/themetermplan/data.vue        |  6 +++---
 .../benyi/controller/ByPlanweekitemController.java     |  5 +++++
 .../resources/mybatis/benyi/ByPlanweekitemMapper.xml   |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/planweek/data.vue b/ruoyi-ui/src/views/benyi/planweek/data.vue
index 4282d35da..777590057 100644
--- a/ruoyi-ui/src/views/benyi/planweek/data.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/data.vue
@@ -184,9 +184,9 @@
             :picker-options="pickerOptions7"
           >></el-date-picker>
         </el-form-item>
-        <el-form-item label="星期" prop="day">
+        <!-- <el-form-item label="星期" prop="day">
           <el-input v-model="form.day" placeholder="请输入星期几" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -279,9 +279,9 @@ export default {
         activitytime: [
           { required: true, message: "活动时间不能为空", trigger: "blur" }
         ],
-        day: [
-          { required: true, message: "星期不能为空", trigger: "blur" }
-        ]
+        // day: [
+        //   { required: true, message: "星期不能为空", trigger: "blur" }
+        // ]
       }
     };
   },
diff --git a/ruoyi-ui/src/views/benyi/themetermplan/data.vue b/ruoyi-ui/src/views/benyi/themetermplan/data.vue
index 1f589c833..8d8b0191a 100644
--- a/ruoyi-ui/src/views/benyi/themetermplan/data.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplan/data.vue
@@ -191,7 +191,7 @@ export default {
         tpid: undefined,
         themeconent: undefined,
         createuserid: undefined,
-        updateuserid: undefined,
+        updateuserid: undefined
       },
       // 表单参数
       form: {},
@@ -306,7 +306,7 @@ export default {
         createuserid: undefined,
         month: undefined,
         updateuserid: undefined,
-        updateTime: undefined,
+        updateTime: undefined
       };
       this.resetForm("form");
       this.themeList = [];
@@ -402,4 +402,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByPlanweekitemController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByPlanweekitemController.java
index 19cf857ed..9b68e0393 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByPlanweekitemController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByPlanweekitemController.java
@@ -3,6 +3,7 @@ package com.ruoyi.project.benyi.controller;
 import java.util.List;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.common.SchoolCommon;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +35,8 @@ public class ByPlanweekitemController extends BaseController
 {
     @Autowired
     private IByPlanweekitemService byPlanweekitemService;
+    @Autowired
+    private SchoolCommon schoolCommon;
 
 /**
  * 查询周计划(家长和教育部门细化)列表
@@ -79,6 +82,7 @@ public class ByPlanweekitemController extends BaseController
     public AjaxResult add(@RequestBody ByPlanweekitem byPlanweekitem)
     {
         byPlanweekitem.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
+        byPlanweekitem.setDay("星期" + String.valueOf(schoolCommon.dateToWeek(byPlanweekitem.getActivitytime())));
         return toAjax(byPlanweekitemService.insertByPlanweekitem(byPlanweekitem));
     }
 
@@ -91,6 +95,7 @@ public class ByPlanweekitemController extends BaseController
     public AjaxResult edit(@RequestBody ByPlanweekitem byPlanweekitem)
     {
         byPlanweekitem.setUpdateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
+        byPlanweekitem.setDay("星期" + String.valueOf(schoolCommon.dateToWeek(byPlanweekitem.getActivitytime())));
         return toAjax(byPlanweekitemService.updateByPlanweekitem(byPlanweekitem));
     }
 
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByPlanweekitemMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByPlanweekitemMapper.xml
index a3d600eac..712edbf15 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByPlanweekitemMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByPlanweekitemMapper.xml
@@ -18,7 +18,7 @@
     </resultMap>
 
     <sql id="selectByPlanweekitemVo">
-        select id, wid, activitytype, content, activitytime, createuserid, create_time, updateuserid, update_time from by_planweekitem
+        select id, wid, activitytype, content, activitytime, createuserid, create_time, updateuserid, update_time, day from  by_planweekitem
     </sql>
 
     <select id="selectByPlanweekitemList" parameterType="ByPlanweekitem" resultMap="ByPlanweekitemResult">