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