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

短信提醒距截止日期近15天内的园所信息

Browse Source
This commit is contained in:
paidaxing444 2021-07-27 15:47:37 +08:00
parent 5ce785f545
commit 0496f06e40
7 changed files with 321 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-ui/src/views/system/school/index.vue
View File

@ -57,6 +57,18 @@
/>
</el-select>
</el-form-item>
<el-form-item label="截止时间">
<el-date-picker
v-model="dateRange"
size="small"
class="my-date-picker"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -104,7 +116,7 @@
</el-col>
</el-row>
<el-table v-loading="loading" :data="schoolList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="schoolList" :default-sort = "{prop: 'days', order: 'descending'}" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="幼儿园名称" align="center" prop="schoolName" />
<el-table-column label="幼儿园类型" align="center" prop="type" :formatter="typeFormat" />
@ -117,6 +129,7 @@
<!--<el-table-column label="创建人" align="center" prop="createUser" />-->
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="开通截至时间" align="center" prop="openDeadline" />
<el-table-column label="剩余天数" align="center" prop="days" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -360,6 +373,8 @@ export default {
scaleOptions: [],
//幼儿园列表
schoolOptions: [],
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -493,7 +508,7 @@ export default {
/** 查询幼儿园机构列表 */
getList() {
this.loading = true;
listSchool(this.queryParams).then(response => {
listSchool(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.schoolList = response.rows;
this.total = response.total;
this.loading = false;
@ -563,6 +578,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},

21
ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java
View File

@ -127,6 +127,27 @@ public class RyTask {
}
}
} else if (params.equals("warnopendeadline")) {
System.out.println("warnopendeadline");
List<BySchool> list = bySchoolService.selectBySchoolWarnList(null);
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
String tel = list.get(i).getTel();
Long days = list.get(i).getDays();
if (!schoolCommon.isStringEmpty(tel)) {
//发送给学校联系人
smsService.sendWarnSMS(tel, days.toString());
}
String emTel = list.get(i).getEmTel();
if (!schoolCommon.isStringEmpty(emTel)) {
//发送给学校紧急联系人
smsService.sendWarnSMS(emTel, days.toString());
}
}
}
}
System.out.println("执行有参方法：" + params);
}

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

