|
@@ -478,7 +478,7 @@ public class StoreOperationalActivityServiceImpl implements StoreOperationalActi
|
|
|
if (ended) {
|
|
if (ended) {
|
|
|
return hasAchievement ? 2 : 1;
|
|
return hasAchievement ? 2 : 1;
|
|
|
}
|
|
}
|
|
|
- if (activityStatus != null && activityStatus == 5) {
|
|
|
|
|
|
|
+ if (activityStatus != null && activityStatus == 5 && auditStatus == 2) {
|
|
|
return hasAchievement ? 3 : 4;
|
|
return hasAchievement ? 3 : 4;
|
|
|
}
|
|
}
|
|
|
if (activityStatus != null && activityStatus == 2) {
|
|
if (activityStatus != null && activityStatus == 2) {
|