diff --git a/src/main/java/com/zzjee/ba/entity/BaCostConfEntity.java b/src/main/java/com/zzjee/ba/entity/BaCostConfEntity.java index f24516f5..3511d838 100644 --- a/src/main/java/com/zzjee/ba/entity/BaCostConfEntity.java +++ b/src/main/java/com/zzjee/ba/entity/BaCostConfEntity.java @@ -317,7 +317,7 @@ public class BaCostConfEntity implements java.io.Serializable { this.costHs = costHs; } - @Column(name ="free_day",nullable=true,length=36) + @Column(name ="free_day",nullable=true,length=3660) public String getFreeDay() { return freeDay; } @@ -326,7 +326,7 @@ public class BaCostConfEntity implements java.io.Serializable { this.freeDay = freeDay; } - @Column(name ="free_day2",nullable=true,length=36) + @Column(name ="free_day2",nullable=true,length=3660) public String getFreeDay2() { return freeDay2; } @@ -335,7 +335,7 @@ public class BaCostConfEntity implements java.io.Serializable { this.freeDay2 = freeDay2; } - @Column(name ="data_sql",nullable=true,length=36) + @Column(name ="data_sql",nullable=true,length=3660) public String getDataSql() { return dataSql; } diff --git a/src/main/java/org/jeecgframework/web/system/sms/util/task/CostTask.java b/src/main/java/org/jeecgframework/web/system/sms/util/task/CostTask.java index 8c6e3337..1613dddc 100644 --- a/src/main/java/org/jeecgframework/web/system/sms/util/task/CostTask.java +++ b/src/main/java/org/jeecgframework/web/system/sms/util/task/CostTask.java @@ -120,9 +120,12 @@ public class CostTask { for (WmCusCostIEntity wmCusCostIEntity : wmCusCostIEntityList) { //执行计算 SQL 返回order_id goods_id goods_count count_unit String dataSql = wmCusCostIEntity.getDataSql(); + if (StringUtil.isEmpty(dataSql)){ + continue; + } dataSql = StringUtils.replace(dataSql, "{cusCode}", cusCode); List> resulthq = systemService - .findForJdbc(dataSql, t.getCostDate()); + .findForJdbc(dataSql); //计算费用 for (int i = 0; i < resulthq.size(); i++) { try{