Browse Source

参会名单字段微调

huwhois 4 years ago
parent
commit
8d12a064c0

+ 11 - 5
src/main/java/io/renren/modules/admin/controller/AttendersController.java

@ -173,6 +173,7 @@ public class AttendersController extends AbstractController {
173 173
            attenders.setReportTitle(attendersform.getReportTitle());
174 174
            attenders.setHotelType(attendersform.getHotelType());
175 175
            attenders.setRoomType(attendersform.getRoomType());
176
            attenders.setIsShare(attendersform.getIsShare());
176 177
            attenders.setCheckInDate(attendersform.getCheckInDate());
177 178
            attenders.setCheckOutDate(attendersform.getCheckOutDate());
178 179
            attenders.setPayType(attendersform.getPayType());
@ -234,6 +235,7 @@ public class AttendersController extends AbstractController {
234 235
        attenders.setReportTitle(attendersform.getReportTitle());
235 236
        attenders.setHotelType(attendersform.getHotelType());
236 237
        attenders.setRoomType(attendersform.getRoomType());
238
        attenders.setIsShare(attendersform.getIsShare());
237 239
        attenders.setCheckInDate(attendersform.getCheckInDate());
238 240
        attenders.setCheckOutDate(attendersform.getCheckOutDate());
239 241
        attenders.setPayType(attendersform.getPayType());
@ -344,6 +346,7 @@ public class AttendersController extends AbstractController {
344 346
        titles.add("报告题目");
345 347
        titles.add("酒店");
346 348
        titles.add("房型");
349
        titles.add("合住");
347 350
        titles.add("入住时间");
348 351
        titles.add("离店时间");
349 352
        titles.add("付款方式");
@ -388,6 +391,7 @@ public class AttendersController extends AbstractController {
388 391
            row.add(aEntity.getReportTitle());
389 392
            row.add(aEntity.getHotelType());
390 393
            row.add(aEntity.getRoomType());
394
            row.add(aEntity.getIsShare()== 1 ? "是" : "否");
391 395
            row.add(aEntity.getCheckInDate());
392 396
            row.add(aEntity.getCheckOutDate());
393 397
            row.add(aEntity.getPayType() == 2 ? "汇款" : "现场缴费");
@ -471,11 +475,12 @@ public class AttendersController extends AbstractController {
471 475
                    String report_title = ExcelUtils.getVal(row.getCell(20));
472 476
                    String hotel_type = ExcelUtils.getVal(row.getCell(21));
473 477
                    String room_type = ExcelUtils.getVal(row.getCell(22));
474
                    String check_in_date = ExcelUtils.getVal(row.getCell(23));
475
                    String check_out_date = ExcelUtils.getVal(row.getCell(24));
476
                    String payment = ExcelUtils.getVal(row.getCell(25));
477
                    String isPay = ExcelUtils.getVal(row.getCell(26));
478
                    String money = ExcelUtils.getVal(row.getCell(27));
478
                    String is_share = ExcelUtils.getVal(row.getCell(23));
479
                    String check_in_date = ExcelUtils.getVal(row.getCell(24));
480
                    String check_out_date = ExcelUtils.getVal(row.getCell(25));
481
                    String payment = ExcelUtils.getVal(row.getCell(26));
482
                    String isPay = ExcelUtils.getVal(row.getCell(27));
483
                    String money = ExcelUtils.getVal(row.getCell(28));
479 484
480 485
                    AttendersviewEntity attendersInfo = new AttendersviewEntity();
481 486
@ -503,6 +508,7 @@ public class AttendersController extends AbstractController {
503 508
                    attendersInfo.setReportTitle(report_title);
504 509
                    attendersInfo.setHotelType(Integer.valueOf(hotel_type));
505 510
                    attendersInfo.setRoomType(Integer.valueOf(room_type));
511
                    attendersInfo.setIsShare(Integer.valueOf(is_share));
506 512
                    try {
507 513
                        attendersInfo.setCheckInDate(sdfDate.parse(check_in_date));
508 514
                        attendersInfo.setCheckInDate(sdfDate.parse(check_out_date));

+ 13 - 13
src/main/java/io/renren/modules/app/controller/AppAttendersController.java

@ -77,19 +77,19 @@ public class AppAttendersController {
77 77
        AttendersEntity attenders = new AttendersEntity();
78 78
        attenders.setMemberId(memberId);
79 79
        attenders.setMeetingId(meetingId);
80
        attenders.setMemberType(attenders.getMemberType());
81
        attenders.setFeeType(attenders.getFeeType());
82
        attenders.setPaperType(attenders.getPaperType());
83
        attenders.setIsReport(attenders.getIsReport());
84
        attenders.setReportTitle(attenders.getReportTitle());
85
        attenders.setHotelType(attenders.getHotelType());
86
        attenders.setRoomType(attenders.getRoomType());
87
        attenders.setIsShare(attenders.getIsShare());
88
        attenders.setCheckInDate(attenders.getCheckInDate());
89
        attenders.setCheckOutDate(attenders.getCheckOutDate());
90
        attenders.setPayType(attenders.getPayType());
91
        attenders.setIsPay(attenders.getIsPay());
92
        attenders.setMoney(attenders.getMoney());
80
        attenders.setMemberType(attendersform.getMemberType());
81
        attenders.setFeeType(attendersform.getFeeType());
82
        attenders.setPaperType(attendersform.getPaperType());
83
        attenders.setIsReport(attendersform.getIsReport());
84
        attenders.setReportTitle(attendersform.getReportTitle());
85
        attenders.setHotelType(attendersform.getHotelType());
86
        attenders.setRoomType(attendersform.getRoomType());
87
        attenders.setIsShare(attendersform.getIsShare());
88
        attenders.setCheckInDate(attendersform.getCheckInDate());
89
        attenders.setCheckOutDate(attendersform.getCheckOutDate());
90
        attenders.setPayType(attendersform.getPayType());
91
        attenders.setIsPay(attendersform.getIsPay());
92
        attenders.setMoney(attendersform.getMoney());
93 93
        attenders.setCreateTime(new Date());
94 94
95 95
        attendersService.save(attenders);