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

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

@@ -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("提醒渠道")

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

@@ -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("提醒渠道")

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

@@ -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("提醒渠道")

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

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

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

@@ -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("提醒渠道")

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

@@ -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);

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

@@ -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())) {
                 //查询提醒次数