LY

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -101,12 +101,15 @@ public class SpecHomeController extends BaseController
         logger.info(JSON.toJSONString(params));
         List plantIds = (List) params.get("plantIds");
         List unitIds = (List) params.get("unitIds");
+        if (unitIds.size() ==0) {
+            unitIds.add("");
+        }
         //压力管道
         int ylgdAll = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
 
         );
         //查询管道长度
@@ -114,8 +117,9 @@ public class SpecHomeController extends BaseController
                         .eq("STATUS" , 1)
                         .eq("del_flag" , 0)
                         .in("plant_code",plantIds)
+                        .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
-                        .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
+//                        .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
         );
         double allLength = 0;
         for (int i = 0; i < gdList.size(); i++) {
@@ -152,8 +156,9 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
+                 .in("unit",unitIds)
+//                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
+//                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
         );
         Map<String, Object> mapylrq = new HashMap<String, Object>();
         mapylrq.put("ylrqAll_num", ylrqAll);
@@ -162,7 +167,9 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                  .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+                 .in("unit",unitIds)
+//                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
+//                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
                 );
         Map<String, Object> mapgl = new HashMap<String, Object>();
         mapgl.put("glAll_num", glAll);

master/src/main/resources/logback.xml

@@ -19,8 +19,8 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<!-- 日志最大的历史 50天 -->
+			<maxHistory>50</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>