Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 7124bb6f by 王力
Options

Merge branch 'dev_order_info0725' into 'develop' 

修改

See merge request !267
2 parents 12cafb4f 10996125
Inline Side-by-side
Showing with 2 additions and 2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
......@@ -131,9 +131,9 @@ public class WorkbenchServiceImpl implements WorkbenchService {
autoTotal += count;
}
if (method.equals("MANUAL") && status.equals("NOT_ASSIGNED")) {
if (method.equals("MANUAL") && status.equals("INIT")) {
map.put("manualDealing", count);
} else if (method.equals("AUTO_") && status.equals("NOT_ASSIGNED")) {
} else if (method.equals("AUTO_") && status.equals("INIT")) {
map.put("autoDealing", count);
}
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!