浏览代码

正则表达式

wang_xy 1 年之前
父节点
当前提交
0d51a9e445

+ 3 - 3
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GCourtyardNetworkManagementServiceImpl.java

@@ -76,7 +76,7 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
             if(!ObjectUtils.isEmpty(listed)) {
                 //队长审核不通过
                 GCourtyardProcess gTeamProcess = listed.get(0);
-                String regex = "^(xx|XX).{2}";
+                String regex = "^xx.*";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
                         obj.setProcessStatus("2");
@@ -121,13 +121,13 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
                 //未审核过队长先展示
                 List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
                 if (ObjectUtils.isEmpty(listed)){
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         item.setFlag(true);
                     }
                 }
                 else {
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
                         if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }

+ 3 - 3
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPatrolTeamServiceImpl.java

@@ -69,7 +69,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
             if(!ObjectUtils.isEmpty(listed)) {
                 //队长审核不通过
                 GTeamProcess gTeamProcess = listed.get(0);
-                String regex = "^(xx|XX).{2}";
+                String regex = "^xx.*";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
                         obj.setProcessStatus("2");
@@ -121,13 +121,13 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
                 //未审核过队长先展示
                 List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
                 if (ObjectUtils.isEmpty(listed)){
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         item.setFlag(true);
                     }
                 }
                 else {
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
                         if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }

+ 3 - 3
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenanceServiceImpl.java

@@ -67,7 +67,7 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
             if(!ObjectUtils.isEmpty(listed)) {
                 //队长审核不通过
                 GMaintenanceProcess gTeamProcess = listed.get(0);
-                String regex = "^(xx|XX).{2}";
+                String regex = "^xx.*";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
                         obj.setProcessStatus("2");
@@ -120,13 +120,13 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
                 //未审核过队长先展示
                 List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
                 if (ObjectUtils.isEmpty(listed)){
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         item.setFlag(true);
                     }
                 }
                 else {
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
                         if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }

+ 3 - 3
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java

@@ -77,7 +77,7 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             if(!ObjectUtils.isEmpty(listed)) {
                 //队长审核不通过
                 GRegulatorBoxProcess gTeamProcess = listed.get(0);
-                String regex = "^(xx|XX).{2}";
+                String regex = "^xx.*";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
                         obj.setProcessStatus("2");
@@ -121,13 +121,13 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
                 //未审核过队长先展示
                 List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
                 if (ObjectUtils.isEmpty(listed)){
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         item.setFlag(true);
                     }
                 }
                 else {
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
                         if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }

+ 3 - 3
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -61,13 +61,13 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
                 //未审核过队长先展示
                 List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
                 if (ObjectUtils.isEmpty(listed)){
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         item.setFlag(true);
                     }
                 }
                 else {
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
                         if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
@@ -230,7 +230,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
             if(!ObjectUtils.isEmpty(listed)) {
                 //队长审核不通过
                 GRoadsectionProcess gTeamProcess = listed.get(0);
-                String regex = "^(xx|XX).{2}";
+                String regex = "^xx.*";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
                         obj.setProcessStatus("2");

+ 3 - 3
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellInspectionServiceImpl.java

@@ -78,7 +78,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
             if(!ObjectUtils.isEmpty(listed)) {
                 //队长审核不通过
                 GValvewellInspectionProcess gTeamProcess = listed.get(0);
-                String regex = "^(xx|XX).{2}";
+                String regex = "^xx.*";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
                         obj.setProcessStatus("2");
@@ -123,13 +123,13 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
                 //未审核过队长先展示
                 List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.list(new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
                 if (ObjectUtils.isEmpty(listed)){
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         item.setFlag(true);
                     }
                 }
                 else {
-                    String regex = "^(xx|XX).{2}";
+                    String regex = "^xx.*";
                     if (bo.getPostNameArias().matches(regex)){
                         if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
                         if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }