Browse Source

智能看板核心数据调整

ZhangManMan 2 years ago
parent
commit
d134cf2260

+ 1 - 1
src/main/java/com/sky/ioc/mapper/ParkingMapper.java

@@ -25,7 +25,7 @@ public interface ParkingMapper extends BaseMapper<Parking> {
             "<if test='iocParam!=null and iocParam.companyId != null '>" +
             " and company_id=#{iocParam.companyId} " +
             "</if>"+
-            " limit 100 OFFSET 100 </script>")
+            " order by parking_numbers limit 100 OFFSET 0 </script>")
     List<Parking> getListByCompanyIdAndDeptId(@Param("iocParam") IocParam iocParam);
 
     @Select("<script>" +

+ 1 - 0
src/main/java/com/sky/ioc/service/assets/impl/AssetServiceImpl.java

@@ -244,6 +244,7 @@ public class AssetServiceImpl implements AssetService {
         objects.get(2).put("compare",compare);
 
         objects.get(3).put("value",5);
+        objects.get(3).put("compare",compare);
         indeicator.setWorthAttention("内容");
         indeicator.setList(objects);
         return ReturnMsg.ok(indeicator);

+ 2 - 1
src/main/java/com/sky/ioc/service/energy/impl/EnergyServiceImpl.java

@@ -205,7 +205,8 @@ public class EnergyServiceImpl implements EnergyService {
 
         objects.get(2).put("value",-1.2);
 
-        objects.get(2).put("value","微量");
+        objects.get(3).put("value","微量");
+        objects.get(3).put("compare",compare);
 
         objects.get(1).put("value","微量");
         objects.get(1).put("compare",compare);

+ 1 - 0
src/main/java/com/sky/ioc/service/parking/impl/ParkingServiceImpl.java

@@ -170,6 +170,7 @@ public class ParkingServiceImpl implements ParkingService {
             }
             parking.setPeople(persons[flag]);
             parking.setCompany("北京电信规划设计院");
+            parking.setPosition(parking.getPosition()+"-"+parking.getParkingNumbers());
             List<Park> lists = parkMapper.selectList(new LambdaQueryWrapper<Park>().eq(Park::getParkingNumbers,parking.getParkingNumbers()));
             int totalHours = 0;
             for(int j =0;j<lists.size();j++){