This commit is contained in:
lijiaqi 2022-11-10 16:54:45 +08:00
parent 9f5748ab0b
commit f710119e3d
126 changed files with 392 additions and 207 deletions

View File

@ -123,7 +123,7 @@ public class ApiContactDbController extends ApiBaseController {
render(Ret.ok().paged(paged)); render(Ret.ok().paged(paged));
} }
@ApiOperation("上传主题环节") @ApiOperation("活动准备")
@PostMapping("state/subject") @PostMapping("state/subject")
@ResponseBody @ResponseBody
@DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass = @DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass =
@ -143,7 +143,7 @@ public class ApiContactDbController extends ApiBaseController {
render(Ret.ok().data(ContactDbWrapper.build().entityVO(contactDb))); render(Ret.ok().data(ContactDbWrapper.build().entityVO(contactDb)));
} }
@ApiOperation("签到环节") @ApiOperation("活动签到")
@PostMapping("state/sign") @PostMapping("state/sign")
@ResponseBody @ResponseBody
@DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass = @DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass =
@ -180,7 +180,7 @@ public class ApiContactDbController extends ApiBaseController {
render(Ret.ok().data(ContactDbWrapper.build().entityVO(contactDb))); render(Ret.ok().data(ContactDbWrapper.build().entityVO(contactDb)));
} }
@ApiOperation("会议环节2") @ApiOperation("活动记录")
@PostMapping("state/conference2") @PostMapping("state/conference2")
@ResponseBody @ResponseBody
@DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass = @DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass =
@ -191,7 +191,7 @@ public class ApiContactDbController extends ApiBaseController {
} }
@ApiOperation("测评环节") @ApiOperation("建议办理")
@PostMapping("state/evaluate") @PostMapping("state/evaluate")
@ResponseBody @ResponseBody
@DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass = @DynamicResponseParameters(properties = {@DynamicParameter(name = "data", value = "常委会联系代表", dataTypeClass =

View File

@ -32,7 +32,7 @@ public class ContactDb extends BaseEntity{
public static Integer STATE_CONFERENCE = 4; public static Integer STATE_CONFERENCE = 4;
public static Integer STATE_EVALUATE= 5; public static Integer STATE_EVALUATE= 5;
//结束标记 //结束标记
public static Integer STATE_END = 6; public static Integer STATE_END = 5;
/** /**
* 创建者 * 创建者
@ -50,6 +50,13 @@ public class ContactDb extends BaseEntity{
@ApiModelProperty(value = "主题名称") @ApiModelProperty(value = "主题名称")
private String subjectName; private String subjectName;
@ApiModelProperty(value = "活动主题")
private String event;
@ApiModelProperty(value = "会议记录")
String meeting;
@ApiModelProperty(value = "办理反馈")
String feedback;
/** /**
* 计划时间 * 计划时间
*/ */

View File

@ -28,6 +28,14 @@ public class ContactDbAttachment extends BaseEntity {
//会议图片 //会议图片
public static String TYPE_CONFERENCE_PHOTO = "photo"; public static String TYPE_CONFERENCE_PHOTO = "photo";
public static String TYPE_CONFERENCE_INFORMATION = "information";
public static String TYPE_CONFERENCE_OTHER = "other";
public static String TYPE_CONFERENCE_ADVICE = "advice";
public static String TYPE_CONFERENCE_MATERIAL= "material";
/** /**
* 创建者 * 创建者
*/ */

View File

@ -14,6 +14,11 @@ import java.util.List;
@Data @Data
public class ContactDbDto extends ContactDb { public class ContactDbDto extends ContactDb {
@ApiModelProperty(value = "相关资料")
List<ContactDbAttachment> informationPhotoAttachmentList;
@ApiModelProperty(value = "其他资料")
List<ContactDbAttachment> otherAttachmentList;
// @ApiModelProperty(value = "会议记录") // @ApiModelProperty(value = "会议记录")
// List<ContactDbAttachment> conferenceRecordAttachmentList; // List<ContactDbAttachment> conferenceRecordAttachmentList;
@ApiModelProperty(value = "会议记录组") @ApiModelProperty(value = "会议记录组")
@ -21,6 +26,10 @@ public class ContactDbDto extends ContactDb {
@ApiModelProperty(value = "会议图片") @ApiModelProperty(value = "会议图片")
List<ContactDbAttachment> conferencePhotoAttachmentList; List<ContactDbAttachment> conferencePhotoAttachmentList;
@ApiModelProperty(value = "建议汇总")
List<ContactDbAttachment> adviceAttachmentList;
@ApiModelProperty(value = "相关材料")
List<ContactDbAttachment> materialPhotoAttachmentList;
@ApiModelProperty(value = "联络站") @ApiModelProperty(value = "联络站")
List<ContactDbUser> subjectUserList; List<ContactDbUser> subjectUserList;

View File

@ -46,7 +46,21 @@ public class ConferenceRequest {
@ApiModelProperty(value = "会议图片附件关联会议名称 英文逗号间隔") @ApiModelProperty(value = "会议图片附件关联会议名称 英文逗号间隔")
String conferencePhotoAttachmentConferenceName; String conferencePhotoAttachmentConferenceName;
@ApiModelProperty(value = "其他资料附件名 英文逗号间隔")
String otherAttachmentName;
@ApiModelProperty(value = "其他资料附件路径 英文逗号间隔")
String otherAttachmentPath;
@ApiModelProperty(value = "其他资料附件关联会议id 英文逗号间隔")
String otherAttachmentConferenceId;
@ApiModelProperty(value = "其他资料附件关联会议名称 英文逗号间隔")
String otherAttachmentConferenceName;
@ApiModelProperty(value = "会议用户id 英文逗号间隔") @ApiModelProperty(value = "会议用户id 英文逗号间隔")
String conferenceUserIds; String conferenceUserIds;
@ApiModelProperty(value = "会议记录")
String meeting;
} }

View File

@ -52,4 +52,26 @@ public class ContactDbEvaluateRequest {
*/ */
@ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔") @ApiModelProperty(value = "admin机关办公/ rddb代表/ voter选民 多个用英文逗号间隔")
private String obj; private String obj;
@ApiModelProperty(value = "办理反馈")
String feedback;
@ApiModelProperty(value = "建议汇总附件名 英文逗号间隔")
String adviceAttachmentName;
@ApiModelProperty(value = "建议汇总附件路径 英文逗号间隔")
String adviceAttachmentPath;
@ApiModelProperty(value = "建议汇总附件关联会议id 英文逗号间隔")
String adviceAttachmentConferenceId;
@ApiModelProperty(value = "建议汇总附件关联会议名称 英文逗号间隔")
String adviceAttachmentConferenceName;
@ApiModelProperty(value = "相关材料附件名 英文逗号间隔")
String materialAttachmentName;
@ApiModelProperty(value = "相关材料附件路径 英文逗号间隔")
String materialAttachmentPath;
@ApiModelProperty(value = "相关材料附件关联会议id 英文逗号间隔")
String materialAttachmentConferenceId;
@ApiModelProperty(value = "相关材料附件关联会议名称 英文逗号间隔")
String materialAttachmentConferenceName;
} }

View File

@ -39,4 +39,23 @@ public class ContactDbSubjectRequest {
@ApiModelProperty(value = "联络站用户id 英文逗号间隔") @ApiModelProperty(value = "联络站用户id 英文逗号间隔")
private String subjectUserIds; private String subjectUserIds;
@ApiModelProperty(value = "常委会领导用户id 英文逗号间隔")
private String chooseAdminUserIds;
@ApiModelProperty(value = "活动主题")
private String event;
@ApiModelProperty(value = "代表用户id 英文逗号间隔")
private String chooseDbUserIds;
@ApiModelProperty(value = "相关资料附件名 英文逗号间隔")
String informationAttachmentName;
@ApiModelProperty(value = "相关资料附件路径 英文逗号间隔")
String informationAttachmentPath;
@ApiModelProperty(value = "相关资料附件关联会议id 英文逗号间隔")
String informationAttachmentConferenceId;
@ApiModelProperty(value = "相关资料附件关联会议名称 英文逗号间隔")
String informationAttachmentConferenceName;
} }

View File

@ -130,6 +130,15 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
contactDb.setCreatedId(loginUser.getId()); contactDb.setCreatedId(loginUser.getId());
saveOrUpdate(contactDb); saveOrUpdate(contactDb);
saveUser(contactDb.getId(), contactDbSubjectRequest.getSubjectUserIds(), loginUser, ContactDb.STATE_SUBJECT); saveUser(contactDb.getId(), contactDbSubjectRequest.getSubjectUserIds(), loginUser, ContactDb.STATE_SUBJECT);
saveUser(contactDb.getId(), contactDbSubjectRequest.getChooseAdminUserIds(), loginUser, ContactDb.STATE_CHOOSE
, Const.TYPE_ADMIN);
saveUser(contactDb.getId(), contactDbSubjectRequest.getChooseDbUserIds(), loginUser, ContactDb.STATE_CHOOSE,
Const.TYPE_RDDB);
saveAttachment(contactDb.getId(), contactDbSubjectRequest.getInformationAttachmentName(),
contactDbSubjectRequest.getInformationAttachmentPath(), loginUser,
ContactDbAttachment.TYPE_CONFERENCE_INFORMATION,
contactDbSubjectRequest.getInformationAttachmentConferenceId(),
contactDbSubjectRequest.getInformationAttachmentConferenceName());
return contactDb; return contactDb;
} }
@ -154,11 +163,11 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
public ContactDb stateSignSave(ContactDbSignRequest contactSignRequest, User loginUser) { public ContactDb stateSignSave(ContactDbSignRequest contactSignRequest, User loginUser) {
ContactDb contactDb = getById(contactSignRequest.getId()); ContactDb contactDb = getById(contactSignRequest.getId());
Assert.notNull(contactDb, "未找到该记录"); Assert.notNull(contactDb, "未找到该记录");
if (ContactDb.STATE_SIGN != contactDb.getState()) throw new ResultException(Ret.fail("当前环节不能提交该信息")); if (ContactDb.STATE_CHOOSE != contactDb.getState()) throw new ResultException(Ret.fail("当前环节不能提交该信息"));
BeanUtil.copyProperties(contactSignRequest, contactDb); BeanUtil.copyProperties(contactSignRequest, contactDb);
contactDb.setUpdatedId(loginUser.getId()); contactDb.setUpdatedId(loginUser.getId());
saveOrUpdate(contactDb); saveOrUpdate(contactDb);
saveUser(contactDb.getId(), contactSignRequest.getSignUserIds(), loginUser, ContactDb.STATE_SIGN); // saveUser(contactDb.getId(), contactSignRequest.getSignUserIds(), loginUser, ContactDb.STATE_SIGN);
return contactDb; return contactDb;
} }
@ -191,10 +200,10 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
public ContactDb stateConferenceSave(ConferenceRequest conferenceRequest, User loginUser) { public ContactDb stateConferenceSave(ConferenceRequest conferenceRequest, User loginUser) {
ContactDb contactDb = getById(conferenceRequest.getId()); ContactDb contactDb = getById(conferenceRequest.getId());
Assert.notNull(contactDb, "未找到该记录"); Assert.notNull(contactDb, "未找到该记录");
if (ContactDb.STATE_CONFERENCE != contactDb.getState()) if (ContactDb.STATE_SIGN != contactDb.getState())
throw new ResultException(Ret.fail("当前环节不能提交该信息")); throw new ResultException(Ret.fail("当前环节不能提交该信息"));
BeanUtil.copyProperties(conferenceRequest, contactDb); BeanUtil.copyProperties(conferenceRequest, contactDb);
contactDb.setState(ContactDb.STATE_EVALUATE); contactDb.setState(ContactDb.STATE_CONFERENCE);
contactDb.setUpdatedId(loginUser.getId()); contactDb.setUpdatedId(loginUser.getId());
saveOrUpdate(contactDb); saveOrUpdate(contactDb);
saveUser(contactDb.getId(), conferenceRequest.getConferenceUserIds(), loginUser, saveUser(contactDb.getId(), conferenceRequest.getConferenceUserIds(), loginUser,
@ -204,6 +213,11 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
ContactDbAttachment.TYPE_CONFERENCE_PHOTO, ContactDbAttachment.TYPE_CONFERENCE_PHOTO,
conferenceRequest.getConferencePhotoAttachmentConferenceId(), conferenceRequest.getConferencePhotoAttachmentConferenceId(),
conferenceRequest.getConferencePhotoAttachmentConferenceName()); conferenceRequest.getConferencePhotoAttachmentConferenceName());
saveAttachment(contactDb.getId(), conferenceRequest.getOtherAttachmentName(),
conferenceRequest.getOtherAttachmentPath(), loginUser,
ContactDbAttachment.TYPE_CONFERENCE_OTHER,
conferenceRequest.getOtherAttachmentConferenceId(),
conferenceRequest.getOtherAttachmentConferenceName());
//保存会议记录组 //保存会议记录组
saveAttachment(contactDb, conferenceRequest, loginUser); saveAttachment(contactDb, conferenceRequest, loginUser);
return contactDb; return contactDb;
@ -270,12 +284,23 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
public ContactDb stateEvaluateSave(ContactDbEvaluateRequest contactDbEvaluateRequest, User loginUser) { public ContactDb stateEvaluateSave(ContactDbEvaluateRequest contactDbEvaluateRequest, User loginUser) {
ContactDb contactDb = getById(contactDbEvaluateRequest.getId()); ContactDb contactDb = getById(contactDbEvaluateRequest.getId());
Assert.notNull(contactDb, "未找到该记录"); Assert.notNull(contactDb, "未找到该记录");
if (ContactDb.STATE_EVALUATE != contactDb.getState()) if (ContactDb.STATE_CONFERENCE != contactDb.getState())
throw new ResultException(Ret.fail("当前环节不能提交该信息")); throw new ResultException(Ret.fail("当前环节不能提交该信息"));
BeanUtil.copyProperties(contactDbEvaluateRequest, contactDb); BeanUtil.copyProperties(contactDbEvaluateRequest, contactDb);
contactDb.setUpdatedId(loginUser.getId()); contactDb.setUpdatedId(loginUser.getId());
contactDb.setState(ContactDb.STATE_END);
saveOrUpdate(contactDb); saveOrUpdate(contactDb);
saveUser(contactDb.getId(), contactDbEvaluateRequest.getEvaluateUserIds(), loginUser, ContactDb.STATE_EVALUATE); // saveUser(contactDb.getId(), contactDbEvaluateRequest.getEvaluateUserIds(), loginUser, ContactDb.STATE_EVALUATE);
saveAttachment(contactDb.getId(), contactDbEvaluateRequest.getAdviceAttachmentName(),
contactDbEvaluateRequest.getAdviceAttachmentPath(), loginUser,
ContactDbAttachment.TYPE_CONFERENCE_ADVICE,
contactDbEvaluateRequest.getAdviceAttachmentConferenceId(),
contactDbEvaluateRequest.getAdviceAttachmentConferenceName());
saveAttachment(contactDb.getId(), contactDbEvaluateRequest.getMaterialAttachmentName(),
contactDbEvaluateRequest.getMaterialAttachmentPath(), loginUser,
ContactDbAttachment.TYPE_CONFERENCE_MATERIAL,
contactDbEvaluateRequest.getMaterialAttachmentConferenceId(),
contactDbEvaluateRequest.getMaterialAttachmentConferenceName());
return contactDb; return contactDb;
} }
@ -298,7 +323,7 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
contactDbUserService.count(Wrappers.lambdaQuery(ContactDbUser.class).eq(ContactDbUser::getContactDbId contactDbUserService.count(Wrappers.lambdaQuery(ContactDbUser.class).eq(ContactDbUser::getContactDbId
, contactDb.getId()).eq(ContactDbUser::getType, ContactDb.STATE_SIGN).isNull(ContactDbUser::getSign)); , contactDb.getId()).eq(ContactDbUser::getType, ContactDb.STATE_SIGN).isNull(ContactDbUser::getSign));
if (waitCount == 0) { if (waitCount == 0) {
contactDb.setState(ContactDb.STATE_CONFERENCE); contactDb.setState(ContactDb.STATE_SIGN);
saveOrUpdate(contactDb); saveOrUpdate(contactDb);
} }
return !flag ? Ret.fail("操作失败") : Ret.ok(); return !flag ? Ret.fail("操作失败") : Ret.ok();
@ -309,7 +334,7 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
Assert.notNull(contactDb, "未找到该记录"); Assert.notNull(contactDb, "未找到该记录");
if (!loginUser.getId().equals(contactDb.getCreatedId())) return Ret.fail("您不是创建人,不能操作"); if (!loginUser.getId().equals(contactDb.getCreatedId())) return Ret.fail("您不是创建人,不能操作");
if (ContactDb.STATE_SIGN != contactDb.getState()) throw new ResultException(Ret.fail("当前环节不能提交该信息")); if (ContactDb.STATE_SIGN != contactDb.getState()) throw new ResultException(Ret.fail("当前环节不能提交该信息"));
contactDb.setState(ContactDb.STATE_CONFERENCE); contactDb.setState(ContactDb.STATE_SIGN);
boolean flag = saveOrUpdate(contactDb); boolean flag = saveOrUpdate(contactDb);
return !flag ? Ret.fail("操作失败") : Ret.ok().data(ContactDbWrapper.build().entityVO(contactDb)); return !flag ? Ret.fail("操作失败") : Ret.ok().data(ContactDbWrapper.build().entityVO(contactDb));
} }
@ -506,7 +531,7 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
String[] conferenceNameArr = conferenceName.split(","); String[] conferenceNameArr = conferenceName.split(",");
for (int i = 0; i < nameArr.length; i++) { for (int i = 0; i < nameArr.length; i++) {
ContactDbAttachment contactDbAttachment = new ContactDbAttachment(); ContactDbAttachment contactDbAttachment = new ContactDbAttachment();
contactDbAttachment.setType(type).setConferenceId(conferenceIdArr[i]) contactDbAttachment.setType(type).setConferenceId(conferenceIdArr[i]).setTitle(nameArr[i])
.setConferenceName(conferenceNameArr[i]). .setConferenceName(conferenceNameArr[i]).
setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now()); setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
if (StrUtil.isNotBlank(conferenceIdArr[i])) { if (StrUtil.isNotBlank(conferenceIdArr[i])) {
@ -518,7 +543,7 @@ public class ContactDbService extends BaseService<ContactDbMapper, ContactDb> {
} else { } else {
for (int i = 0; i < nameArr.length; i++) { for (int i = 0; i < nameArr.length; i++) {
ContactDbAttachment contactDbAttachment = new ContactDbAttachment(); ContactDbAttachment contactDbAttachment = new ContactDbAttachment();
contactDbAttachment.setType(type) contactDbAttachment.setType(type).setTitle(nameArr[i])
.setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now()); .setContactDbId(contactDbId).setTitle(nameArr[i]).setAttachment(pathArr[i]).setCreatedId(loginUser.getId()).setCreatedAt(LocalDateTime.now());
contactDbAttachmentService.save(contactDbAttachment); contactDbAttachmentService.save(contactDbAttachment);
} }

View File

@ -116,6 +116,48 @@ public class ContactDbWrapper extends BaseWrapper<ContactDb, ContactDbDto> {
dto.setConferenceRecords(conferenceRecords); dto.setConferenceRecords(conferenceRecords);
List<ContactDbAttachment> informationPhotoAttachmentList =
contactDbAttachmentService.list(new LambdaQueryWrapper<ContactDbAttachment>()
.eq(ContactDbAttachment::getContactDbId, contactDb.getId())
.eq(ContactDbAttachment::getType, ContactDbAttachment.TYPE_CONFERENCE_INFORMATION)
.orderByDesc(ContactDbAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(informationPhotoAttachmentList)) {
informationPhotoAttachmentList.stream().forEach(i -> {
if (StrUtil.isNotBlank(i.getConferenceId())) {
Conference conference = conferenceMapper.selectById(i.getConferenceId());
String conferenceName = "";
if (conference != null) {
conferenceName = conference.getTitle();
}
i.setConferenceName(conferenceName);
}
});
}
dto.setInformationPhotoAttachmentList(informationPhotoAttachmentList);
List<ContactDbAttachment> otherAttachmentList =
contactDbAttachmentService.list(new LambdaQueryWrapper<ContactDbAttachment>()
.eq(ContactDbAttachment::getContactDbId, contactDb.getId())
.eq(ContactDbAttachment::getType, ContactDbAttachment.TYPE_CONFERENCE_OTHER)
.orderByDesc(ContactDbAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(otherAttachmentList)) {
otherAttachmentList.stream().forEach(i -> {
if (StrUtil.isNotBlank(i.getConferenceId())) {
Conference conference = conferenceMapper.selectById(i.getConferenceId());
String conferenceName = "";
if (conference != null) {
conferenceName = conference.getTitle();
}
i.setConferenceName(conferenceName);
}
});
}
dto.setOtherAttachmentList(otherAttachmentList);
List<ContactDbAttachment> photoAttachmentList = List<ContactDbAttachment> photoAttachmentList =
contactDbAttachmentService.list(new LambdaQueryWrapper<ContactDbAttachment>() contactDbAttachmentService.list(new LambdaQueryWrapper<ContactDbAttachment>()
@ -141,6 +183,50 @@ public class ContactDbWrapper extends BaseWrapper<ContactDb, ContactDbDto> {
dto.setConferencePhotoAttachmentList(photoAttachmentList); dto.setConferencePhotoAttachmentList(photoAttachmentList);
List<ContactDbAttachment> adviceAttachmentList =
contactDbAttachmentService.list(new LambdaQueryWrapper<ContactDbAttachment>()
.eq(ContactDbAttachment::getContactDbId, contactDb.getId())
.eq(ContactDbAttachment::getType, ContactDbAttachment.TYPE_CONFERENCE_ADVICE)
.orderByDesc(ContactDbAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(adviceAttachmentList)) {
adviceAttachmentList.stream().forEach(i -> {
if (StrUtil.isNotBlank(i.getConferenceId())) {
Conference conference = conferenceMapper.selectById(i.getConferenceId());
String conferenceName = "";
if (conference != null) {
conferenceName = conference.getTitle();
}
i.setConferenceName(conferenceName);
}
});
}
dto.setAdviceAttachmentList(adviceAttachmentList);
List<ContactDbAttachment> materialPhotoAttachmentList =
contactDbAttachmentService.list(new LambdaQueryWrapper<ContactDbAttachment>()
.eq(ContactDbAttachment::getContactDbId, contactDb.getId())
.eq(ContactDbAttachment::getType, ContactDbAttachment.TYPE_CONFERENCE_MATERIAL)
.orderByDesc(ContactDbAttachment::getCreatedAt));
//获取关联会议名称
if (CollectionUtil.isNotEmpty(materialPhotoAttachmentList)) {
materialPhotoAttachmentList.stream().forEach(i -> {
if (StrUtil.isNotBlank(i.getConferenceId())) {
Conference conference = conferenceMapper.selectById(i.getConferenceId());
String conferenceName = "";
if (conference != null) {
conferenceName = conference.getTitle();
}
i.setConferenceName(conferenceName);
}
});
}
dto.setMaterialPhotoAttachmentList(materialPhotoAttachmentList);
List<ContactDbUser> subjectUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>() List<ContactDbUser> subjectUserList = contactDbUserService.list(new LambdaQueryWrapper<ContactDbUser>()
.eq(ContactDbUser::getContactDbId, contactDb.getId()) .eq(ContactDbUser::getContactDbId, contactDb.getId())
.eq(ContactDbUser::getType, ContactDb.STATE_SUBJECT) .eq(ContactDbUser::getType, ContactDb.STATE_SUBJECT)

View File

@ -0,0 +1 @@
.van-pagination[data-v-8eef6996]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-8eef6996]{margin-right:.42667rem}.box[data-v-8eef6996]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-8eef6996]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-8eef6996]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-8eef6996]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-8eef6996]{font-size:.42667rem;text-align:center}.box[data-v-8eef6996] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-8eef6996]{padding:.32rem}.box .tab-contain .van-cell[data-v-8eef6996]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-8eef6996]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-8eef6996]{color:#333}

View File

@ -1 +0,0 @@
.van-pagination[data-v-304e600e]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-304e600e]{margin-right:.42667rem}.box[data-v-304e600e]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-304e600e]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-304e600e] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-304e600e]{padding:.32rem}.box .tab-contain .van-cell[data-v-304e600e]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-304e600e]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-304e600e]{color:#333}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.van-pagination[data-v-519dec04]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-519dec04]{margin-right:.42667rem}.box[data-v-519dec04]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-519dec04]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-519dec04] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-519dec04]{padding:.32rem}.box .tab-contain .van-cell[data-v-519dec04]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-519dec04]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-519dec04]{color:#333}

View File

@ -1 +0,0 @@
.van-pagination[data-v-91898374]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.van-tag[data-v-91898374]{margin-right:.42667rem}.box[data-v-91898374]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-91898374]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-91898374]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-91898374]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-91898374]{font-size:.42667rem;text-align:center}.box[data-v-91898374] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-91898374]{padding:.32rem}.box .tab-contain .van-cell[data-v-91898374]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-91898374]{font-size:.42667rem}.box .tab-contain .van-cell .van-icon[data-v-91898374]{color:#333}

View File

@ -1 +0,0 @@
.van-pagination[data-v-03234d06]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.box[data-v-03234d06]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-03234d06]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-03234d06]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-03234d06]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-03234d06]{font-size:.42667rem;text-align:center}.box[data-v-03234d06] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-03234d06]{padding:.32rem;padding-bottom:1.12rem}.box .tab-contain .van-cell[data-v-03234d06]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-03234d06]{font-weight:700;font-size:.42667rem}.box .tab-contain .van-cell .custom-title1[data-v-03234d06]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#47aef3}.box .tab-contain .van-cell .custom-title2[data-v-03234d06]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#c86b1d}.box .tab-contain .van-cell .van-icon[data-v-03234d06]{color:#333}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.flex-align-center[data-v-e36a57d0]{display:flex;align-items:center}.browse_image[data-v-e36a57d0]{width:2.13333rem;height:2.13333rem}[data-v-e36a57d0] .from_el{display:flex;align-items:center}[data-v-e36a57d0] .from_el .title{width:2.4rem;font-size:.42667rem;flex-shrink:0}[data-v-e36a57d0] .from_el .enclosure{margin-top:.53333rem}[data-v-e36a57d0] .from_el .enclosureBtn{display:inline-block;padding:.21333rem .42667rem;background:#d03a29;border-radius:.10667rem;color:#fff}[data-v-e36a57d0] .from_el .enclosureBtn .enclosureImg{margin-right:.10667rem;width:.34667rem;height:.32rem;vertical-align:middle}.preview-cover[data-v-e36a57d0]{position:absolute;bottom:0;box-sizing:border-box;width:100%;padding:.10667rem;color:#fff;font-size:.32rem;text-align:center;background:rgba(0,0,0,.3)}.browse[data-v-e36a57d0]{margin:.26667rem 0}.browse .browse_delet[data-v-e36a57d0]{width:100%;text-align:right;font-size:.42667rem}.browse .imagesee[data-v-e36a57d0]{width:2.66667rem}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.van-pagination[data-v-82b76708]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.box[data-v-82b76708]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .imgaddBtn[data-v-82b76708]{position:fixed;bottom:26%;right:0}.box .imgaddBtn .imgdiv[data-v-82b76708]{height:2.4rem;margin-top:.26667rem;z-index:50;opacity:.9}.box .imgaddBtn .imgdiv .add[data-v-82b76708]{width:2.72rem;z-index:999}.box .imgaddBtn .imgtext[data-v-82b76708]{font-size:.42667rem;text-align:center}.box[data-v-82b76708] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-82b76708]{padding:.32rem;padding-bottom:1.12rem}.box .tab-contain .van-cell[data-v-82b76708]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-82b76708]{font-weight:700;font-size:.42667rem}.box .tab-contain .van-cell .custom-title1[data-v-82b76708]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#47aef3}.box .tab-contain .van-cell .custom-title2[data-v-82b76708]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#c86b1d}.box .tab-contain .van-cell .van-icon[data-v-82b76708]{color:#333}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More