|
@@ -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"));
|
|
List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
|
|
if (ObjectUtils.isEmpty(listed)){
|
|
if (ObjectUtils.isEmpty(listed)){
|
|
- String regex = "^(xx|XX).{2}";
|
|
|
|
|
|
+ String regex = "^xx.*";
|
|
if (bo.getPostNameArias().matches(regex)){
|
|
if (bo.getPostNameArias().matches(regex)){
|
|
item.setFlag(true);
|
|
item.setFlag(true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- String regex = "^(xx|XX).{2}";
|
|
|
|
|
|
+ String regex = "^xx.*";
|
|
if (bo.getPostNameArias().matches(regex)){
|
|
if (bo.getPostNameArias().matches(regex)){
|
|
if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
|
|
if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
|
|
if ("1".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)) {
|
|
if(!ObjectUtils.isEmpty(listed)) {
|
|
//队长审核不通过
|
|
//队长审核不通过
|
|
GRoadsectionProcess gTeamProcess = listed.get(0);
|
|
GRoadsectionProcess gTeamProcess = listed.get(0);
|
|
- String regex = "^(xx|XX).{2}";
|
|
|
|
|
|
+ String regex = "^xx.*";
|
|
if (gTeamProcess.getUserPost().matches(regex)) {
|
|
if (gTeamProcess.getUserPost().matches(regex)) {
|
|
if (gTeamProcess.getProcessStatus().equals("1")){
|
|
if (gTeamProcess.getProcessStatus().equals("1")){
|
|
obj.setProcessStatus("2");
|
|
obj.setProcessStatus("2");
|