会议完善

common/src/main/java/com/jpsoft/shinestar/modules/base/dao/MeetingTimeDAO.java

@@ -17,6 +17,7 @@ public interface MeetingTimeDAO {
 	MeetingTime get(String id);
 	int delete(String id);
 	List<MeetingTime> list();
+	List<MeetingTime> findByMeetingIdAndStatus(String meetingId,String status);
 	List<MeetingTime> findByMeetingId(String meetingId);
 	List<MeetingTime> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/shinestar/modules/business/service/impl/MeetingPersonRecodeServiceImpl.java

@@ -102,7 +102,7 @@ public class MeetingPersonRecodeServiceImpl implements MeetingPersonRecodeServic
 			List<MeetingAddress> list = meetingAddressDAO.findByAddressId(addressId);
 
 			for (MeetingAddress meetingAddress:list) {
-				List<MeetingTime> meetingTimeList = meetingTimeDAO.findByMeetingId(meetingAddress.getMeetingId());
+				List<MeetingTime> meetingTimeList = meetingTimeDAO.findByMeetingIdAndStatus(meetingAddress.getMeetingId(),"1,2");
 
 				for (MeetingTime meetingTime:meetingTimeList) {
 					Date meetingDate = meetingTime.getMeetingDate();

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

@@ -90,8 +90,21 @@ id_,meeting_id,meeting_date,meeting_time,start_sign_in_time,end_sign_in_time,cre
 	<select id="list" resultMap="MeetingTimeMap">
 		select * from base_meeting_time
 	</select>
+	<select id="findByMeetingIdAndStatus" resultMap="MeetingTimeMap">
+		select t1.* from base_meeting_time t1
+		inner join base_meeting_info t2 on t1.meeting_id = t2.id_ and t2.del_flag=0
+		where
+		t1.del_flag=0
+		and t1.meeting_id=#{meetingId}
+		and find_in_set(t2.status_,#{status})>0
+	</select>
 	<select id="findByMeetingId" resultMap="MeetingTimeMap">
-		select * from base_meeting_time where del_flag=false and meeting_id=#{0}
+		select t1.* from base_meeting_time t1
+		inner join base_meeting_info t2 on t1.meeting_id = t2.id_ and t2.del_flag=0
+		where
+		t1.del_flag=0
+		and
+		t1.meeting_id=#{0}
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="MeetingTimeMap">
 		<![CDATA[

common/src/main/resources/mapper/business/MeetingPersonRecode.xml

@@ -139,14 +139,13 @@
 			</if>
 			<![CDATA[
 			and (SELECT b.sign_time FROM business_meeting_person_recode b  WHERE b.person_id = a.person_id and b.sign_type='0') is not null
-			--and (SELECT b.sign_time FROM business_meeting_person_recode b  WHERE b.person_id = a.person_id and b.sign_type='1') is not null
 			]]>
 		</where>
 		GROUP BY a.person_id
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 			${sort.name} ${sort.order}
 		</foreach>
-
+		<!--and (SELECT b.sign_time FROM business_meeting_person_recode b  WHERE b.person_id = a.person_id and b.sign_type='1') is not null-->
 	</select>
 
 

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

@@ -160,12 +160,15 @@ public class MeetingInfoController {
                     meetingTime.setStartSignInTimeArray(startSignInTimeArray);
 
                     net.sf.json.JSONObject jsonObject2 = net.sf.json.JSONObject.fromObject(meetingTime.getEndSignInTime());
-                    String start2 = (String)jsonObject2.get("start");
-                    String end2 = (String)jsonObject2.get("end");
-                    meetingTime.setEndSignInTimeRange(start2 + "," + end2);
 
-                    String[] endSignInTimeArray = {start2,end2};
-                    meetingTime.setEndSignInTimeArray(endSignInTimeArray);
+                    if(jsonObject2.containsKey("start") && jsonObject2.containsKey("end")){
+                        String start2 = (String)jsonObject2.get("start");
+                        String end2 = (String)jsonObject2.get("end");
+                        meetingTime.setEndSignInTimeRange(start2 + "," + end2);
+
+                        String[] endSignInTimeArray = {start2,end2};
+                        meetingTime.setEndSignInTimeArray(endSignInTimeArray);
+                    }
                 }
 
                 List<MeetingTime> removeMeetingTimeList = new ArrayList<>();