diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml
index b4da9372..6e06875f 100644
--- a/research-generator/src/main/resources/mbg.xml
+++ b/research-generator/src/main/resources/mbg.xml
@@ -67,8 +67,8 @@
-
-
+
+
diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java
index 4fa5ee4e..8fbf1e3c 100644
--- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java
+++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMember.java
@@ -8,6 +8,8 @@ public class KtsKtGroupMember implements Serializable {
private Long userId;
+ private Long projOrgId;
+
private Long ktGroupId;
private String parentMemberId;
@@ -74,6 +76,14 @@ public class KtsKtGroupMember implements Serializable {
this.userId = userId;
}
+ public Long getProjOrgId() {
+ return projOrgId;
+ }
+
+ public void setProjOrgId(Long projOrgId) {
+ this.projOrgId = projOrgId;
+ }
+
public Long getKtGroupId() {
return ktGroupId;
}
@@ -274,6 +284,7 @@ public class KtsKtGroupMember implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", userId=").append(userId);
+ sb.append(", projOrgId=").append(projOrgId);
sb.append(", ktGroupId=").append(ktGroupId);
sb.append(", parentMemberId=").append(parentMemberId);
sb.append(", memberName=").append(memberName);
diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java
index 67c062c4..2ea672c1 100644
--- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java
+++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberExample.java
@@ -252,6 +252,66 @@ public class KtsKtGroupMemberExample {
return (Criteria) this;
}
+ public Criteria andProjOrgIdIsNull() {
+ addCriterion("proj_org_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdIsNotNull() {
+ addCriterion("proj_org_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdEqualTo(Long value) {
+ addCriterion("proj_org_id =", value, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdNotEqualTo(Long value) {
+ addCriterion("proj_org_id <>", value, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdGreaterThan(Long value) {
+ addCriterion("proj_org_id >", value, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdGreaterThanOrEqualTo(Long value) {
+ addCriterion("proj_org_id >=", value, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdLessThan(Long value) {
+ addCriterion("proj_org_id <", value, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdLessThanOrEqualTo(Long value) {
+ addCriterion("proj_org_id <=", value, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdIn(List values) {
+ addCriterion("proj_org_id in", values, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdNotIn(List values) {
+ addCriterion("proj_org_id not in", values, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdBetween(Long value1, Long value2) {
+ addCriterion("proj_org_id between", value1, value2, "projOrgId");
+ return (Criteria) this;
+ }
+
+ public Criteria andProjOrgIdNotBetween(Long value1, Long value2) {
+ addCriterion("proj_org_id not between", value1, value2, "projOrgId");
+ return (Criteria) this;
+ }
+
public Criteria andKtGroupIdIsNull() {
addCriterion("kt_group_id is null");
return (Criteria) this;
diff --git a/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java b/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java
index 4ac2a6a1..e95710d7 100644
--- a/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java
+++ b/research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java
@@ -20,6 +20,8 @@ public interface KtsGroupDao {
List queryMemberList(@Param("dto") GroupDto.MemberQuery dto);
+ List queryMemberList1(@Param("dto") GroupDto.MemberQuery dto);
+
List queryNum();
List jhzt();
diff --git a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
index c0750651..6c616ce3 100644
--- a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
+++ b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
@@ -243,7 +243,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
@Override
public List queryMemberList(GroupDto.MemberQuery query) {
- List memberResults = ktsGroupDao.queryMemberList(query);
+ List memberResults = ktsGroupDao.queryMemberList1(query);
if (CollUtil.isNotEmpty(memberResults)) {
for (GroupVO.MemberResult memberResult : memberResults) {
String title = memberResult.getTitle();
@@ -353,6 +353,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
ktsKtGroupMember.setMemberStatus((byte) 0);
ktsKtGroupMember.setAuditStatus((byte) 0);
ktsKtGroupMember.setCreateTime(new Date());
+ ktsKtGroupMember.setProjOrgId(dto.getProjOrgId());
ktsKtGroupMember.setDelFlag((byte) 0);
ktsKtGroupMemberMapper.insertSelective(ktsKtGroupMember);
return ktsKtGroupMember;
diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
index c6b7a141..66e486ed 100644
--- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
+++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
@@ -125,6 +125,74 @@
order by m.kt_group_id,m.id
+
+
+