新增 大屏首页查看全部员工信息接口

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java

@@ -52,6 +52,15 @@ public class FactoryScreenDataController {
         return success(staffDataRespVO);
     }
 
+    @GetMapping("/getStaffData-all")
+    @Operation(summary = "大屏员工信息数据")
+    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
+    @PermitAll
+    public CommonResult<StaffDataRespVO> getStaffDataAll() {
+        StaffDataRespVO staffDataRespVO = screenDataService.getStaffData(null);
+        return success(staffDataRespVO);
+    }
+
     @GetMapping("/getPropertyData")
     @Operation(summary = "大屏资产数据")
     @OperateLog(enable = false) // 避免 Post 请求被记录操作日志

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/screendata/ScreenDataServiceImpl.java

@@ -414,7 +414,8 @@ public class ScreenDataServiceImpl implements ScreenDataService {
         vo.setDamagedTotal(toDayVO.getDamageNum());
 
         // 设置同昨日比较 百分比
-        double increaseCompared = Math.round(toDayVO.getDamageNum() - yesterdayVO.getDamageNum() * 100.0) / 100.0; // 保留两位小数
+        double increaseCompared = Math.round(toDayVO.getDamageNum() == null ? 0 : toDayVO.getDamageNum() -
+                (yesterdayVO.getDamageNum() == null ? 0 : yesterdayVO.getDamageNum()) * 100.0) / 100.0; // 保留两位小数
         vo.setIncreaseCompared(increaseCompared);
 
         return vo;

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staff/StaffMapper.xml

@@ -19,6 +19,7 @@
         <where>
             a.status = 1
             and a.deleted = 0
+            and a.factory_id != 1
             <if test="factoryId != null">
                 and a.factory_id = #{factoryId}
             </if>