@ -10,144 +10,209 @@ import java.util.Date;
/**
* 幼儿园机构对象 by_school
*
*
* @author tsbz
* @date 2020-04-08
*/
public class BySchool extends BaseEntity
{
public class BySchool extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 幼儿园ID */
/**
* 幼儿园ID
*/
private Long id;
// 学校代码（与dept相关联）
// 学校代码（与dept相关联）
private String xxdm;
/** 机构名称 */
/**
* 机构名称
*/
@Excel(name = "机构名称")
private String schoolName;
/** 幼儿园简称 */
/**
* 幼儿园简称
*/
@Excel(name = "幼儿园简称")
private String nameShort;
/** 幼儿园类型1、独立2、集团3、集团下属 */
/**
* 幼儿园类型1、独立2、集团3、集团下属
*/
@Excel(name = "幼儿园类型1、独立2、集团3、集团下属")
private String type;
/** 集团下属有parentid */
/**
* 集团下属有parentid
*/
@Excel(name = "集团下属有parentid")
private Long parentId;
/** 所在省 */
/**
* 所在省
*/
@Excel(name = "所在省")
private String province;
/** 所在省 */
/**
* 所在省
*/
@Excel(name = "所在省")
private String provincename;
/** 所在城市 */
/**
* 所在城市
*/
@Excel(name = "所在城市")
private String regionid;
/** 所在城市 */
/**
* 所在城市
*/
@Excel(name = "所在城市")
private String regionname;
/** 所在区 */
/**
* 所在区
*/
@Excel(name = "所在区")
private String area;
/** 所在区 */
/**
* 所在区
*/
@Excel(name = "所在区")
private String areaname;
/** 详细地址 */
/**
* 详细地址
*/
@Excel(name = "详细地址")
private String address;
/** 联系人 */
/**
* 联系人
*/
@Excel(name = "联系人")
private String mastername;
/** 电话 */
/**
* 电话
*/
@Excel(name = "电话")
private String tel;
/** 紧急联系人 */
/**
* 紧急联系人
*/
@Excel(name = "紧急联系人")
private String emMan;
/** 紧急联系电话 */
/**
* 紧急联系电话
*/
@Excel(name = "紧急联系电话")
private String emTel;
/** 状态（0正常，1停用） */
/**
* 状态（0正常，1停用）
*/
@Excel(name = "状态", readConverterExp = "0=正常，1停用")
private String status;
/** 幼儿园规模 */
/**
* 幼儿园规模
*/
@Excel(name = "幼儿园规模")
private String scale;
/** 创建人ID */
/**
* 创建人ID
*/
@Excel(name = "创建人ID")
private Long createUser;
/** 最后审核人ID */
/**
* 最后审核人ID
*/
@Excel(name = "最后审核人ID")
private Long approvalUser;
/** 审核时间 */
/**
* 审核时间
*/
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date approvalTime;
/** 幼儿园位置 */
/**
* 幼儿园位置
*/
@Excel(name = "幼儿园位置")
private String location;
/** 园所会员性质 */
/**
* 园所会员性质
*/
@Excel(name = "园所会员性质")
private String isDemonstr;
/** 营业执照图片 */
/**
* 营业执照图片
*/
@Excel(name = "营业执照图片")
private String businesslicenseimg;
/** 家长手册发布状态（0取消，1发布） */
/**
* 家长手册发布状态（0取消，1发布）
*/
@Excel(name = "家长手册发布状态", readConverterExp = "0=取消，1发布")
private Long openBook;
/** 幼儿园缴费状态（0未缴费，1已缴费，2已到期） */
/**
* 幼儿园缴费状态（0未缴费，1已缴费，2已到期）
*/
@Excel(name = "幼儿园缴费状态", readConverterExp = "0=未缴费，1已缴费，2已到期")
private String feeStatus;
/** 开通截至日期 */
/**
* 开通截至日期
*/
@Excel(name = "开通截至日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date openDeadline;
/** 当前学年 */
/**
* 当前学年
*/
@Excel(name = "当前学年")
private String dqxn;
/** 当前学期 */
/**
* 当前学期
*/
@Excel(name = "当前学期")
private String dqxq;
/** 删除标志（0代表存在 2代表删除） */
/**
* 删除标志（0代表存在 2代表删除）
*/
private String isDel;
public Long getDays() {
return days;
}
public void setDays(Long days) {
this.days = days;
}
private Long days;
//部门
private SysDept dept;
@ -159,265 +224,235 @@ public class BySchool extends BaseEntity
this.dept = dept;
}
public void setId(Long id)
{
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
public Long getId() {
return id;
}
public void setSchoolName(String schoolName)
{
public void setSchoolName(String schoolName) {
this.schoolName = schoolName;
}
public String getSchoolName()
{
public String getSchoolName() {
return schoolName;
}
public void setNameShort(String nameShort)
{
public void setNameShort(String nameShort) {
this.nameShort = nameShort;
}
public String getNameShort()
{
public String getNameShort() {
return nameShort;
}
public void setType(String type)
{
public void setType(String type) {
this.type = type;
}
public String getType()
{
public String getType() {
return type;
}
public void setParentId(Long parentId)
{
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public Long getParentId()
{
public Long getParentId() {
return parentId;
}
public void setProvince(String province)
{
public void setProvince(String province) {
this.province = province;
}
public String getProvince()
{
public String getProvince() {
return province;
}
public void setProvincename(String provincename)
{
public void setProvincename(String provincename) {
this.provincename = provincename;
}
public String getProvincename()
{
public String getProvincename() {
return provincename;
}
public void setRegionid(String regionid)
{
public void setRegionid(String regionid) {
this.regionid = regionid;
}
public String getRegionid()
{
public String getRegionid() {
return regionid;
}
public void setRegionname(String regionname)
{
public void setRegionname(String regionname) {
this.regionname = regionname;
}
public String getRegionname()
{
public String getRegionname() {
return regionname;
}
public void setArea(String area)
{
public void setArea(String area) {
this.area = area;
}
public String getArea()
{
public String getArea() {
return area;
}
public void setAreaname(String areaname)
{
public void setAreaname(String areaname) {
this.areaname = areaname;
}
public String getAreaname()
{
public String getAreaname() {
return areaname;
}
public void setAddress(String address)
{
public void setAddress(String address) {
this.address = address;
}
public String getAddress()
{
public String getAddress() {
return address;
}
public void setMastername(String mastername)
{
public void setMastername(String mastername) {
this.mastername = mastername;
}
public String getMastername()
{
public String getMastername() {
return mastername;
}
public void setTel(String tel)
{
public void setTel(String tel) {
this.tel = tel;
}
public String getTel()
{
public String getTel() {
return tel;
}
public void setEmMan(String emMan)
{
public void setEmMan(String emMan) {
this.emMan = emMan;
}
public String getEmMan()
{
public String getEmMan() {
return emMan;
}
public void setEmTel(String emTel)
{
public void setEmTel(String emTel) {
this.emTel = emTel;
}
public String getEmTel()
{
public String getEmTel() {
return emTel;
}
public void setStatus(String status)
{
public void setStatus(String status) {
this.status = status;
}
public String getStatus()
{
public String getStatus() {
return status;
}
public void setScale(String scale)
{
public void setScale(String scale) {
this.scale = scale;
}
public String getScale()
{
public String getScale() {
return scale;
}
public void setCreateUser(Long createUser)
{
public void setCreateUser(Long createUser) {
this.createUser = createUser;
}
public Long getCreateUser()
{
public Long getCreateUser() {
return createUser;
}
public void setApprovalUser(Long approvalUser)
{
public void setApprovalUser(Long approvalUser) {
this.approvalUser = approvalUser;
}
public Long getApprovalUser()
{
public Long getApprovalUser() {
return approvalUser;
}
public void setApprovalTime(Date approvalTime)
{
public void setApprovalTime(Date approvalTime) {
this.approvalTime = approvalTime;
}
public Date getApprovalTime()
{
public Date getApprovalTime() {
return approvalTime;
}
public void setLocation(String location)
{
public void setLocation(String location) {
this.location = location;
}
public String getLocation()
{
public String getLocation() {
return location;
}
public void setIsDemonstr(String isDemonstr)
{
public void setIsDemonstr(String isDemonstr) {
this.isDemonstr = isDemonstr;
}
public String getIsDemonstr()
{
public String getIsDemonstr() {
return isDemonstr;
}
public void setBusinesslicenseimg(String businesslicenseimg)
{
public void setBusinesslicenseimg(String businesslicenseimg) {
this.businesslicenseimg = businesslicenseimg;
}
public String getBusinesslicenseimg()
{
public String getBusinesslicenseimg() {
return businesslicenseimg;
}
public void setOpenBook(Long openBook)
{
public void setOpenBook(Long openBook) {
this.openBook = openBook;
}
public Long getOpenBook()
{
public Long getOpenBook() {
return openBook;
}
public void setFeeStatus(String feeStatus)
{
public void setFeeStatus(String feeStatus) {
this.feeStatus = feeStatus;
}
public String getFeeStatus()
{
public String getFeeStatus() {
return feeStatus;
}
public void setOpenDeadline(Date openDeadline)
{
public void setOpenDeadline(Date openDeadline) {
this.openDeadline = openDeadline;
}
public Date getOpenDeadline()
{
public Date getOpenDeadline() {
return openDeadline;
}
public void setDqxn(String dqxn)
{
public void setDqxn(String dqxn) {
this.dqxn = dqxn;
}
public String getDqxn()
{
public String getDqxn() {
return dqxn;
}
public void setDqxq(String dqxq)
{
public void setDqxq(String dqxq) {
this.dqxq = dqxq;
}
public String getDqxq()
{
public String getDqxq() {
return dqxq;
}
@ -439,42 +474,43 @@ public class BySchool extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("xxdm",getXxdm())
.append("schoolName", getSchoolName())
.append("nameShort", getNameShort())
.append("type", getType())
.append("parentId", getParentId())
.append("province", getProvince())
.append("provincename", getProvincename())
.append("regionid", getRegionid())
.append("regionname", getRegionname())
.append("area", getArea())
.append("areaname", getAreaname())
.append("address", getAddress())
.append("mastername", getMastername())
.append("tel", getTel())
.append("emMan", getEmMan())
.append("emTel", getEmTel())
.append("status", getStatus())
.append("scale", getScale())
.append("createTime", getCreateTime())
.append("createUser", getCreateUser())
.append("approvalUser", getApprovalUser())
.append("approvalTime", getApprovalTime())
.append("remark", getRemark())
.append("location", getLocation())
.append("isDemonstr", getIsDemonstr())
.append("businesslicenseimg", getBusinesslicenseimg())
.append("openBook", getOpenBook())
.append("feeStatus", getFeeStatus())
.append("openDeadline", getOpenDeadline())
.append("dqxn", getDqxn())
.append("dqxq", getDqxq())
.append("dept", getDept())
.append("isDel",getIsDel())
.toString();
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("xxdm", getXxdm())
.append("schoolName", getSchoolName())
.append("nameShort", getNameShort())
.append("type", getType())
.append("parentId", getParentId())
.append("province", getProvince())
.append("provincename", getProvincename())
.append("regionid", getRegionid())
.append("regionname", getRegionname())
.append("area", getArea())
.append("areaname", getAreaname())
.append("address", getAddress())
.append("mastername", getMastername())
.append("tel", getTel())
.append("emMan", getEmMan())
.append("emTel", getEmTel())
.append("status", getStatus())
.append("scale", getScale())
.append("createTime", getCreateTime())
.append("createUser", getCreateUser())
.append("approvalUser", getApprovalUser())
.append("approvalTime", getApprovalTime())
.append("remark", getRemark())
.append("location", getLocation())
.append("isDemonstr", getIsDemonstr())
.append("businesslicenseimg", getBusinesslicenseimg())
.append("openBook", getOpenBook())
.append("feeStatus", getFeeStatus())
.append("openDeadline", getOpenDeadline())
.append("dqxn", getDqxn())
.append("dqxq", getDqxq())
.append("dept", getDept())
.append("isDel", getIsDel())
.append("days", getDays())
.toString();
}

8
ruoyi/src/main/java/com/ruoyi/project/system/mapper/BySchoolMapper.java
View File

@ -27,6 +27,14 @@ public interface BySchoolMapper
*/
public List<BySchool> selectBySchoolList(BySchool bySchool);
/**
* 查询距开通截止日期近15天的幼儿园机构列表
*
* @param bySchool 幼儿园机构
* @return 幼儿园机构集合
*/
public List<BySchool> selectBySchoolWarnList(BySchool bySchool);
/**
* 新增幼儿园机构
*

8
ruoyi/src/main/java/com/ruoyi/project/system/service/IBySchoolService.java
View File

@ -27,6 +27,14 @@ public interface IBySchoolService
*/
public List<BySchool> selectBySchoolList(BySchool bySchool);
/**
* 查询距开通截止日期近15天的幼儿园机构列表
*
* @param bySchool 幼儿园机构
* @return 幼儿园机构集合
*/
public List<BySchool> selectBySchoolWarnList(BySchool bySchool);
/**
* 新增幼儿园机构
*

47
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/BySchoolServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.project.system.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -10,86 +11,90 @@ import com.ruoyi.project.system.service.IBySchoolService;
/**
* 幼儿园机构Service业务层处理
*
*
* @author tsbz
* @date 2020-04-08
*/
@Service
public class BySchoolServiceImpl implements IBySchoolService
{
public class BySchoolServiceImpl implements IBySchoolService {
@Autowired
private BySchoolMapper bySchoolMapper;
/**
* 查询幼儿园机构
*
*
* @param id 幼儿园机构ID
* @return 幼儿园机构
*/
@Override
public BySchool selectBySchoolById(Long id)
{
public BySchool selectBySchoolById(Long id) {
return bySchoolMapper.selectBySchoolById(id);
}
/**
* 查询距开通截止日期近15天的幼儿园机构列表
*
* @param bySchool 幼儿园机构
* @return 幼儿园机构集合
*/
@Override
public List<BySchool> selectBySchoolWarnList(BySchool bySchool) {
return bySchoolMapper.selectBySchoolWarnList(bySchool);
}
/**
* 查询幼儿园机构列表
*
*
* @param bySchool 幼儿园机构
* @return 幼儿园机构
*/
@Override
public List<BySchool> selectBySchoolList(BySchool bySchool)
{
public List<BySchool> selectBySchoolList(BySchool bySchool) {
return bySchoolMapper.selectBySchoolList(bySchool);
}
/**
* 新增幼儿园机构
*
*
* @param bySchool 幼儿园机构
* @return 结果
*/
@Override
public int insertBySchool(BySchool bySchool)
{
public int insertBySchool(BySchool bySchool) {
bySchool.setCreateTime(DateUtils.getNowDate());
return bySchoolMapper.insertBySchool(bySchool);
}
/**
* 修改幼儿园机构
*
*
* @param bySchool 幼儿园机构
* @return 结果
*/
@Override
public int updateBySchool(BySchool bySchool)
{
public int updateBySchool(BySchool bySchool) {
return bySchoolMapper.updateBySchool(bySchool);
}
/**
* 批量删除幼儿园机构
*
*
* @param ids 需要删除的幼儿园机构ID
* @return 结果
*/
@Override
public int deleteBySchoolByIds(Long[] ids)
{
public int deleteBySchoolByIds(Long[] ids) {
return bySchoolMapper.deleteBySchoolByIds(ids);
}
/**
* 删除幼儿园机构信息
*
*
* @param id 幼儿园机构ID
* @return 结果
*/
@Override
public int deleteBySchoolById(Long id)
{
public int deleteBySchoolById(Long id) {
return bySchoolMapper.deleteBySchoolById(id);
}
}

16
ruoyi/src/main/resources/mybatis/system/BySchoolMapper.xml
View File

@ -38,11 +38,11 @@
<result property="dqxn" column="dqxn"/>
<result property="dqxq" column="dqxq"/>
<result property="isDel" column="is_del"/>
<result property="days" column="days"/>
</resultMap>
<sql id="selectBySchoolVo">
select id, xxdm, school_name, name_short, type, parent_id, province, provincename, regionid, regionname, area, areaname, address, mastername, tel, em_man, em_tel, status, scale, create_time, create_user, approval_user, approval_time, remark, location, is_demonstr, businesslicenseimg, open_book, fee_status, open_deadline, dqxn, dqxq, is_del from by_school
select id, xxdm, school_name, name_short, type, parent_id, province, provincename, regionid, regionname, area, areaname, address, mastername, tel, em_man, em_tel, status, scale, create_time, create_user, approval_user, approval_time, remark, location, is_demonstr, businesslicenseimg, open_book, fee_status, open_deadline, dqxn, dqxq, is_del,datediff(open_deadline,curdate()) as days from by_school
</sql>
<select id="selectBySchoolList" parameterType="BySchool" resultMap="BySchoolResult">
@ -81,6 +81,18 @@
<if test="openDeadline != null ">and open_deadline = #{openDeadline}</if>
<if test="dqxn != null and dqxn != ''">and dqxn = #{dqxn}</if>
<if test="dqxq != null and dqxq != ''">and dqxq = #{dqxq}</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
AND date_format(open_deadline,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND date_format(open_deadline,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
</select>
<select id="selectBySchoolWarnList" parameterType="BySchool" resultMap="BySchoolResult">
select id, xxdm, school_name, name_short, type, parent_id, province, provincename, regionid, regionname, area, areaname, address, mastername, tel, em_man, em_tel, status, scale, create_time, create_user, approval_user, approval_time, remark, location, is_demonstr, businesslicenseimg, open_book, fee_status, open_deadline, dqxn, dqxq, is_del ,datediff(open_deadline,curdate()) as days from by_school
where DATE_SUB(CURDATE(), INTERVAL -15 DAY) >= date(open_deadline) and open_deadline>=curdate() and is_del='0'
</select>
<select id="selectBySchoolById" parameterType="Long" resultMap="BySchoolResult">