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

增加游戏数学学期计划预览功能

Browse Source
This commit is contained in:
sk1551
2020-11-02 17:20:36 +08:00
parent 214fefc509
commit 794fb7ee11
5 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
View File

@ -8,6 +8,7 @@ import com.ruoyi.project.benyi.domain.ByMathTermplanitem;
import com.ruoyi.project.benyi.service.IByMathTermplanitemService;
import com.ruoyi.project.common.SchoolCommon;
import com.ruoyi.project.system.service.IByClassService;
import com.ruoyi.project.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -45,6 +46,8 @@ public class ByMathTermplanController extends BaseController
private IByClassService byClassService;
@Autowired
private IByMathTermplanitemService byMathTermplanitemService;
@Autowired
private ISysUserService userService;
/**
* 查询游戏数学学期计划列表
@ -84,7 +87,12 @@ public class ByMathTermplanController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return AjaxResult.success(byMathTermplanService.selectByMathTermplanById(id));
AjaxResult ajax = AjaxResult.success();
ByMathTermplan byMathTermplan = byMathTermplanService.selectByMathTermplanById(id);
ajax.put(AjaxResult.DATA_TAG, byMathTermplan);
ajax.put("classname", byClassService.selectByClassById(byMathTermplan.getClassid()).getBjmc());
ajax.put("createusername", userService.selectUserById(byMathTermplan.getCreateuserid()).getNickName());
return ajax;
}
/**

3
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
View File

@ -86,7 +86,8 @@ public class ByThemeTermplanController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('benyi:themetermplan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
public AjaxResult getInfo(@PathVariable("id") String id)
{
AjaxResult ajax = AjaxResult.success();
ByThemeTermplan byThemeTermplan = byThemeTermplanService.selectByThemeTermplanById(id);
ajax.put(AjaxResult.DATA_TAG, byThemeTermplan);

4
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplanitem.java
View File

@ -31,8 +31,8 @@ public class ByMathTermplanitem extends BaseEntity {
/**
* 月份
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "月份", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
@Excel(name = "月份", width = 30, dateFormat = "yyyy-MM")
private Date month;
/**