..

src/main/java/io/renren/modules/admin/entity/MeetingEntity.java

@@ -72,11 +72,19 @@ public class MeetingEntity implements Serializable {
	/**
	 * 会议负责人
	 */
	private String serviceEmp;
	private String serviceName;
	/**
	 * 会议负责人ids
	 * 会议负责人id
	 */
	private String serviceIds;
	private String serviceId;
	/**
	 * 会议联系人id
	 */
	private String contactIds;
	/**
	 * 会议联系人
	 */
	private String contactNames;
	/**
	 * 线上报名截止时间
	 */

src/main/java/io/renren/modules/app/controller/AppMeetingController.java

@@ -53,9 +53,9 @@ public class AppMeetingController {
    @GetMapping("/contact/{id}")
    public R contact(@PathVariable("id") Long id) {
        MeetingEntity meeting = meetingService.getById(id);
        String serviceIds = meeting.getServiceIds();
        String contactIds = meeting.getContactIds();
        List<Map<String, Object>> list = employeeService.getContact(serviceIds);
        List<Map<String, Object>> list = employeeService.getContact(contactIds);
        return R.ok().put("list", list);
    }

src/main/java/io/renren/modules/app/controller/OrderController.java

@@ -37,7 +37,7 @@ import io.renren.modules.app.service.UserService;
 */
@RestController
@RequestMapping("app/order")
public class OrderController {
public class AppOrderController {
    @Autowired
    private AttendersService attendersService;
    @Autowired

src/main/java/io/renren/modules/app/dao/UserDao.java

@@ -24,10 +24,10 @@ import org.apache.ibatis.annotations.Update;
 */
@Mapper
public interface UserDao extends BaseMapper<UserEntity> {
    @Select("select p.order_id, p.attenders_id as attendersId, (select a.name from attenders as a where a.id=p.attenders_id) as attendersName,  (select a.organization from attenders as a where a.id=p.attenders_id) as organization, (select tf.name from types_of_fee as tf where tf.id=p.pay_type) as typeName, p.pay_time, (select m.name_cn from meeting as m where m.id=p.meeting_id) as meetingName from payment as p where p.attenders_id in  (select a.id from attenders as a where a.member_id=#{member_id});")
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_time payTime,p.is_pay isPay,(select m.name_cn from meeting as m where m.id=p.meeting_id) as meetingName from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where attenders.member_id=#{memberId};")
    List<Map<String, Object>> queryOrderList(Long memberId);
    @Select("select a.name as attendersName,a.meeting_id as meetingId,a.position_id as position,(select m.name_cn from meeting as m where m.id=a.meeting_id) as meetingName ,(select m.start_time from meeting as m where m.id=a.meeting_id) as startTime,(select m.end_time from meeting as m where m.id=a.meeting_id) as endTime,(select p.is_pay from payment as p where p.attenders_id = a.id) as isCheck from attenders as a where a.id = #{attendersId};")
    @Select("select mem.truename, mem.organization, mem.position, (select m.name_cn from meeting as m where m.id=a.meeting_id) as meetingName, (select m.start_time from meeting as m where m.id=a.meeting_id) as startTime,(select m.end_time from meeting as m where m.id=a.meeting_id) as endTime,(select p.is_pay from payment as p where p.attenders_id = a.id) as IsPay from attenders a join member mem on mem.id=a.member_id where a.id = #{attendersId};")
    Map<String, Object> queryOrderInfoByAttendersId(Long attendersId);
    @Update("UPDATE member SET `password`=#{password}, `salt`=#{salt} WHERE `id`=#{id}")