Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_java
# Conflicts: # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
This commit is contained in:
commit
aa8183174c
|
@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
@ -68,6 +70,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
|
QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
|
||||||
|
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
|
||||||
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
|
||||||
IPage<KcKetangbiao> pageList = kcKetangbiaoService.page(page, queryWrapper);
|
IPage<KcKetangbiao> pageList = kcKetangbiaoService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
@ -210,6 +213,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
|
||||||
return Result.OK(kcKetangbiao);
|
return Result.OK(kcKetangbiao);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------yangjun------------------------------
|
||||||
|
|
||||||
|
// ------------------------------yangjun------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,10 +4,8 @@ import java.io.Serializable;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
@ -36,25 +34,25 @@ public class KcKetangbiao implements Serializable {
|
||||||
@TableId(type = IdType.ASSIGN_ID)
|
@TableId(type = IdType.ASSIGN_ID)
|
||||||
@ApiModelProperty(value = "主键")
|
@ApiModelProperty(value = "主键")
|
||||||
private java.lang.String id;
|
private java.lang.String id;
|
||||||
/**创建人登录名称*/
|
// /**创建人登录名称*/
|
||||||
@ApiModelProperty(value = "创建人登录名称")
|
// @ApiModelProperty(value = "创建人登录名称")
|
||||||
private java.lang.String createBy;
|
// private java.lang.String createBy;
|
||||||
/**创建日期*/
|
// /**创建日期*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
// @DateTimeFormat(pattern="yyyy-MM-dd")
|
||||||
@ApiModelProperty(value = "创建日期")
|
// @ApiModelProperty(value = "创建日期")
|
||||||
private java.util.Date createTime;
|
// private java.util.Date createTime;
|
||||||
/**更新人登录名称*/
|
// /**更新人登录名称*/
|
||||||
@ApiModelProperty(value = "更新人登录名称")
|
// @ApiModelProperty(value = "更新人登录名称")
|
||||||
private java.lang.String updateBy;
|
// private java.lang.String updateBy;
|
||||||
/**更新日期*/
|
// /**更新日期*/
|
||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
// @DateTimeFormat(pattern="yyyy-MM-dd")
|
||||||
@ApiModelProperty(value = "更新日期")
|
// @ApiModelProperty(value = "更新日期")
|
||||||
private java.util.Date updateTime;
|
// private java.util.Date updateTime;
|
||||||
/**所属部门*/
|
// /**所属部门*/
|
||||||
@ApiModelProperty(value = "所属部门")
|
// @ApiModelProperty(value = "所属部门")
|
||||||
private java.lang.String sysOrgCode;
|
// private java.lang.String sysOrgCode;
|
||||||
/**课程编号*/
|
/**课程编号*/
|
||||||
@Excel(name = "课程编号", width = 15)
|
@Excel(name = "课程编号", width = 15)
|
||||||
@ApiModelProperty(value = "课程编号")
|
@ApiModelProperty(value = "课程编号")
|
||||||
|
@ -240,4 +238,8 @@ public class KcKetangbiao implements Serializable {
|
||||||
@Excel(name = "状态", width = 15)
|
@Excel(name = "状态", width = 15)
|
||||||
@ApiModelProperty(value = "状态")
|
@ApiModelProperty(value = "状态")
|
||||||
private java.lang.String zt;
|
private java.lang.String zt;
|
||||||
|
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private java.lang.String ywmc;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue