申领人 过期判断

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -511,8 +511,8 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
             QpUsegasApplyVO qpUsegasApplyVO1 = collect.get(0);
             Date endTime = qpUsegasApplyVO1.getEndTime();
             DateTime now = DateTime.now();
-            DateTime yesterday = DateUtil.offsetDay(now, -1);
-            if(yesterday.getTime() < endTime.getTime() && now.getTime() > endTime.getTime()){
+            DateTime endDate = DateUtil.endOfDay(endTime);
+            if(now.getTime() > endDate.getTime()){
                 //过了最大领用时间
                 warningNoticeLogDto.setWarningContent("气瓶超时未归还");
                 String timeout = warningConfigDto.getTimeout();

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -46,7 +46,7 @@ import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.HardwareRfidDto;
 import com.zd.model.entity.InventoryTag;
-import com.zd.model.entity.LoginUser;
+import com.zd.model.entity.SysUser;
 import com.zd.system.api.entity.SysDictData;
 import com.zd.system.api.feign.RemoteUserService;
 import org.apache.commons.lang3.StringUtils;
@@ -1257,7 +1257,6 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 Integer collectMinute = hxpChemical.getCollectMinute();
                 Integer minute = (collectHour != null?collectHour:0) * 60 + (collectMinute != null?collectMinute:0);
                 DateTime dateTime = DateUtil.offsetMinute(hxpUserecord.getCollectTime(), minute);
-                DateTime yesterday = DateUtil.offsetDay(dateTime, -1);
 
                 //过期时间在提醒天数内 并且在一天之内
                 WarningNoticeLogDto warningNoticeLogDto = new WarningNoticeLogDto();
@@ -1271,7 +1270,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 warningNoticeLogDto.setMargin(hxpStock.getOutUsages());
                 warningNoticeLogDto.setDeposit(hxpStock.getCabinetName());
                 warningNoticeLogDto.setApplyTime(LocalDateTimeUtil.of(hxpUserecord.getCollectTime()));
-                R<LoginUser> userInfo = remoteUserService.getUserInfo(hxpUserecord.getCreateBy(), SecurityConstants.INNER);
+                R<SysUser> userInfo = remoteUserService.getUserInfoByUserId(hxpUserecord.getUserId(), SecurityConstants.INNER);
                 if(HttpStatus.SUCCESS == userInfo.getCode()){
                     warningNoticeLogDto.setApply(userInfo.getData().getNickName());
                 }
@@ -1293,7 +1292,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                     phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
                 }
-                if(DateUtils.getNowDate().getTime() > dateTime.getTime() && yesterday.getTime() < dateTime.getTime()){
+                if(DateUtils.getNowDate().getTime() > dateTime.getTime()){
                     hxpIds.add(hxpUserecord.getId());
                     //过了最大领用时间
                     warningNoticeLogDto.setWarningContent("化学品超时未归还");

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpStockMapper.xml

@@ -682,7 +682,7 @@
                st.`name` subName,
                st.safe_user_id as safeUserId
         FROM hxp_stock sk LEFT JOIN lab_subject st ON sk.sub_id = st.`id`
-        WHERE (sk.status = 1 or sk.status = 4) AND DATE_FORMAT(sk.expiration_time,'%Y-%m-%d') < DATE_FORMAT(NOW(),'%Y-%m-%d')
+        WHERE (sk.status = 1 or sk.status = 4) AND DATE_FORMAT(sk.expiration_time,'%Y-%m-%d 23:59:59') < DATE_FORMAT(NOW(),'%Y-%m-%d %H:%i:%S')
     </select>
 
     <insert id="insertHxpStock" parameterType="com.zd.chemical.domain.HxpStock" useGeneratedKeys="true"