Subversion Repositories SmartDukaan

Rev

Rev 36211 | Rev 36286 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36211 Rev 36267
Line 11... Line 11...
11
import com.spice.profitmandi.common.web.util.ResponseSender;
11
import com.spice.profitmandi.common.web.util.ResponseSender;
12
import com.spice.profitmandi.dao.entity.auth.AuthUser;
12
import com.spice.profitmandi.dao.entity.auth.AuthUser;
13
import com.spice.profitmandi.dao.entity.auth.PartnerCollectionPlan;
13
import com.spice.profitmandi.dao.entity.auth.PartnerCollectionPlan;
14
import com.spice.profitmandi.dao.entity.auth.PartnerCollectionRemark;
14
import com.spice.profitmandi.dao.entity.auth.PartnerCollectionRemark;
15
import com.spice.profitmandi.dao.entity.auth.PartnerSecondaryPlan;
15
import com.spice.profitmandi.dao.entity.auth.PartnerSecondaryPlan;
-
 
16
import com.spice.profitmandi.dao.entity.cs.Activity;
16
import com.spice.profitmandi.dao.entity.cs.Position;
17
import com.spice.profitmandi.dao.entity.cs.Position;
-
 
18
import com.spice.profitmandi.dao.entity.cs.Ticket;
17
import com.spice.profitmandi.dao.entity.dtr.User;
19
import com.spice.profitmandi.dao.entity.dtr.User;
18
import com.spice.profitmandi.dao.entity.dtr.UserAccount;
20
import com.spice.profitmandi.dao.entity.dtr.UserAccount;
19
import com.spice.profitmandi.dao.entity.fofo.*;
21
import com.spice.profitmandi.dao.entity.fofo.*;
20
import com.spice.profitmandi.dao.entity.user.*;
22
import com.spice.profitmandi.dao.entity.user.*;
21
import com.spice.profitmandi.dao.enumuration.auth.CollectionRemark;
23
import com.spice.profitmandi.dao.enumuration.auth.CollectionRemark;
Line 140... Line 142...
140
 
142
 
141
    @Autowired
143
    @Autowired
142
    private TicketRepository ticketRepository;
144
    private TicketRepository ticketRepository;
143
 
145
 
144
    @Autowired
146
    @Autowired
-
 
147
    private ActivityRepository activityRepository;
-
 
148
 
-
 
149
    @Autowired
145
    private TicketCategoryRepository ticketCategoryRepository;
150
    private TicketCategoryRepository ticketCategoryRepository;
146
 
151
 
147
    @Autowired
152
    @Autowired
148
    private TicketSubCategoryRepository ticketSubCategoryRepository;
153
    private TicketSubCategoryRepository ticketSubCategoryRepository;
149
 
154
 
Line 1011... Line 1016...
1011
                        ptam.setMessage(collectionPlan.getMessage());
1016
                        ptam.setMessage(collectionPlan.getMessage());
1012
                        ptam.setRemarkTimestamp(collectionPlan.getRemarkTimestamp());
1017
                        ptam.setRemarkTimestamp(collectionPlan.getRemarkTimestamp());
1013
                        ptam.setRecordingUrl(collectionPlan.getRecordingUrl());
1018
                        ptam.setRecordingUrl(collectionPlan.getRecordingUrl());
1014
                        ptam.setScheduledCallTime(collectionPlan.getScheduledCallTime());
1019
                        ptam.setScheduledCallTime(collectionPlan.getScheduledCallTime());
1015
                        ptam.setRank(collectionPlan.getRank());
1020
                        ptam.setRank(collectionPlan.getRank());
-
 
1021
 
-
 
1022
                        // If remark is SALES_ESCALATION, fetch open escalation ticket activities
-
 
1023
                        if (CollectionRemark.SALES_ESCALATION.equals(collectionPlan.getRemark())
-
 
1024
                                || CollectionRemark.PARTIAL_RESOLVE.equals(collectionPlan.getRemark())
-
 
1025
                                || CollectionRemark.NOT_RESOLVED.equals(collectionPlan.getRemark())) {
-
 
1026
                            List<Ticket> openTickets = ticketRepository.selectAllOpenTicketByRetailer(fofoId);
-
 
1027
                            for (Ticket ticket : openTickets) {
-
 
1028
                                if (ticket.getSubCategoryId() == ProfitMandiConstants.SALES_ESCALATION) {
-
 
1029
                                    List<Activity> activities = activityRepository.selectAll(ticket.getId());
-
 
1030
                                    ptam.setTicketActivities(activities);
-
 
1031
                                    break;
-
 
1032
                                }
-
 
1033
                            }
-
 
1034
                        }
-
 
1035
 
1016
                        Integer authId = collectionPlan.getAuthId();
1036
                        Integer authId = collectionPlan.getAuthId();
1017
 
1037
 
1018
                        Map<Integer, String> rankColorMap = ProfitMandiConstants.Rank_Color_Map;
1038
                        Map<Integer, String> rankColorMap = ProfitMandiConstants.Rank_Color_Map;
1019
 
1039
 
1020
                        ptam.setCollectionColor(rankColorMap.get(collectionPlan.getRank()));
1040
                        ptam.setCollectionColor(rankColorMap.get(collectionPlan.getRank()));