2023年9月25日09:44:55

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/service/impl/OrderServiceImpl.java

@@ -42,7 +42,7 @@ public class OrderServiceImpl implements IOrderService {
             condition += "and find_in_set(fo.order_name , '" + order.getOrderName() + "')";
         }
         if ("已逾期".equals(order.getStatus())) {
-            condition += "and fo.overdue = 1";
+            condition += "and fo.overdue like '%逾期%'";
         }
         if ("生产中".equals(order.getStatus())) {
             condition += "and fo.order_status = 1";
@@ -84,7 +84,7 @@ public class OrderServiceImpl implements IOrderService {
                 if ("2".equals(item.getStatus())) {
                     item.setStatus("已签收");
                 }
-                if ("1".equals(item.getOverdue())) {
+                if (item.getOverdue().contains("逾期")) {
                     item.setStatus("已逾期");
                 }
             }
@@ -162,7 +162,7 @@ public class OrderServiceImpl implements IOrderService {
             dataSource.setUsername("db_cdyq6tkqn1ioja179i8b");
             dataSource.setPassword("By@#5c9i75sgtx3b620g6m6e");
             JdbcTemplate template = new JdbcTemplate(dataSource);
-            orderList = template.query("SELECT ie.* ,it.tsl_name as tslName FROM iot_equipment ie" +
+            orderList = template.query("SELECT ie.* ,it.tsl_name as tslName FROM iot_equipment ie " +
                             "LEFT JOIN iot_tsl it ON ie.tsl_id = it.id " +
                             " where 1=1 " + (ObjectUtils.isEmpty(condition) ? "" : condition)
                             + " limit " + pageNum + "," + pageSize + ";" ,
@@ -196,7 +196,7 @@ public class OrderServiceImpl implements IOrderService {
             dataSource.setPassword("By@#5c9i75sgtx3b620g6m6e");
             JdbcTemplate template = new JdbcTemplate(dataSource);
             int count1 = template.queryForObject("SELECT count(*) as status FROM t_factory_order fo " +
-                    "left join t_transport_order tto on fo.order_num = tto.order_num where fo.overdue = 1 ;" , Integer.class);
+                    "left join t_transport_order tto on fo.order_num = tto.order_num where fo.overdue like '%逾期%' ;" , Integer.class);
             int count2 = template.queryForObject("SELECT count(*) as status FROM t_factory_order fo " +
                     "left join t_transport_order tto on fo.order_num = tto.order_num where fo.order_status = 1 ;" , Integer.class);
             int count3 = template.queryForObject("SELECT count(*) as status FROM t_factory_order fo " +