修改登录保存租户ID

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<String> 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<String> permissions, Long tenantId, Long scoreId)
     {
         this.userId = userId;

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<PrjProjInfo> 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)

research-generator/src/main/resources/mbg.xml

@@ -68,12 +68,12 @@
 <!--        <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>-->
 <!--        <table tableName="kts_kt_group_member" domainObjectName="KtsKtGroupMember" enableDeleteByExample="false"/>-->
 <!--        <table tableName="met_meeting_participant" domainObjectName="MetMeetingParticipant" enableDeleteByExample="false"/>-->
-<!--        <table tableName="met_meeting_record" domainObjectName="MetMeetingRecord" enableDeleteByExample="false"/>-->
+        <table tableName="met_meeting_record" domainObjectName="MetMeetingRecord" enableDeleteByExample="false"/>
 <!--        <table tableName="prj_proj_document" domainObjectName="PrjProjDocument" enableDeleteByExample="false"/>-->
 <!--        <table tableName="prj_proj_info" domainObjectName="PrjProjInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" enableDeleteByExample="false"/>-->
-        <table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>
-        <table tableName="srv_message" domainObjectName="SrvMessage" enableDeleteByExample="false"/>
+<!--        <table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>-->
+<!--        <table tableName="srv_message" domainObjectName="SrvMessage" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_category" domainObjectName="ShsCkwxCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_info" domainObjectName="ShsCkwxInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_device_pic" domainObjectName="ShsDevicePic" enableDeleteByExample="false"/>-->

research-system/src/main/java/com/research/system/domain/dto/MeetingDto.java

