1.调整库存预警设置查询接口

src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java

@@ -52,7 +52,16 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
         if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) {
             PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit());
         }
-        return invRemindSetDao.filterList(filterInvRemindSetRequest);
+        List<InvRemindSetResponse> list = invRemindSetDao.filterList(filterInvRemindSetRequest);
+        if (CollUtil.isNotEmpty(list)) {
+            list.forEach(invRemindSetResponse -> {
+                if (invRemindSetResponse.getIsDateBy() == 1 && null != invRemindSetResponse.getRecentDateTime()) {
+                    //将近效期预警值由小时换算成天
+                    invRemindSetResponse.setRecentDateTime(invRemindSetResponse.getRecentDateTime() / 24);
+                }
+            });
+        }
+        return list;
     }
 
     @Override

src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml

@@ -13,6 +13,11 @@
                irs.expireDate,
                irs.recentDate,
                irs.remark,
+               bu.lowStockNum,
+               bu.overStockNum,
+               bu.recentDateTime,
+               bu.useExpireTime,
+               bu.isDateBy,
                bp.cpmctymc                                                                               productName,
                bp.ggxh,
                (select `name` from auth_warehouse where `code` = irs.invCode)                            invName,