课程简介引用
This commit is contained in:
parent
95dff52235
commit
b179a57d45
|
@ -68,8 +68,11 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
QueryWrapper<ZyJxdg> queryWrapper = QueryGenerator.initQueryWrapper(zyJxdg, req.getParameterMap());
|
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
||||||
queryWrapper.eq("create_by",sysUser.getUsername());
|
queryWrapper.eq("create_by",sysUser.getUsername());
|
||||||
|
queryWrapper.eq("rwbh",zyJxdg.getRwbh());
|
||||||
|
queryWrapper.ne("xqxn",zyJxdg.getXqxn());
|
||||||
|
queryWrapper.orderByDesc("create_time");
|
||||||
Page<ZyJxdg> page = new Page<ZyJxdg>(pageNo, pageSize);
|
Page<ZyJxdg> page = new Page<ZyJxdg>(pageNo, pageSize);
|
||||||
IPage<ZyJxdg> pageList = zyJxdgService.page(page, queryWrapper);
|
IPage<ZyJxdg> pageList = zyJxdgService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
@ -262,9 +265,10 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
|
|
||||||
@ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容")
|
@ApiOperation(value="获取课程介绍和教学大纲内容", notes="获取课程介绍和教学大纲内容")
|
||||||
@GetMapping(value = "/getKcjsJxdg")
|
@GetMapping(value = "/getKcjsJxdg")
|
||||||
public Result<ZyJxdg> getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh) {
|
public Result<ZyJxdg> getKcjsJxdg(@RequestParam(name="rwbh",required=true) String rwbh,@RequestParam(name="xqxn",required=true) String xqxn) {
|
||||||
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
||||||
queryWrapper.eq("rwbh",rwbh);
|
queryWrapper.eq("rwbh",rwbh);
|
||||||
|
queryWrapper.eq("xqxn",xqxn);
|
||||||
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
// queryWrapper.eq("create_by",sysUser.getUsername());
|
// queryWrapper.eq("create_by",sysUser.getUsername());
|
||||||
queryWrapper.last("limit 1");
|
queryWrapper.last("limit 1");
|
||||||
|
@ -278,7 +282,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
@RequestMapping(value = "/editJxdgyy", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/editJxdgyy", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<String> editJxdgyy(@RequestBody ZyJxdg zyJxdg) {
|
public Result<String> editJxdgyy(@RequestBody ZyJxdg zyJxdg) {
|
||||||
zyJxdgService.editJxdgyy(zyJxdg);
|
zyJxdgService.editJxdgyy(zyJxdg);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("引用成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,16 +40,16 @@ public class ZyJxdg implements Serializable {
|
||||||
@ApiModelProperty(value = "createBy")
|
@ApiModelProperty(value = "createBy")
|
||||||
private java.lang.String createBy;
|
private java.lang.String createBy;
|
||||||
/**createTime*/
|
/**createTime*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
@ApiModelProperty(value = "createTime")
|
@ApiModelProperty(value = "createTime")
|
||||||
private java.util.Date createTime;
|
private java.util.Date createTime;
|
||||||
/**updateBy*/
|
/**updateBy*/
|
||||||
@ApiModelProperty(value = "updateBy")
|
@ApiModelProperty(value = "updateBy")
|
||||||
private java.lang.String updateBy;
|
private java.lang.String updateBy;
|
||||||
/**updateTime*/
|
/**updateTime*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
@ApiModelProperty(value = "updateTime")
|
@ApiModelProperty(value = "updateTime")
|
||||||
private java.util.Date updateTime;
|
private java.util.Date updateTime;
|
||||||
/**任务编号*/
|
/**任务编号*/
|
||||||
|
|
|
@ -25,12 +25,14 @@ public class ZyJxdgServiceImpl extends ServiceImpl<ZyJxdgMapper, ZyJxdg> impleme
|
||||||
|
|
||||||
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
QueryWrapper<ZyJxdg> queryWrapper = new QueryWrapper<ZyJxdg>();
|
||||||
queryWrapper.eq("rwbh",zyJxdg.getRwbh());
|
queryWrapper.eq("rwbh",zyJxdg.getRwbh());
|
||||||
|
queryWrapper.eq("xqxn",zyJxdg.getXqxn());
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
queryWrapper.eq("create_by",sysUser.getUsername());
|
queryWrapper.eq("create_by",sysUser.getUsername());
|
||||||
queryWrapper.last("limit 1");
|
queryWrapper.last("limit 1");
|
||||||
ZyJxdg zyJxdgNew = baseMapper.selectOne(queryWrapper);
|
ZyJxdg zyJxdgNew = baseMapper.selectOne(queryWrapper);
|
||||||
zyJxdgNew.setFilePath(zyJxdg.getFilePath());
|
// zyJxdgNew.setFilePath(zyJxdg.getFilePath());
|
||||||
zyJxdgNew.setSkjs(zyJxdg.getSkjs());
|
// zyJxdgNew.setSkjs(zyJxdg.getSkjs());
|
||||||
|
zyJxdgNew.setKcjs(zyJxdg.getKcjs());
|
||||||
if(StringUtils.isEmpty(zyJxdgNew.getId())){
|
if(StringUtils.isEmpty(zyJxdgNew.getId())){
|
||||||
baseMapper.insert(zyJxdgNew);
|
baseMapper.insert(zyJxdgNew);
|
||||||
}else{
|
}else{
|
||||||
|
|
Loading…
Reference in New Issue