other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

打印退库单问题、销售政策停用启用、还款计划表问题

Browse Source
This commit is contained in:
fanzongzhe
2023-10-30 15:31:55 +08:00
parent 65e3d78f97
commit 7304da1ed3
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindrule.java
View File

@@ -38,9 +38,9 @@ public class MessageRemindrule extends BaseEntity {
@ApiModelProperty("规则编码")
private String ruleCode;
@ApiModelProperty("提醒方式（事前提醒0，事后提醒1）")
private Integer rules;
private String rules;
@ApiModelProperty("提醒时间间隔")
private Integer timeInterval;
private String timeInterval;
@ApiModelProperty("提醒次数，超过次数不提醒")
private String frequency;
@ApiModelProperty("提醒渠道")

4
message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleDto.java
View File

@@ -28,9 +28,9 @@ public class MessageRemindruleDto implements Dto {
@ApiModelProperty("规则编码")
private String ruleCode;
@ApiModelProperty("提醒方式（事前提醒0，事后提醒1）")
private Integer rules;
private String rules;
@ApiModelProperty("提醒时间间隔")
private Integer timeInterval;
private String timeInterval;
@ApiModelProperty("提醒次数，超过次数不提醒")
private String frequency;
@ApiModelProperty("提醒渠道")

4
message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleInitVo.java
View File

@@ -15,9 +15,9 @@ public class MessageRemindruleInitVo implements Vo {
@ApiModelProperty("规则编码")
private String ruleCode;
@ApiModelProperty("提醒方式（事前提醒0，事后提醒1）")
private Integer rules;
private String rules;
@ApiModelProperty("提醒时间间隔")
private Integer timeInterval;
private String timeInterval;
@ApiModelProperty("提醒次数，超过次数不提醒")
private String frequency;
@ApiModelProperty("提醒渠道")

2
message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleQuery.java
View File

@@ -28,5 +28,5 @@ public class MessageRemindruleQuery implements Query {
@ApiModelProperty("规则编码")
private String ruleCode;
@ApiModelProperty("提醒方式（事前提醒0，事后提醒1）")
private Integer rules;
private String rules;
}

4
message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleVo.java
View File

@@ -28,9 +28,9 @@ public class MessageRemindruleVo implements Vo {
@ApiModelProperty("规则编码")
private String ruleCode;
@ApiModelProperty("提醒方式（事前提醒0，事后提醒1）")
private Integer rules;
private String rules;
@ApiModelProperty("提醒时间间隔")
private Integer timeInterval;
private String timeInterval;
@ApiModelProperty("提醒次数，超过次数不提醒")
private String frequency;
@ApiModelProperty("提醒渠道")

2
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageremindrule/MessageRemindruleService.java
View File

@@ -54,7 +54,7 @@ public class MessageRemindruleService extends MybatisBaseService<MessageRemindru
qw.eq("ruleCode", query.getRuleCode());
}
if (query.getRules() != null) {
if (StringUtils.isNotBlank(query.getRules())) {
qw.eq("rules", query.getRules());
}
qw.eq("isDelete", 0);

4
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java
View File

@@ -63,8 +63,8 @@ public class ScheduledMessageService {
int num = 4;
MessageRemindrule messageRemindrule = messageRemindruleService.selectOne();
if (messageRemindrule != null) {
if (messageRemindrule.getTimeInterval() != null) {
minutes = messageRemindrule.getTimeInterval();
if (StringUtils.isNotBlank(messageRemindrule.getTimeInterval())) {
minutes = Integer.parseInt(messageRemindrule.getTimeInterval());
}
if (StringUtils.isNotBlank(messageRemindrule.getFrequency())) {
//查询提醒次数