参会人员完善。

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

@@ -24,4 +24,6 @@ public class MeetingPerson {
 	private Boolean delFlag;
 	private Date signTime;
 	private String signType;
+	private String personName;
+	private String companyName;
 }

common/src/main/resources/mapper/base/MeetingPerson.xml

@@ -14,6 +14,8 @@
         <result property="signTime" column="sign_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="signType" column="sign_type"/>
+        <result property="personName" column="person_name"/>
+        <result property="companyName" column="company_name"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.shinestar.modules.base.entity.MeetingPerson">
         <!--
@@ -85,7 +87,14 @@
         select * from base_meeting_person
     </select>
     <select id="findByMeetingId" resultMap="MeetingPersonMap">
-        select * from base_meeting_person where del_flag=false and meetingInfo_id=#{0}
+        select a.*,
+        b.name_ as person_name,
+        c.name_ as company_name
+        from base_meeting_person a
+        inner join base_person_info b on a.person_id = b.id_
+        inner join base_company_info c on b.company_id = c.id_
+        where a.del_flag=false
+        and a.meetingInfo_id=#{0}
     </select>
     <select id="findByMeetingIdAndPersonId" resultMap="MeetingPersonMap">
         select * from base_meeting_person where del_flag=false and meetingInfo_id = #{meetingId} and person_id =

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

@@ -184,24 +184,23 @@ public class MeetingInfoController {
                 List<MeetingPersonDTO> dtoList = new ArrayList<>();
 
                 for (MeetingPerson meetingPerson:list) {
-                    selectPersonKey += String.valueOf(meetingPerson.getPersonId())+",";
-
-                    PersonInfo personInfo = personInfoService.get(meetingPerson.getPersonId());
-
-                    if(personInfo!=null) {
-                        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()+ companyName);
-
-                        dtoList.add(dto);
-                    }
+                    selectPersonKey += meetingPerson.getPersonId() + ",";
+
+                    MeetingPersonDTO dto = new MeetingPersonDTO();
+                    dto.setKey(meetingPerson.getPersonId().toString());
+                    dto.setLabel(meetingPerson.getPersonName() + "-" + meetingPerson.getCompanyName());
+
+                    dtoList.add(dto);
+//                    PersonInfo personInfo = personInfoService.get(meetingPerson.getPersonId());
+//
+//                    if(personInfo!=null) {
+//                        CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
+//                        String companyName="";
+//
+//                        if(companyInfo!=null){
+//                            companyName = "-"+companyInfo.getName();
+//                        }
+//                    }
                 }
 
                 if(StringUtils.isNotEmpty(selectPersonKey)){