Iot 看板 动环设备 改名为 传感器设备； 取消出入申请 需要判断 出入记录的状态是否变化

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -470,11 +470,12 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
             .isNull(CoreOutInRecord::getDepartureTime)
             .le(CoreOutInRecord::getOutInRequestEffectiveEndTime,currentDate);
         List<CoreOutInRecord> outInRecords = coreOutInRecordMapper.selectList(oqw1);
-        outInRecords.stream().forEach(x->x.setStatus(3));
-
-        // 将出入记录设置为已失效状态
-        coreOutInRecordMapper.batchUpdateCoreOutInRecordStatus(outInRecords);
+        if(ObjectUtil.isNotEmpty(outInRecords)){
+            outInRecords.stream().forEach(x->x.setStatus(3));
 
+            // 将出入记录设置为已失效状态
+            coreOutInRecordMapper.batchUpdateCoreOutInRecordStatus(outInRecords);
+        }
     }
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -190,8 +190,17 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteCoreOutInRecordByIds(Long[] ids) {
-        // 取消出入申请后，出入申请中对应的人员也删除，如申请下的人员都取消，申请也自动取消
+        // 获取取消出入申请的 出入记录
         final List<CoreOutInRecord> letterOutInRecordList = coreOutInRecordMapper.findLetterOutInRecordList(ids);
+
+        // 取消申请时需要判断 是否已审批通过，审批通过后不能取消
+        if(letterOutInRecordList.stream().anyMatch(x->ObjectUtil.equal(x.getStatus(),1) || ObjectUtil.equal(x.getStatus(),2) || ObjectUtil.equal(x.getStatus(),3)))
+        {
+            throw new RuntimeException("取消失败，当前出入记录审批状态已变化，请刷新");
+        };
+
+        // 取消出入申请后，出入申请中对应的人员也删除，如申请下的人员都取消，申请也自动取消
+//        final List<CoreOutInRecord> letterOutInRecordList = coreOutInRecordMapper.findLetterOutInRecordList(ids);
         letterOutInRecordList.forEach(x -> {
             deleteOutInRecordRequestUser(x);
         });

soc-modules/soc-modules-iot/src/main/resources/mapper/IotBoardMapper.xml

@@ -24,7 +24,7 @@
           and org_path like concat(#{orgPath}, "%")
     </select>
     <select id="sensor" resultType="com.xunmei.iot.vo.board.IotBoardOverviewItemVo">
-        SELECT '动环设备'             AS `name`,
+        SELECT '传感器设备'             AS `name`,
                count(0)           AS count,
                sum(state = 0)     AS normal,
                sum(state = 1)     AS exception,