Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/shinestar/modules/base/entity/MeetingInfo.java

@@ -61,4 +61,6 @@ public class MeetingInfo {
 	private List<MeetingPersonDTO> selectPersonDto;
 
 	private String searchCompanyId;
+
+	private String[] searchCompanyIds;
 }

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/MeetingInfoController.java

@@ -185,16 +185,29 @@ public class MeetingInfoController {
 
                     PersonInfo personInfo = personInfoService.get(meetingPerson.getPersonId());
 
-                    MeetingPersonDTO dto = new MeetingPersonDTO();
-                    dto.setKey(personInfo.getId().toString());
-                    dto.setLabel(personInfo.getName());
+                    if(personInfo!=null) {
+                        CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+                        String companyName="";
 
-                    dtoList.add(dto);
+                        if(companyInfo!=null){
+                            companyName = "-"+companyInfo.getName();
+                        }
+
+                        MeetingPersonDTO dto = new MeetingPersonDTO();
+                        dto.setKey(personInfo.getId().toString());
+                        dto.setLabel(personInfo.getName()+ companyName);
+
+                        dtoList.add(dto);
+                    }
                 }
 
                 if(StringUtils.isNotEmpty(selectPersonKey)){
                     selectPersonKey = selectPersonKey.substring(0,selectPersonKey.lastIndexOf(","));
+                }
 
+                if(StringUtils.isNotEmpty(meetingInfo.getSearchCompanyId())){
+                    String[] arrCompanyId = meetingInfo.getSearchCompanyId().split(",");
+                    meetingInfo.setSearchCompanyIds(arrCompanyId);
                 }
 
                 meetingInfo.setSelectPersonDto(dtoList);
@@ -506,10 +519,20 @@ public class MeetingInfoController {
         MessageResult<List<MeetingPersonDTO>> msgResult = new MessageResult<>();
 
         try {
-            List<PersonInfo> list;
+            List<PersonInfo> list = new ArrayList<>();
 
-            if(StringUtils.isNotEmpty(companyId)) {
-                list = personInfoService.findListByCompanyCode("%"+companyId+"%");
+            if(StringUtils.isNotEmpty(companyId)){
+                String[] companyIdArray = companyId.split(",");
+
+                List<PersonInfo> curPersonList = new ArrayList<>();
+
+                for (String companyIdStr:companyIdArray) {
+                    curPersonList = personInfoService.findListByCompanyCode("%"+companyIdStr+"%");
+
+                    if(curPersonList.size()>0){
+                        list.addAll(curPersonList);
+                    }
+                }
             }
             else{
                 list = personInfoService.list();
@@ -518,14 +541,16 @@ public class MeetingInfoController {
             List<MeetingPersonDTO> dtoList = new ArrayList<>();
 
             for (PersonInfo personInfo:list) {
+                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+                String companyName="";
+
+                if(companyInfo!=null){
+                    companyName = "-"+companyInfo.getName();
+                }
+
                 MeetingPersonDTO dto = new MeetingPersonDTO();
                 dto.setKey(personInfo.getId().toString());
-                dto.setLabel(personInfo.getName());
-//                CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
-//                if(companyInfo!=null) {
-//                    dto.setCompanyName(companyInfo.getName());
-//                }
-//                dto.setJobNumber(personInfo.getJobNumber());
+                dto.setLabel(personInfo.getName() + companyName);
 
                 dtoList.add(dto);
             }

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/WorkOverController.java

@@ -634,7 +634,7 @@ public class WorkOverController {
         }
 
         if (endTime!=null) {
-            searchParams.put("endDate", endTime);
+            searchParams.put("endDate", new DateTime(endTime).plusDays(1).plusSeconds(-1).toDate());
         }
 
         if(StringUtils.isNotEmpty(status)) {