Skip to content

A
amos-boot-zx-biz
Commit 25911559 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

parents f18e76ed 329c8e27
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfRectificationOrderController.java
View file @ 25911559
......@@ -160,7 +160,7 @@ public class HygfRectificationOrderController extends BaseController {
e.setIsAudit("0");
}else if (longs.contains(designId) && e.getRectificationSource().equals("design")){
e.setIsAudit("0");
}else if (longs.contains(deveEngineeringId)){
}else if (longs.contains(deveEngineeringId)&& (e.getRectificationStatus().equals("待审核") || e.getRectificationStatus().equals("整改中"))){
e.setIsAudit("0");
}else {
e.setIsAudit("1");
......@@ -229,7 +229,7 @@ public class HygfRectificationOrderController extends BaseController {
e.setIsAudit("0");
}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")&& rectificationSource.contains(e.getRectificationSource())){
e.setIsAudit("0");
}else if (longs.contains(delerKfId)){
}else if (longs.contains(delerKfId)&& (e.getRectificationStatus().equals("待审核") || e.getRectificationStatus().equals("整改中"))){
e.setIsAudit("0");
}else {
e.setIsAudit("1");
......@@ -310,7 +310,7 @@ public class HygfRectificationOrderController extends BaseController {
e.setIsAudit("0");
}else if (longs.contains(zichanId) && e.getRectificationSource().equals("ys-zichan")&& rectificationSource.contains(e.getRectificationSource())){
e.setIsAudit("0");
}else if (longs.contains(deveEngineeringId) && e.getRectificationStatus().equals("待审核")){
}else if (longs.contains(deveEngineeringId) && (e.getRectificationStatus().equals("待审核") || e.getRectificationStatus().equals("整改中"))){
e.setIsAudit("0");
}else {
e.setIsAudit("1");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment