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

20200618-zlp-1

Browse Source 
幼儿园管理-完善
This commit is contained in:
paidaxing444
2020-06-18 11:59:12 +08:00
parent 639357f280
commit 82b81e3dc4
5 changed files with 261 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTrainVideoController.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.common.CommonController;
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;
@ -37,6 +38,8 @@ public class ByTrainVideoController extends BaseController {
private IByTrainVideoService byTrainVideoService;
@Autowired
private CommonController commonController;
@Autowired
private SchoolCommon schoolCommon;
/**
@ -46,6 +49,10 @@ public class ByTrainVideoController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ByTrainVideo byTrainVideo) {
startPage();
//判断type是否为空
if (!schoolCommon.isStringEmpty(byTrainVideo.getType())) {
byTrainVideo.setType(byTrainVideo.getType() + ",");
}
List<ByTrainVideo> list = byTrainVideoService.selectByTrainVideoList(byTrainVideo);
if (list != null && list.size() > 0) {

24
ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java
View File

@ -38,7 +38,7 @@ public class BySchool extends BaseEntity
/** 幼儿园类型1、独立2、集团3、集团下属 */
@Excel(name = "幼儿园类型1、独立2、集团3、集团下属")
private Long type;
private String type;
/** 集团下属有parentid */
@Excel(name = "集团下属有parentid")
@ -94,7 +94,7 @@ public class BySchool extends BaseEntity
/** 幼儿园规模 */
@Excel(name = "幼儿园规模")
private Long scale;
private String scale;
/** 创建人ID */
@Excel(name = "创建人ID")
@ -114,7 +114,7 @@ public class BySchool extends BaseEntity
/** 园所会员性质 */
@Excel(name = "园所会员性质")
private Long isDemonstr;
private String isDemonstr;
/** 营业执照图片 */
@Excel(name = "营业执照图片")
@ -126,7 +126,7 @@ public class BySchool extends BaseEntity
/** 幼儿园缴费状态（0未缴费，1已缴费，2已到期） */
@Excel(name = "幼儿园缴费状态", readConverterExp = "0=未缴费，1已缴费，2已到期")
private Long feeStatus;
private String feeStatus;
/** 开通截至日期 */
@Excel(name = "开通截至日期", width = 30, dateFormat = "yyyy-MM-dd")
@ -184,12 +184,12 @@ public class BySchool extends BaseEntity
{
return nameShort;
}
public void setType(Long type)
public void setType(String type)
{
this.type = type;
}
public Long getType()
public String getType()
{
return type;
}
@ -310,12 +310,12 @@ public class BySchool extends BaseEntity
{
return status;
}
public void setScale(Long scale)
public void setScale(String scale)
{
this.scale = scale;
}
public Long getScale()
public String getScale()
{
return scale;
}
@ -355,12 +355,12 @@ public class BySchool extends BaseEntity
{
return location;
}
public void setIsDemonstr(Long isDemonstr)
public void setIsDemonstr(String isDemonstr)
{
this.isDemonstr = isDemonstr;
}
public Long getIsDemonstr()
public String getIsDemonstr()
{
return isDemonstr;
}
@ -382,12 +382,12 @@ public class BySchool extends BaseEntity
{
return openBook;
}
public void setFeeStatus(Long feeStatus)
public void setFeeStatus(String feeStatus)
{
this.feeStatus = feeStatus;
}
public Long getFeeStatus()
public String getFeeStatus()
{
return feeStatus;
}