修改统计

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

@@ -67,8 +67,8 @@
 <!--        <table tableName="ach_achievement" domainObjectName="AchAchievement" enableDeleteByExample="false"/>-->
 <!--        <table tableName="ach_achievement_category" domainObjectName="AchAchievementCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fud_fund_record" domainObjectName="FudFundRecord" enableDeleteByExample="false"/>-->
-        <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>
+<!--        <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>-->
-<!--        <table tableName="kts_kt_group_member" domainObjectName="KtsKtGroupMember" 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="prj_proj_document" domainObjectName="PrjProjDocument" enableDeleteByExample="false"/>-->

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

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<Long> values) {
+            addCriterion("proj_org_id in", values, "projOrgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjOrgIdNotIn(List<Long> 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;

research-system/src/main/java/com/research/system/persist/dao/KtsGroupDao.java

@@ -20,6 +20,8 @@ public interface KtsGroupDao {
 
     List<GroupVO.MemberResult> queryMemberList(@Param("dto") GroupDto.MemberQuery dto);
 
+    List<GroupVO.MemberResult> queryMemberList1(@Param("dto") GroupDto.MemberQuery dto);
+
     List<GroupVO.Num> queryNum();
 
     List<GroupVO.Num1> jhzt();

research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

@@ -243,7 +243,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
 
     @Override
     public List<GroupVO.MemberResult> queryMemberList(GroupDto.MemberQuery query) {
-        List<GroupVO.MemberResult> memberResults = ktsGroupDao.queryMemberList(query);
+        List<GroupVO.MemberResult> 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;

research-system/src/main/resources/mapper/dao/KtsGroupDao.xml

@@ -125,6 +125,74 @@
         order by m.kt_group_id,m.id
     </select>
 
+    <select id="queryMemberList1" resultType="com.research.system.domain.vo.GroupVO$MemberResult">
+        select
+        m.id,
+        m.user_id as userId,
+        m.kt_group_id as ktGroupId,
+        m.parent_member_id as parentMemberId,
+        m.member_name as memberName,
+        m.member_phone as memberPhone,
+        m.member_email as memberEmail,
+        m.member_gender as memberGender,
+        m.member_birth as memberBirth,
+        m.reading_status as readingStatus,
+        m.type,
+        m.category,
+        m.qualification,
+        m.title,
+        m.sort,
+        m.intro,
+        m.audit_status as auditStatus,
+        m.member_status as memberStatus,
+        m.create_by as createBy,
+        m.create_time as createTime,
+        g.kt_group_name as ktGroupName,
+        d1.dict_label as qualificationName,
+        o.org_name as projOrgName,
+        o.id as orgId,
+        u.user_name as userName,
+        u.nick_name as nickName,
+        m.enroll_time as enrollmentTime,
+        m.graduation_time as graduationTime
+        from
+        prj_proj_org o
+        left join
+        kts_kt_group g on g.proj_org_id = o.id
+        left join kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0
+        left join sys_user u on u.user_id = m.user_id
+        left join sys_dict_data d1 on d1.dict_value = m.qualification and d1.dict_type = 'qualification'
+        left join sys_dict_data d2 on d2.dict_value = m.title and d2.dict_type = 'sys_title'
+        where
+        o.del_flag = 0
+        <if test="dto.projOrgId != null">
+            and g.proj_org_id = #{dto.projOrgId}
+        </if>
+        <if test="dto.ktGroupId != null">
+            and m.kt_group_id = #{dto.ktGroupId}
+        </if>
+        <if test="dto.memberName != null and dto.memberName != ''">
+            and m.member_name like concat('%',#{dto.memberName},'%')
+        </if>
+        <if test="dto.memberPhone != null and dto.memberPhone != ''">
+            and m.member_phone like concat('%',#{dto.memberPhone},'%')
+        </if>
+        <if test="dto.type != null">
+            and m.type like concat('%',#{dto.type},'%')
+        </if>
+        <if test="dto.auditStatus != null">
+            and m.audit_status = #{dto.auditStatus}
+        </if>
+        <if test="dto.memberStatus != null">
+            and m.member_status = #{dto.memberStatus}
+        </if>
+        <if test="dto.category != null">
+            and m.category = #{dto.category}
+        </if>
+        order by m.kt_group_id,m.id
+    </select>
+
+
     <select id="queryNum" resultType="com.research.system.domain.vo.GroupVO$Num">
         select o.id as orgId,
                o.org_name      as orgName,

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

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.research.system.domain.po.KtsKtGroupMember">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="proj_org_id" jdbcType="BIGINT" property="projOrgId" />
     <result column="kt_group_id" jdbcType="BIGINT" property="ktGroupId" />
     <result column="parent_member_id" jdbcType="VARCHAR" property="parentMemberId" />
     <result column="member_name" jdbcType="VARCHAR" property="memberName" />
@@ -88,10 +89,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, user_id, kt_group_id, parent_member_id, member_name, member_phone, member_email, 
+    id, user_id, proj_org_id, kt_group_id, parent_member_id, member_name, member_phone, 
-    member_gender, member_birth, type, category, qualification, title, sort, intro, audit_status, 
+    member_email, member_gender, member_birth, type, category, qualification, title, 
-    member_status, del_flag, create_by, create_time, update_by, update_time, remark, 
+    sort, intro, audit_status, member_status, del_flag, create_by, create_time, update_by, 
-    enroll_time, graduation_time, reading_status
+    update_time, remark, enroll_time, graduation_time, reading_status
   </sql>
   <select id="selectByExample" parameterType="com.research.system.domain.po.KtsKtGroupMemberExample" resultMap="BaseResultMap">
     select
@@ -118,24 +119,26 @@
     where id = #{id,jdbcType=BIGINT}
   </delete>
   <insert id="insert" parameterType="com.research.system.domain.po.KtsKtGroupMember">
-    insert into kts_kt_group_member (id, user_id, kt_group_id, 
+    insert into kts_kt_group_member (id, user_id, proj_org_id, 
-      parent_member_id, member_name, member_phone, 
+      kt_group_id, parent_member_id, member_name, 
-      member_email, member_gender, member_birth, 
+      member_phone, member_email, member_gender, 
-      type, category, qualification, 
+      member_birth, type, category, 
-      title, sort, intro, 
+      qualification, title, sort, 
-      audit_status, member_status, del_flag, 
+      intro, audit_status, member_status, 
-      create_by, create_time, update_by, 
+      del_flag, create_by, create_time, 
-      update_time, remark, enroll_time, 
+      update_by, update_time, remark, 
-      graduation_time, reading_status)
+      enroll_time, graduation_time, reading_status
-    values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{ktGroupId,jdbcType=BIGINT}, 
+      )
-      #{parentMemberId,jdbcType=VARCHAR}, #{memberName,jdbcType=VARCHAR}, #{memberPhone,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, 
-      #{memberEmail,jdbcType=VARCHAR}, #{memberGender,jdbcType=TINYINT}, #{memberBirth,jdbcType=DATE}, 
+      #{ktGroupId,jdbcType=BIGINT}, #{parentMemberId,jdbcType=VARCHAR}, #{memberName,jdbcType=VARCHAR}, 
-      #{type,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT}, #{qualification,jdbcType=INTEGER}, 
+      #{memberPhone,jdbcType=VARCHAR}, #{memberEmail,jdbcType=VARCHAR}, #{memberGender,jdbcType=TINYINT}, 
-      #{title,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{intro,jdbcType=VARCHAR}, 
+      #{memberBirth,jdbcType=DATE}, #{type,jdbcType=VARCHAR}, #{category,jdbcType=TINYINT}, 
-      #{auditStatus,jdbcType=TINYINT}, #{memberStatus,jdbcType=TINYINT}, #{delFlag,jdbcType=TINYINT}, 
+      #{qualification,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
-      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{intro,jdbcType=VARCHAR}, #{auditStatus,jdbcType=TINYINT}, #{memberStatus,jdbcType=TINYINT}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{enrollTime,jdbcType=TIMESTAMP}, 
+      #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{graduationTime,jdbcType=TIMESTAMP}, #{readingStatus,jdbcType=TINYINT})
+      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, 
+      #{enrollTime,jdbcType=TIMESTAMP}, #{graduationTime,jdbcType=TIMESTAMP}, #{readingStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.KtsKtGroupMember">
     insert into kts_kt_group_member
@@ -146,6 +149,9 @@
       <if test="userId != null">
         user_id,
       </if>
+      <if test="projOrgId != null">
+        proj_org_id,
+      </if>
       <if test="ktGroupId != null">
         kt_group_id,
       </if>
@@ -226,6 +232,9 @@
       <if test="userId != null">
         #{userId,jdbcType=BIGINT},
       </if>
+      <if test="projOrgId != null">
+        #{projOrgId,jdbcType=BIGINT},
+      </if>
       <if test="ktGroupId != null">
         #{ktGroupId,jdbcType=BIGINT},
       </if>
@@ -315,6 +324,9 @@
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=BIGINT},
       </if>
+      <if test="record.projOrgId != null">
+        proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
+      </if>
       <if test="record.ktGroupId != null">
         kt_group_id = #{record.ktGroupId,jdbcType=BIGINT},
       </if>
@@ -396,6 +408,7 @@
     update kts_kt_group_member
     set id = #{record.id,jdbcType=BIGINT},
       user_id = #{record.userId,jdbcType=BIGINT},
+      proj_org_id = #{record.projOrgId,jdbcType=BIGINT},
       kt_group_id = #{record.ktGroupId,jdbcType=BIGINT},
       parent_member_id = #{record.parentMemberId,jdbcType=VARCHAR},
       member_name = #{record.memberName,jdbcType=VARCHAR},
@@ -430,6 +443,9 @@
       <if test="userId != null">
         user_id = #{userId,jdbcType=BIGINT},
       </if>
+      <if test="projOrgId != null">
+        proj_org_id = #{projOrgId,jdbcType=BIGINT},
+      </if>
       <if test="ktGroupId != null">
         kt_group_id = #{ktGroupId,jdbcType=BIGINT},
       </if>
@@ -508,6 +524,7 @@
   <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.KtsKtGroupMember">
     update kts_kt_group_member
     set user_id = #{userId,jdbcType=BIGINT},
+      proj_org_id = #{projOrgId,jdbcType=BIGINT},
       kt_group_id = #{ktGroupId,jdbcType=BIGINT},
       parent_member_id = #{parentMemberId,jdbcType=VARCHAR},
       member_name = #{memberName,jdbcType=VARCHAR},