wangzhinan 3 years ago
parent
commit
d8fd64c0a2

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@ -4998,7 +4998,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            }
            timeCondition = " and o.shipping_time >='" + DateUtil.dateToStrLong(startDate) + "' and o.shipping_time <= '" + endTime + "'  ";
        } else {
            startDate = DateUtil.strToDateLong(DateUtil.getStringDateShort() + " 00:00:00");
//            startDate = DateUtil.strToDateLong(DateUtil.getStringDateShort() + " 00:00:00");
            String sql = "SELECT\n" +
                    "\to.shipping_time AS shippingTime\n" +
                    "FROM\n" +
@ -5012,7 +5012,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            Map<String,Object> totalMap = jdbcTemplate.queryForMap(sql);
            if (totalMap != null) {
                if (totalMap.get("shippingTime") != null) {
                    startDate = new Date(Long.parseLong(totalMap.get("shippingTime").toString()));
                    startDate = (Date) totalMap.get("shippingTime");
                } else {
                    startDate = DateUtil.getNowDate();
                }