Merge remote-tracking branch 'origin/master'

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java

@@ -136,6 +136,15 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
           String userName = sysUserMapper.selectUserById(schoolCirculation.getReceivedById()).getUserName();
           schoolCirculation.setReceivedBy(userName);
         }
+        if (StringUtils.isNotNull(schoolCirculation.getReturnTime())){
+            if (schoolCirculation.getReturnTime().before(DateUtils.getNowDate()) || schoolCirculation.getReturnTime().equals(DateUtils.getNowDate())){
+                schoolCirculation.setReturnState("1");
+                SchoolEquipmentLedger schoolEquipmentLedger = new SchoolEquipmentLedger();
+                schoolEquipmentLedger.setId(schoolCirculation.getEquipmentId());
+                schoolEquipmentLedger.setIsLend("0");
+                equipmentLedgerMapper.updateById(schoolEquipmentLedger);
+            }
+        }
         schoolCirculation.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
         schoolCirculation.setUpdateTime(DateUtils.getNowDate());
         return circulationMapper.updateById(schoolCirculation);