@@ -48,5 +48,10 @@ public class MeetingDto {
 
         private String remark;
         private List<Long> metMeetingParticipantList;
+        private Byte meetingType;
+
+        private String meetingPlace;
+
+        private String meetingNumber;
     }
 }

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

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();
     }

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<String> values) {
-            addCriterion("abstracts in", values, "abstracts");
-            return (Criteria) this;
-        }
-
-        public Criteria andAbstractsNotIn(List<String> 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<String> values) {
+            addCriterion("tx_authors in", values, "txAuthors");
+            return (Criteria) this;
+        }
+
+        public Criteria andTxAuthorsNotIn(List<String> 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<String> values) {
+            addCriterion("paper_doi in", values, "paperDoi");
+            return (Criteria) this;
+        }
+
+        public Criteria andPaperDoiNotIn(List<String> 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 {

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();
     }

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<Byte> values) {
+            addCriterion("meeting_type in", values, "meetingType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingTypeNotIn(List<Byte> 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<String> values) {
+            addCriterion("meeting_place in", values, "meetingPlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingPlaceNotIn(List<String> 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<String> values) {
+            addCriterion("meeting_number in", values, "meetingNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeetingNumberNotIn(List<String> 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 {

research-system/src/main/java/com/research/system/domain/vo/MeetingVo.java

@@ -46,7 +46,11 @@ public class MeetingVo {
         private String  ktGroupName;
 
         private List<ParticipantResult> metMeetingParticipantList;
+        private Byte meetingType;
 
+        private String meetingPlace;
+
+        private String meetingNumber;
     }
 
     @Data

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;
 

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

research-system/src/main/java/com/research/system/persist/mapper/AchAchievementMapper.java

@@ -14,15 +14,21 @@ public interface AchAchievementMapper {
 
     int insertSelective(AchAchievement record);
 
+    List<AchAchievement> selectByExampleWithBLOBs(AchAchievementExample example);
+
     List<AchAchievement> 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);
 }

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);

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())) {

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,

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,

research-system/src/main/resources/mapper/system/AchAchievementMapper.xml

@@ -21,7 +21,6 @@
     <result column="yskt_funds" jdbcType="VARCHAR" property="ysktFunds" />
     <result column="yskt_lxpzwh" jdbcType="VARCHAR" property="ysktLxpzwh" />
     <result column="yskt_status" jdbcType="TINYINT" property="ysktStatus" />
-    <result column="abstracts" jdbcType="VARCHAR" property="abstracts" />
     <result column="keywords" jdbcType="VARCHAR" property="keywords" />
     <result column="paper_link" jdbcType="VARCHAR" property="paperLink" />
     <result column="pdf_download_url" jdbcType="VARCHAR" property="pdfDownloadUrl" />
@@ -32,6 +31,11 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="tx_authors" jdbcType="VARCHAR" property="txAuthors" />
+    <result column="paper_doi" jdbcType="VARCHAR" property="paperDoi" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.research.system.domain.po.AchAchievement">
+    <result column="abstracts" jdbcType="LONGVARCHAR" property="abstracts" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -94,10 +98,28 @@
   <sql id="Base_Column_List">
     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
+  </sql>
+  <sql id="Blob_Column_List">
+    abstracts
   </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.research.system.domain.po.AchAchievementExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ach_achievement
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
   <select id="selectByExample" parameterType="com.research.system.domain.po.AchAchievementExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -112,9 +134,11 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from ach_achievement
     where id = #{id,jdbcType=BIGINT}
   </select>
@@ -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>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.AchAchievement">
     insert into ach_achievement
@@ -206,9 +230,6 @@
       <if test="ysktStatus != null">
         yskt_status,
       </if>
-      <if test="abstracts != null">
-        abstracts,
-      </if>
       <if test="keywords != null">
         keywords,
       </if>
@@ -239,6 +260,15 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="txAuthors != null">
+        tx_authors,
+      </if>
+      <if test="paperDoi != null">
+        paper_doi,
+      </if>
+      <if test="abstracts != null">
+        abstracts,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -298,9 +328,6 @@
       <if test="ysktStatus != null">
         #{ysktStatus,jdbcType=TINYINT},
       </if>
-      <if test="abstracts != null">
-        #{abstracts,jdbcType=VARCHAR},
-      </if>
       <if test="keywords != null">
         #{keywords,jdbcType=VARCHAR},
       </if>
@@ -331,6 +358,15 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="txAuthors != null">
+        #{txAuthors,jdbcType=VARCHAR},
+      </if>
+      <if test="paperDoi != null">
+        #{paperDoi,jdbcType=VARCHAR},
+      </if>
+      <if test="abstracts != null">
+        #{abstracts,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.research.system.domain.po.AchAchievementExample" resultType="java.lang.Long">
@@ -399,9 +435,6 @@
       <if test="record.ysktStatus != null">
         yskt_status = #{record.ysktStatus,jdbcType=TINYINT},
       </if>
-      <if test="record.abstracts != null">
-        abstracts = #{record.abstracts,jdbcType=VARCHAR},
-      </if>
       <if test="record.keywords != null">
         keywords = #{record.keywords,jdbcType=VARCHAR},
       </if>
@@ -432,11 +465,58 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.txAuthors != null">
+        tx_authors = #{record.txAuthors,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paperDoi != null">
+        paper_doi = #{record.paperDoi,jdbcType=VARCHAR},
+      </if>
+      <if test="record.abstracts != null">
+        abstracts = #{record.abstracts,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update ach_achievement
+    set id = #{record.id,jdbcType=BIGINT},
+      proj_id = #{record.projId,jdbcType=BIGINT},
+      proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
+      kt_group_id = #{record.ktGroupId,jdbcType=BIGINT},
+      category_id_1 = #{record.categoryId1,jdbcType=BIGINT},
+      category_id_2 = #{record.categoryId2,jdbcType=BIGINT},
+      title = #{record.title,jdbcType=VARCHAR},
+      no = #{record.no,jdbcType=VARCHAR},
+      authors = #{record.authors,jdbcType=VARCHAR},
+      apply_date = #{record.applyDate,jdbcType=DATE},
+      publish_date = #{record.publishDate,jdbcType=DATE},
+      place = #{record.place,jdbcType=VARCHAR},
+      ach_type = #{record.achType,jdbcType=TINYINT},
+      source = #{record.source,jdbcType=VARCHAR},
+      paper_source_type = #{record.paperSourceType,jdbcType=TINYINT},
+      yskt_xmfzr = #{record.ysktXmfzr,jdbcType=VARCHAR},
+      yskt_funds = #{record.ysktFunds,jdbcType=VARCHAR},
+      yskt_lxpzwh = #{record.ysktLxpzwh,jdbcType=VARCHAR},
+      yskt_status = #{record.ysktStatus,jdbcType=TINYINT},
+      keywords = #{record.keywords,jdbcType=VARCHAR},
+      paper_link = #{record.paperLink,jdbcType=VARCHAR},
+      pdf_download_url = #{record.pdfDownloadUrl,jdbcType=VARCHAR},
+      commitment_letter_url = #{record.commitmentLetterUrl,jdbcType=VARCHAR},
+      del_flag = #{record.delFlag,jdbcType=TINYINT},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      tx_authors = #{record.txAuthors,jdbcType=VARCHAR},
+      paper_doi = #{record.paperDoi,jdbcType=VARCHAR},
+      abstracts = #{record.abstracts,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByExample" parameterType="map">
     update ach_achievement
     set id = #{record.id,jdbcType=BIGINT},
@@ -458,7 +538,6 @@
       yskt_funds = #{record.ysktFunds,jdbcType=VARCHAR},
       yskt_lxpzwh = #{record.ysktLxpzwh,jdbcType=VARCHAR},
       yskt_status = #{record.ysktStatus,jdbcType=TINYINT},
-      abstracts = #{record.abstracts,jdbcType=VARCHAR},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       paper_link = #{record.paperLink,jdbcType=VARCHAR},
       pdf_download_url = #{record.pdfDownloadUrl,jdbcType=VARCHAR},
@@ -468,7 +547,9 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      tx_authors = #{record.txAuthors,jdbcType=VARCHAR},
+      paper_doi = #{record.paperDoi,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -530,9 +611,6 @@
       <if test="ysktStatus != null">
         yskt_status = #{ysktStatus,jdbcType=TINYINT},
       </if>
-      <if test="abstracts != null">
-        abstracts = #{abstracts,jdbcType=VARCHAR},
-      </if>
       <if test="keywords != null">
         keywords = #{keywords,jdbcType=VARCHAR},
       </if>
@@ -563,9 +641,53 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="txAuthors != null">
+        tx_authors = #{txAuthors,jdbcType=VARCHAR},
+      </if>
+      <if test="paperDoi != null">
+        paper_doi = #{paperDoi,jdbcType=VARCHAR},
+      </if>
+      <if test="abstracts != null">
+        abstracts = #{abstracts,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.research.system.domain.po.AchAchievement">
+    update ach_achievement
+    set proj_id = #{projId,jdbcType=BIGINT},
+      proj_org_id = #{projOrgId,jdbcType=BIGINT},
+      kt_group_id = #{ktGroupId,jdbcType=BIGINT},
+      category_id_1 = #{categoryId1,jdbcType=BIGINT},
+      category_id_2 = #{categoryId2,jdbcType=BIGINT},
+      title = #{title,jdbcType=VARCHAR},
+      no = #{no,jdbcType=VARCHAR},
+      authors = #{authors,jdbcType=VARCHAR},
+      apply_date = #{applyDate,jdbcType=DATE},
+      publish_date = #{publishDate,jdbcType=DATE},
+      place = #{place,jdbcType=VARCHAR},
+      ach_type = #{achType,jdbcType=TINYINT},
+      source = #{source,jdbcType=VARCHAR},
+      paper_source_type = #{paperSourceType,jdbcType=TINYINT},
+      yskt_xmfzr = #{ysktXmfzr,jdbcType=VARCHAR},
+      yskt_funds = #{ysktFunds,jdbcType=VARCHAR},
+      yskt_lxpzwh = #{ysktLxpzwh,jdbcType=VARCHAR},
+      yskt_status = #{ysktStatus,jdbcType=TINYINT},
+      keywords = #{keywords,jdbcType=VARCHAR},
+      paper_link = #{paperLink,jdbcType=VARCHAR},
+      pdf_download_url = #{pdfDownloadUrl,jdbcType=VARCHAR},
+      commitment_letter_url = #{commitmentLetterUrl,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=TINYINT},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=VARCHAR},
+      tx_authors = #{txAuthors,jdbcType=VARCHAR},
+      paper_doi = #{paperDoi,jdbcType=VARCHAR},
+      abstracts = #{abstracts,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
   <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.AchAchievement">
     update ach_achievement
     set proj_id = #{projId,jdbcType=BIGINT},
@@ -586,7 +708,6 @@
       yskt_funds = #{ysktFunds,jdbcType=VARCHAR},
       yskt_lxpzwh = #{ysktLxpzwh,jdbcType=VARCHAR},
       yskt_status = #{ysktStatus,jdbcType=TINYINT},
-      abstracts = #{abstracts,jdbcType=VARCHAR},
       keywords = #{keywords,jdbcType=VARCHAR},
       paper_link = #{paperLink,jdbcType=VARCHAR},
       pdf_download_url = #{pdfDownloadUrl,jdbcType=VARCHAR},
@@ -596,7 +717,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      tx_authors = #{txAuthors,jdbcType=VARCHAR},
+      paper_doi = #{paperDoi,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

research-system/src/main/resources/mapper/system/MetMeetingRecordMapper.xml

@@ -18,6 +18,9 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="meeting_type" jdbcType="TINYINT" property="meetingType" />
+    <result column="meeting_place" jdbcType="VARCHAR" property="meetingPlace" />
+    <result column="meeting_number" jdbcType="VARCHAR" property="meetingNumber" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -80,7 +83,7 @@
   <sql id="Base_Column_List">
     id, proj_id, proj_org_id, kt_group_id, meeting_title, meeting_fqr, meeting_begin_time, 
     meeting_end_time, meeting_abstract, meeting_note_url, remark, del_flag, create_by, 
-    create_time, update_by, update_time
+    create_time, update_by, update_time, meeting_type, meeting_place, meeting_number
   </sql>
   <select id="selectByExample" parameterType="com.research.system.domain.po.MetMeetingRecordExample" resultMap="BaseResultMap">
     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>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.MetMeetingRecord">
     insert into met_meeting_record
@@ -171,6 +176,15 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="meetingType != null">
+        meeting_type,
+      </if>
+      <if test="meetingPlace != null">
+        meeting_place,
+      </if>
+      <if test="meetingNumber != null">
+        meeting_number,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -221,6 +235,15 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="meetingType != null">
+        #{meetingType,jdbcType=TINYINT},
+      </if>
+      <if test="meetingPlace != null">
+        #{meetingPlace,jdbcType=VARCHAR},
+      </if>
+      <if test="meetingNumber != null">
+        #{meetingNumber,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.research.system.domain.po.MetMeetingRecordExample" resultType="java.lang.Long">
@@ -280,6 +303,15 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.meetingType != null">
+        meeting_type = #{record.meetingType,jdbcType=TINYINT},
+      </if>
+      <if test="record.meetingPlace != null">
+        meeting_place = #{record.meetingPlace,jdbcType=VARCHAR},
+      </if>
+      <if test="record.meetingNumber != null">
+        meeting_number = #{record.meetingNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -302,7 +334,10 @@
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      meeting_type = #{record.meetingType,jdbcType=TINYINT},
+      meeting_place = #{record.meetingPlace,jdbcType=VARCHAR},
+      meeting_number = #{record.meetingNumber,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -355,6 +390,15 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="meetingType != null">
+        meeting_type = #{meetingType,jdbcType=TINYINT},
+      </if>
+      <if test="meetingPlace != null">
+        meeting_place = #{meetingPlace,jdbcType=VARCHAR},
+      </if>
+      <if test="meetingNumber != null">
+        meeting_number = #{meetingNumber,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -374,7 +418,10 @@
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      meeting_type = #{meetingType,jdbcType=TINYINT},
+      meeting_place = #{meetingPlace,jdbcType=VARCHAR},
+      meeting_number = #{meetingNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>