diff --git a/research-common/src/main/java/com/research/common/core/domain/model/LoginUser.java b/research-common/src/main/java/com/research/common/core/domain/model/LoginUser.java index 9ef34aa9..a0d1cc16 100644 --- a/research-common/src/main/java/com/research/common/core/domain/model/LoginUser.java +++ b/research-common/src/main/java/com/research/common/core/domain/model/LoginUser.java @@ -99,6 +99,15 @@ public class LoginUser implements UserDetails this.permissions = permissions; } + public LoginUser(Long userId, Long deptId, SysUser user, Set permissions,Long tenantId) + { + this.userId = userId; + this.deptId = deptId; + this.user = user; + this.permissions = permissions; + this.tenantId = tenantId; + } + public LoginUser(Long userId, Long deptId, SysUser user, Set permissions, Long tenantId, Long scoreId) { this.userId = userId; diff --git a/research-framework/src/main/java/com/research/framework/web/service/UserDetailsServiceImpl.java b/research-framework/src/main/java/com/research/framework/web/service/UserDetailsServiceImpl.java index c00133ab..79439397 100644 --- a/research-framework/src/main/java/com/research/framework/web/service/UserDetailsServiceImpl.java +++ b/research-framework/src/main/java/com/research/framework/web/service/UserDetailsServiceImpl.java @@ -4,8 +4,11 @@ import cn.hutool.core.collection.CollUtil; import com.research.common.core.domain.entity.SysRole; import com.research.framework.datasource.DataSourceManager; import com.research.framework.datasource.DynamicDataSourceContextHolder; +import com.research.system.domain.po.PrjProjInfo; +import com.research.system.domain.po.PrjProjInfoExample; import com.research.system.domain.vo.TmsLoginUserVo; import com.research.system.mapper.SysRoleMapper; +import com.research.system.persist.mapper.PrjProjInfoMapper; import com.research.system.service.ISysRoleService; import com.research.system.service.TmsLoginService; import org.slf4j.Logger; @@ -48,6 +51,8 @@ public class UserDetailsServiceImpl implements UserDetailsService @Resource private TmsLoginService dmsLoginService; + @Resource + private PrjProjInfoMapper prjProjInfoMapper; @Resource private SysRoleMapper roleMapper; @@ -73,8 +78,12 @@ public class UserDetailsServiceImpl implements UserDetailsService } passwordService.validate(user); - - return createLoginUser(user); + List prjProjInfos = prjProjInfoMapper.selectByExample(new PrjProjInfoExample()); + Long tenantId = 0L; + if (CollUtil.isNotEmpty(prjProjInfos)) { + tenantId = prjProjInfos.get(0).getTenantId(); + } + return createLoginUser(user, tenantId); } public UserDetails loadDmsUserByUsername(String username) throws UsernameNotFoundException @@ -97,11 +106,11 @@ public class UserDetailsServiceImpl implements UserDetailsService } //切换数据源查询子库用户密码 - DynamicDataSourceContextHolder.setDataSourceType(dataScoreVo.getDataSourceKey()); +// DynamicDataSourceContextHolder.setDataSourceType(dataScoreVo.getDataSourceKey()); //查询用户密码 SysUser sysUser = userService.selectUserByUserName(dataScoreVo.getUsername()); if (sysUser == null) { - DynamicDataSourceContextHolder.clearDataSourceType(); +// DynamicDataSourceContextHolder.clearDataSourceType(); throw new ServiceException(MessageUtils.message("user.not.exists")); } //查询角色 @@ -109,7 +118,7 @@ public class UserDetailsServiceImpl implements UserDetailsService dataScoreVo.setRoles(sysRoles); //销毁 - DynamicDataSourceContextHolder.clearDataSourceType(); +// DynamicDataSourceContextHolder.clearDataSourceType(); dataScoreVo.setDmsUserNickName(sysUser.getNickName()); dataScoreVo.setPassword(sysUser.getPassword()); @@ -117,9 +126,9 @@ public class UserDetailsServiceImpl implements UserDetailsService return createLoginUser(dataScoreVo, dataScoreVo.getDataSourceKey()); } - public UserDetails createLoginUser(SysUser user) + public UserDetails createLoginUser(SysUser user, Long tenantId) { - return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); + return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user), tenantId); } public UserDetails createLoginUser(TmsLoginUserVo.DataScoreVo user, String dataSourceKey) diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index b3d80520..af7d3212 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -68,12 +68,12 @@ - + -
-
+ + diff --git a/research-system/src/main/java/com/research/system/domain/dto/MeetingDto.java b/research-system/src/main/java/com/research/system/domain/dto/MeetingDto.java index 53c19247..8a10bc36 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/MeetingDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/MeetingDto.java @@ -48,5 +48,10 @@ public class MeetingDto { private String remark; private List metMeetingParticipantList; + private Byte meetingType; + + private String meetingPlace; + + private String meetingNumber; } } diff --git a/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java b/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java index b9c61c02..27c05700 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java +++ b/research-system/src/main/java/com/research/system/domain/dto/OutcomeDto.java @@ -51,6 +51,8 @@ public class OutcomeDto { private String no; + private String paperDoi; + private String authors; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date applyDate; @@ -83,6 +85,7 @@ public class OutcomeDto { private String pdfDownloadUrl; private String commitmentLetterUrl; + private String remark; } @Data diff --git a/research-system/src/main/java/com/research/system/domain/po/AchAchievement.java b/research-system/src/main/java/com/research/system/domain/po/AchAchievement.java index 45d7ab6a..971b7aa7 100644 --- a/research-system/src/main/java/com/research/system/domain/po/AchAchievement.java +++ b/research-system/src/main/java/com/research/system/domain/po/AchAchievement.java @@ -42,8 +42,6 @@ public class AchAchievement implements Serializable { private Byte ysktStatus; - private String abstracts; - private String keywords; private String paperLink; @@ -64,6 +62,12 @@ public class AchAchievement implements Serializable { private String remark; + private String txAuthors; + + private String paperDoi; + + private String abstracts; + private static final long serialVersionUID = 1L; public Long getId() { @@ -218,14 +222,6 @@ public class AchAchievement implements Serializable { this.ysktStatus = ysktStatus; } - public String getAbstracts() { - return abstracts; - } - - public void setAbstracts(String abstracts) { - this.abstracts = abstracts == null ? null : abstracts.trim(); - } - public String getKeywords() { return keywords; } @@ -306,6 +302,30 @@ public class AchAchievement implements Serializable { this.remark = remark == null ? null : remark.trim(); } + public String getTxAuthors() { + return txAuthors; + } + + public void setTxAuthors(String txAuthors) { + this.txAuthors = txAuthors == null ? null : txAuthors.trim(); + } + + public String getPaperDoi() { + return paperDoi; + } + + public void setPaperDoi(String paperDoi) { + this.paperDoi = paperDoi == null ? null : paperDoi.trim(); + } + + public String getAbstracts() { + return abstracts; + } + + public void setAbstracts(String abstracts) { + this.abstracts = abstracts == null ? null : abstracts.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -331,7 +351,6 @@ public class AchAchievement implements Serializable { sb.append(", ysktFunds=").append(ysktFunds); sb.append(", ysktLxpzwh=").append(ysktLxpzwh); sb.append(", ysktStatus=").append(ysktStatus); - sb.append(", abstracts=").append(abstracts); sb.append(", keywords=").append(keywords); sb.append(", paperLink=").append(paperLink); sb.append(", pdfDownloadUrl=").append(pdfDownloadUrl); @@ -342,6 +361,9 @@ public class AchAchievement implements Serializable { sb.append(", updateBy=").append(updateBy); sb.append(", updateTime=").append(updateTime); sb.append(", remark=").append(remark); + sb.append(", txAuthors=").append(txAuthors); + sb.append(", paperDoi=").append(paperDoi); + sb.append(", abstracts=").append(abstracts); sb.append("]"); return sb.toString(); } diff --git a/research-system/src/main/java/com/research/system/domain/po/AchAchievementExample.java b/research-system/src/main/java/com/research/system/domain/po/AchAchievementExample.java index b0bc5ba3..3f46eeba 100644 --- a/research-system/src/main/java/com/research/system/domain/po/AchAchievementExample.java +++ b/research-system/src/main/java/com/research/system/domain/po/AchAchievementExample.java @@ -1352,76 +1352,6 @@ public class AchAchievementExample { return (Criteria) this; } - public Criteria andAbstractsIsNull() { - addCriterion("abstracts is null"); - return (Criteria) this; - } - - public Criteria andAbstractsIsNotNull() { - addCriterion("abstracts is not null"); - return (Criteria) this; - } - - public Criteria andAbstractsEqualTo(String value) { - addCriterion("abstracts =", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsNotEqualTo(String value) { - addCriterion("abstracts <>", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsGreaterThan(String value) { - addCriterion("abstracts >", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsGreaterThanOrEqualTo(String value) { - addCriterion("abstracts >=", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsLessThan(String value) { - addCriterion("abstracts <", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsLessThanOrEqualTo(String value) { - addCriterion("abstracts <=", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsLike(String value) { - addCriterion("abstracts like", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsNotLike(String value) { - addCriterion("abstracts not like", value, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsIn(List values) { - addCriterion("abstracts in", values, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsNotIn(List values) { - addCriterion("abstracts not in", values, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsBetween(String value1, String value2) { - addCriterion("abstracts between", value1, value2, "abstracts"); - return (Criteria) this; - } - - public Criteria andAbstractsNotBetween(String value1, String value2) { - addCriterion("abstracts not between", value1, value2, "abstracts"); - return (Criteria) this; - } - public Criteria andKeywordsIsNull() { addCriterion("keywords is null"); return (Criteria) this; @@ -2091,6 +2021,146 @@ public class AchAchievementExample { addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } + + public Criteria andTxAuthorsIsNull() { + addCriterion("tx_authors is null"); + return (Criteria) this; + } + + public Criteria andTxAuthorsIsNotNull() { + addCriterion("tx_authors is not null"); + return (Criteria) this; + } + + public Criteria andTxAuthorsEqualTo(String value) { + addCriterion("tx_authors =", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsNotEqualTo(String value) { + addCriterion("tx_authors <>", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsGreaterThan(String value) { + addCriterion("tx_authors >", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsGreaterThanOrEqualTo(String value) { + addCriterion("tx_authors >=", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsLessThan(String value) { + addCriterion("tx_authors <", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsLessThanOrEqualTo(String value) { + addCriterion("tx_authors <=", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsLike(String value) { + addCriterion("tx_authors like", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsNotLike(String value) { + addCriterion("tx_authors not like", value, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsIn(List values) { + addCriterion("tx_authors in", values, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsNotIn(List values) { + addCriterion("tx_authors not in", values, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsBetween(String value1, String value2) { + addCriterion("tx_authors between", value1, value2, "txAuthors"); + return (Criteria) this; + } + + public Criteria andTxAuthorsNotBetween(String value1, String value2) { + addCriterion("tx_authors not between", value1, value2, "txAuthors"); + return (Criteria) this; + } + + public Criteria andPaperDoiIsNull() { + addCriterion("paper_doi is null"); + return (Criteria) this; + } + + public Criteria andPaperDoiIsNotNull() { + addCriterion("paper_doi is not null"); + return (Criteria) this; + } + + public Criteria andPaperDoiEqualTo(String value) { + addCriterion("paper_doi =", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiNotEqualTo(String value) { + addCriterion("paper_doi <>", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiGreaterThan(String value) { + addCriterion("paper_doi >", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiGreaterThanOrEqualTo(String value) { + addCriterion("paper_doi >=", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiLessThan(String value) { + addCriterion("paper_doi <", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiLessThanOrEqualTo(String value) { + addCriterion("paper_doi <=", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiLike(String value) { + addCriterion("paper_doi like", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiNotLike(String value) { + addCriterion("paper_doi not like", value, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiIn(List values) { + addCriterion("paper_doi in", values, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiNotIn(List values) { + addCriterion("paper_doi not in", values, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiBetween(String value1, String value2) { + addCriterion("paper_doi between", value1, value2, "paperDoi"); + return (Criteria) this; + } + + public Criteria andPaperDoiNotBetween(String value1, String value2) { + addCriterion("paper_doi not between", value1, value2, "paperDoi"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecord.java b/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecord.java index 96ffefd4..a0fd433f 100644 --- a/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecord.java +++ b/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecord.java @@ -36,6 +36,12 @@ public class MetMeetingRecord implements Serializable { private Date updateTime; + private Byte meetingType; + + private String meetingPlace; + + private String meetingNumber; + private static final long serialVersionUID = 1L; public Long getId() { @@ -166,6 +172,30 @@ public class MetMeetingRecord implements Serializable { this.updateTime = updateTime; } + public Byte getMeetingType() { + return meetingType; + } + + public void setMeetingType(Byte meetingType) { + this.meetingType = meetingType; + } + + public String getMeetingPlace() { + return meetingPlace; + } + + public void setMeetingPlace(String meetingPlace) { + this.meetingPlace = meetingPlace == null ? null : meetingPlace.trim(); + } + + public String getMeetingNumber() { + return meetingNumber; + } + + public void setMeetingNumber(String meetingNumber) { + this.meetingNumber = meetingNumber == null ? null : meetingNumber.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -188,6 +218,9 @@ public class MetMeetingRecord implements Serializable { sb.append(", createTime=").append(createTime); sb.append(", updateBy=").append(updateBy); sb.append(", updateTime=").append(updateTime); + sb.append(", meetingType=").append(meetingType); + sb.append(", meetingPlace=").append(meetingPlace); + sb.append(", meetingNumber=").append(meetingNumber); sb.append("]"); return sb.toString(); } diff --git a/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecordExample.java b/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecordExample.java index 76cdde80..6b25e6a6 100644 --- a/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecordExample.java +++ b/research-system/src/main/java/com/research/system/domain/po/MetMeetingRecordExample.java @@ -1134,6 +1134,206 @@ public class MetMeetingRecordExample { addCriterion("update_time not between", value1, value2, "updateTime"); return (Criteria) this; } + + public Criteria andMeetingTypeIsNull() { + addCriterion("meeting_type is null"); + return (Criteria) this; + } + + public Criteria andMeetingTypeIsNotNull() { + addCriterion("meeting_type is not null"); + return (Criteria) this; + } + + public Criteria andMeetingTypeEqualTo(Byte value) { + addCriterion("meeting_type =", value, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeNotEqualTo(Byte value) { + addCriterion("meeting_type <>", value, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeGreaterThan(Byte value) { + addCriterion("meeting_type >", value, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("meeting_type >=", value, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeLessThan(Byte value) { + addCriterion("meeting_type <", value, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeLessThanOrEqualTo(Byte value) { + addCriterion("meeting_type <=", value, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeIn(List values) { + addCriterion("meeting_type in", values, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeNotIn(List values) { + addCriterion("meeting_type not in", values, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeBetween(Byte value1, Byte value2) { + addCriterion("meeting_type between", value1, value2, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingTypeNotBetween(Byte value1, Byte value2) { + addCriterion("meeting_type not between", value1, value2, "meetingType"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceIsNull() { + addCriterion("meeting_place is null"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceIsNotNull() { + addCriterion("meeting_place is not null"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceEqualTo(String value) { + addCriterion("meeting_place =", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceNotEqualTo(String value) { + addCriterion("meeting_place <>", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceGreaterThan(String value) { + addCriterion("meeting_place >", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceGreaterThanOrEqualTo(String value) { + addCriterion("meeting_place >=", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceLessThan(String value) { + addCriterion("meeting_place <", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceLessThanOrEqualTo(String value) { + addCriterion("meeting_place <=", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceLike(String value) { + addCriterion("meeting_place like", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceNotLike(String value) { + addCriterion("meeting_place not like", value, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceIn(List values) { + addCriterion("meeting_place in", values, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceNotIn(List values) { + addCriterion("meeting_place not in", values, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceBetween(String value1, String value2) { + addCriterion("meeting_place between", value1, value2, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingPlaceNotBetween(String value1, String value2) { + addCriterion("meeting_place not between", value1, value2, "meetingPlace"); + return (Criteria) this; + } + + public Criteria andMeetingNumberIsNull() { + addCriterion("meeting_number is null"); + return (Criteria) this; + } + + public Criteria andMeetingNumberIsNotNull() { + addCriterion("meeting_number is not null"); + return (Criteria) this; + } + + public Criteria andMeetingNumberEqualTo(String value) { + addCriterion("meeting_number =", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberNotEqualTo(String value) { + addCriterion("meeting_number <>", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberGreaterThan(String value) { + addCriterion("meeting_number >", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberGreaterThanOrEqualTo(String value) { + addCriterion("meeting_number >=", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberLessThan(String value) { + addCriterion("meeting_number <", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberLessThanOrEqualTo(String value) { + addCriterion("meeting_number <=", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberLike(String value) { + addCriterion("meeting_number like", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberNotLike(String value) { + addCriterion("meeting_number not like", value, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberIn(List values) { + addCriterion("meeting_number in", values, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberNotIn(List values) { + addCriterion("meeting_number not in", values, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberBetween(String value1, String value2) { + addCriterion("meeting_number between", value1, value2, "meetingNumber"); + return (Criteria) this; + } + + public Criteria andMeetingNumberNotBetween(String value1, String value2) { + addCriterion("meeting_number not between", value1, value2, "meetingNumber"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/research-system/src/main/java/com/research/system/domain/vo/MeetingVo.java b/research-system/src/main/java/com/research/system/domain/vo/MeetingVo.java index 6012bce7..58d66116 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/MeetingVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/MeetingVo.java @@ -46,7 +46,11 @@ public class MeetingVo { private String ktGroupName; private List metMeetingParticipantList; + private Byte meetingType; + private String meetingPlace; + + private String meetingNumber; } @Data diff --git a/research-system/src/main/java/com/research/system/domain/vo/OutcomeVo.java b/research-system/src/main/java/com/research/system/domain/vo/OutcomeVo.java index c9244683..972d37a3 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/OutcomeVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/OutcomeVo.java @@ -44,6 +44,8 @@ public class OutcomeVo { private String place; + private String paperDoi; + private Byte achType; private String source; @@ -67,6 +69,7 @@ public class OutcomeVo { private String pdfDownloadUrl; private String commitmentLetterUrl; + private String remark; private String createBy; diff --git a/research-system/src/main/java/com/research/system/domain/vo/ResResearchIntegrityVo.java b/research-system/src/main/java/com/research/system/domain/vo/ResResearchIntegrityVo.java index 0684a1a1..42529fe2 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/ResResearchIntegrityVo.java +++ b/research-system/src/main/java/com/research/system/domain/vo/ResResearchIntegrityVo.java @@ -35,6 +35,8 @@ public class ResResearchIntegrityVo { private String signTime; private String tplDownloadUrl; + private String createBy; + private Date createTime; } @Data diff --git a/research-system/src/main/java/com/research/system/persist/mapper/AchAchievementMapper.java b/research-system/src/main/java/com/research/system/persist/mapper/AchAchievementMapper.java index a14157e6..089d646c 100644 --- a/research-system/src/main/java/com/research/system/persist/mapper/AchAchievementMapper.java +++ b/research-system/src/main/java/com/research/system/persist/mapper/AchAchievementMapper.java @@ -14,15 +14,21 @@ public interface AchAchievementMapper { int insertSelective(AchAchievement record); + List selectByExampleWithBLOBs(AchAchievementExample example); + List selectByExample(AchAchievementExample example); AchAchievement selectByPrimaryKey(Long id); int updateByExampleSelective(@Param("record") AchAchievement record, @Param("example") AchAchievementExample example); + int updateByExampleWithBLOBs(@Param("record") AchAchievement record, @Param("example") AchAchievementExample example); + int updateByExample(@Param("record") AchAchievement record, @Param("example") AchAchievementExample example); int updateByPrimaryKeySelective(AchAchievement record); + int updateByPrimaryKeyWithBLOBs(AchAchievement record); + int updateByPrimaryKey(AchAchievement record); } \ No newline at end of file diff --git a/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java index 21c91430..9252b93e 100644 --- a/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java @@ -57,21 +57,21 @@ public class CooperatorServiceImpl implements CooperatorService { @Override public void add(ClientPrjProjInfoDto.OrgDto dto) { -// //根据租户查询项目 - PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId()); - if (proInfoByTenantId == null) { - throw new BaseException("未查询到租户"); - } +//// //根据租户查询项目 +// PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId()); +// if (proInfoByTenantId == null) { +// throw new BaseException("未查询到租户"); +// } PrjProjOrg prjProjOrg = BeanUtil.copyProperties(dto, PrjProjOrg.class); if (dto.getId() == null) { prjProjOrg.setId(IdUtil.getSnowflakeNextId()); - prjProjOrg.setProjId(proInfoByTenantId.getId()); +// prjProjOrg.setProjId(proInfoByTenantId.getId()); prjProjOrg.setCreateBy(SecurityUtils.getUsername()); prjProjOrg.setDelFlag((byte) 0); prjProjOrg.setCreateTime(new Date()); prjProjOrgMapper.insertSelective(prjProjOrg); } else { - prjProjOrg.setProjId(proInfoByTenantId.getId()); +// prjProjOrg.setProjId(proInfoByTenantId.getId()); prjProjOrg.setUpdateBy(SecurityUtils.getUsername()); prjProjOrg.setUpdateTime(new Date()); prjProjOrg.setDelFlag((byte) 0); diff --git a/research-system/src/main/java/com/research/system/service/impl/MeetingServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/MeetingServiceImpl.java index 8e654a1e..1c9db28a 100644 --- a/research-system/src/main/java/com/research/system/service/impl/MeetingServiceImpl.java +++ b/research-system/src/main/java/com/research/system/service/impl/MeetingServiceImpl.java @@ -48,17 +48,17 @@ public class MeetingServiceImpl implements MeetingService { @Override public void add(MeetingDto.Add dto) { - PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId()); - if (proInfoByTenantId == null) { - throw new BaseException("未查询到项目"); - } +// PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId()); +// if (proInfoByTenantId == null) { +// throw new BaseException("未查询到项目"); +// } MetMeetingRecord metMeetingRecord = BeanUtil.copyProperties(dto, MetMeetingRecord.class); if (dto.getId() == null) { metMeetingRecord.setId(IdUtil.getSnowflakeNextId()); metMeetingRecord.setCreateBy(SecurityUtils.getUsername()); metMeetingRecord.setCreateTime(new Date()); metMeetingRecord.setMeetingFqr(SecurityUtils.getUsername()); - metMeetingRecord.setProjId(proInfoByTenantId.getId()); +// metMeetingRecord.setProjId(proInfoByTenantId.getId()); metMeetingRecordMapper.insertSelective(metMeetingRecord); if (CollUtil.isNotEmpty(dto.getMetMeetingParticipantList())) { diff --git a/research-system/src/main/resources/mapper/dao/MeetingDao.xml b/research-system/src/main/resources/mapper/dao/MeetingDao.xml index fc3b6dea..ed653559 100644 --- a/research-system/src/main/resources/mapper/dao/MeetingDao.xml +++ b/research-system/src/main/resources/mapper/dao/MeetingDao.xml @@ -19,6 +19,9 @@ r.meeting_end_time, r.meeting_abstract, r.meeting_note_url, + r.meeting_type, + r.meeting_place, + r.meeting_number, r.remark, r.create_by, r.create_time, diff --git a/research-system/src/main/resources/mapper/dao/OutcomeDao.xml b/research-system/src/main/resources/mapper/dao/OutcomeDao.xml index 1aea4a0d..dac404e1 100644 --- a/research-system/src/main/resources/mapper/dao/OutcomeDao.xml +++ b/research-system/src/main/resources/mapper/dao/OutcomeDao.xml @@ -24,6 +24,7 @@ a.proj_id as projId, a.proj_org_id as projOrgId, a.kt_group_id as ktGroupId, + a.paper_doi as paperDoi, a.category_id_1 as categoryId1, a.category_id_2 as categoryId2, a.title, diff --git a/research-system/src/main/resources/mapper/system/AchAchievementMapper.xml b/research-system/src/main/resources/mapper/system/AchAchievementMapper.xml index 58f4e26b..ce0ac887 100644 --- a/research-system/src/main/resources/mapper/system/AchAchievementMapper.xml +++ b/research-system/src/main/resources/mapper/system/AchAchievementMapper.xml @@ -21,7 +21,6 @@ - @@ -32,6 +31,11 @@ + + + + + @@ -94,10 +98,28 @@ id, proj_id, proj_org_id, kt_group_id, category_id_1, category_id_2, title, no, authors, apply_date, publish_date, place, ach_type, source, paper_source_type, yskt_xmfzr, - yskt_funds, yskt_lxpzwh, yskt_status, abstracts, keywords, paper_link, pdf_download_url, - commitment_letter_url, del_flag, create_by, create_time, update_by, update_time, - remark + yskt_funds, yskt_lxpzwh, yskt_status, keywords, paper_link, pdf_download_url, commitment_letter_url, + del_flag, create_by, create_time, update_by, update_time, remark, tx_authors, paper_doi + + + abstracts + - select + , + from ach_achievement where id = #{id,jdbcType=BIGINT} @@ -129,22 +153,22 @@ apply_date, publish_date, place, ach_type, source, paper_source_type, yskt_xmfzr, yskt_funds, yskt_lxpzwh, - yskt_status, abstracts, keywords, - paper_link, pdf_download_url, commitment_letter_url, - del_flag, create_by, create_time, - update_by, update_time, remark - ) + yskt_status, keywords, paper_link, + pdf_download_url, commitment_letter_url, del_flag, + create_by, create_time, update_by, + update_time, remark, tx_authors, + paper_doi, abstracts) values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, #{ktGroupId,jdbcType=BIGINT}, #{categoryId1,jdbcType=BIGINT}, #{categoryId2,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, #{authors,jdbcType=VARCHAR}, #{applyDate,jdbcType=DATE}, #{publishDate,jdbcType=DATE}, #{place,jdbcType=VARCHAR}, #{achType,jdbcType=TINYINT}, #{source,jdbcType=VARCHAR}, #{paperSourceType,jdbcType=TINYINT}, #{ysktXmfzr,jdbcType=VARCHAR}, #{ysktFunds,jdbcType=VARCHAR}, #{ysktLxpzwh,jdbcType=VARCHAR}, - #{ysktStatus,jdbcType=TINYINT}, #{abstracts,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, - #{paperLink,jdbcType=VARCHAR}, #{pdfDownloadUrl,jdbcType=VARCHAR}, #{commitmentLetterUrl,jdbcType=VARCHAR}, - #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR} - ) + #{ysktStatus,jdbcType=TINYINT}, #{keywords,jdbcType=VARCHAR}, #{paperLink,jdbcType=VARCHAR}, + #{pdfDownloadUrl,jdbcType=VARCHAR}, #{commitmentLetterUrl,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{txAuthors,jdbcType=VARCHAR}, + #{paperDoi,jdbcType=VARCHAR}, #{abstracts,jdbcType=LONGVARCHAR}) insert into ach_achievement @@ -206,9 +230,6 @@ yskt_status, - - abstracts, - keywords, @@ -239,6 +260,15 @@ remark, + + tx_authors, + + + paper_doi, + + + abstracts, + @@ -298,9 +328,6 @@ #{ysktStatus,jdbcType=TINYINT}, - - #{abstracts,jdbcType=VARCHAR}, - #{keywords,jdbcType=VARCHAR}, @@ -331,6 +358,15 @@ #{remark,jdbcType=VARCHAR}, + + #{txAuthors,jdbcType=VARCHAR}, + + + #{paperDoi,jdbcType=VARCHAR}, + + + #{abstracts,jdbcType=LONGVARCHAR}, + select @@ -112,13 +115,15 @@ meeting_begin_time, meeting_end_time, meeting_abstract, meeting_note_url, remark, del_flag, create_by, create_time, update_by, - update_time) + update_time, meeting_type, meeting_place, + meeting_number) values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, #{ktGroupId,jdbcType=BIGINT}, #{meetingTitle,jdbcType=VARCHAR}, #{meetingFqr,jdbcType=VARCHAR}, #{meetingBeginTime,jdbcType=TIMESTAMP}, #{meetingEndTime,jdbcType=TIMESTAMP}, #{meetingAbstract,jdbcType=VARCHAR}, #{meetingNoteUrl,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}) + #{updateTime,jdbcType=TIMESTAMP}, #{meetingType,jdbcType=TINYINT}, #{meetingPlace,jdbcType=VARCHAR}, + #{meetingNumber,jdbcType=VARCHAR}) insert into met_meeting_record @@ -171,6 +176,15 @@ update_time, + + meeting_type, + + + meeting_place, + + + meeting_number, + @@ -221,6 +235,15 @@ #{updateTime,jdbcType=TIMESTAMP}, + + #{meetingType,jdbcType=TINYINT}, + + + #{meetingPlace,jdbcType=VARCHAR}, + + + #{meetingNumber,jdbcType=VARCHAR}, +