Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

周计划和详细 页面优化

Browse Source
This commit is contained in:
sk1551 2020-08-29 10:52:00 +08:00
parent 64281f5d49
commit 49b8014970
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-ui/src/views/benyi/planweek/data.vue
View File

@ -184,9 +184,9 @@
:picker-options="pickerOptions7" :picker-options="pickerOptions7"
>></el-date-picker> >></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="星期" prop="day"> <!-- <el-form-item label="星期" prop="day">
<el-input v-model="form.day" placeholder="请输入星期几" /> <el-input v-model="form.day" placeholder="请输入星期几" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -279,9 +279,9 @@ export default {
activitytime: [ activitytime: [
{ required: true, message: "活动时间不能为空", trigger: "blur" } { required: true, message: "活动时间不能为空", trigger: "blur" }
], ],
day: [ // day: [
{ required: true, message: "星期不能为空", trigger: "blur" } // { required: true, message: "星期不能为空", trigger: "blur" }
] // ]
} }
}; };
}, },

4
ruoyi-ui/src/views/benyi/themetermplan/data.vue
View File

@ -191,7 +191,7 @@ export default {
tpid: undefined, tpid: undefined,
themeconent: undefined, themeconent: undefined,
createuserid: undefined, createuserid: undefined,
updateuserid: undefined, updateuserid: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -306,7 +306,7 @@ export default {
createuserid: undefined, createuserid: undefined,
month: undefined, month: undefined,
updateuserid: undefined, updateuserid: undefined,
updateTime: undefined, updateTime: undefined
}; };
this.resetForm("form"); this.resetForm("form");
this.themeList = []; this.themeList = [];

5
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByPlanweekitemController.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.project.benyi.controller;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.common.SchoolCommon;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -34,6 +35,8 @@ public class ByPlanweekitemController extends BaseController
{ {
@Autowired @Autowired
private IByPlanweekitemService byPlanweekitemService; private IByPlanweekitemService byPlanweekitemService;
@Autowired
private SchoolCommon schoolCommon;
/** /**
* 查询周计划(家长和教育部门细化)列表 * 查询周计划(家长和教育部门细化)列表
@ -79,6 +82,7 @@ public class ByPlanweekitemController extends BaseController
public AjaxResult add(@RequestBody ByPlanweekitem byPlanweekitem) public AjaxResult add(@RequestBody ByPlanweekitem byPlanweekitem)
{ {
byPlanweekitem.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); byPlanweekitem.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
byPlanweekitem.setDay("星期" + String.valueOf(schoolCommon.dateToWeek(byPlanweekitem.getActivitytime())));
return toAjax(byPlanweekitemService.insertByPlanweekitem(byPlanweekitem)); return toAjax(byPlanweekitemService.insertByPlanweekitem(byPlanweekitem));
} }
@ -91,6 +95,7 @@ public class ByPlanweekitemController extends BaseController
public AjaxResult edit(@RequestBody ByPlanweekitem byPlanweekitem) public AjaxResult edit(@RequestBody ByPlanweekitem byPlanweekitem)
{ {
byPlanweekitem.setUpdateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); byPlanweekitem.setUpdateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
byPlanweekitem.setDay("星期" + String.valueOf(schoolCommon.dateToWeek(byPlanweekitem.getActivitytime())));
return toAjax(byPlanweekitemService.updateByPlanweekitem(byPlanweekitem)); return toAjax(byPlanweekitemService.updateByPlanweekitem(byPlanweekitem));
} }

2
ruoyi/src/main/resources/mybatis/benyi/ByPlanweekitemMapper.xml
View File

@ -18,7 +18,7 @@
</resultMap> </resultMap>
<sql id="selectByPlanweekitemVo"> <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> </sql>
<select id="selectByPlanweekitemList" parameterType="ByPlanweekitem" resultMap="ByPlanweekitemResult"> <select id="selectByPlanweekitemList" parameterType="ByPlanweekitem" resultMap="ByPlanweekitemResult">