修改合作单位、成员管理返回

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

@@ -66,16 +66,16 @@
 <!--        <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="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"/>-->
 <!--        <table tableName="prj_proj_info" domainObjectName="PrjProjInfo" enableDeleteByExample="false"/>-->
-<!--        <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" enableDeleteByExample="false"/>-->
+        <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" 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"/>
+<!--        <table tableName="shs_device_pic" domainObjectName="ShsDevicePic" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_lib_info" domainObjectName="ShsLibInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_syff_category" domainObjectName="ShsSyffCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="srv_modules" domainObjectName="SrvModules" enableDeleteByExample="false"/>-->

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

@@ -108,6 +108,25 @@ public class ClientPrjProjInfoDto {
         private Integer jscgzh;
 
         private Integer xsjl;
+
+        private Integer xslwNum;
+
+        private Integer zlsqysqNum;
+
+        private Integer rjzzqNum;
+
+        private Integer xszzNum;
+
+        private Integer bzzdNum;
+
+        private Integer ysktNum;
+
+        private Integer jscgzhNum;
+
+        private Integer xsjlNum;
+
+        private String contactName;
+        private String contactPhone;
     }
 
     @Data

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

@@ -59,6 +59,10 @@ public class GroupDto {
         private String intro;
 
         private Byte ktGroupStatus;
+        @ApiModelProperty("负责人手机号")
+        private String phone;
+        @ApiModelProperty("负责人")
+        private String name;
     }
 
     @Data

research-system/src/main/java/com/research/system/domain/po/KtsKtGroup.java

@@ -32,6 +32,10 @@ public class KtsKtGroup implements Serializable {
 
     private String remark;
 
+    private String name;
+
+    private String phone;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -146,6 +150,22 @@ public class KtsKtGroup implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -166,6 +186,8 @@ public class KtsKtGroup implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", remark=").append(remark);
+        sb.append(", name=").append(name);
+        sb.append(", phone=").append(phone);
         sb.append("]");
         return sb.toString();
     }

research-system/src/main/java/com/research/system/domain/po/KtsKtGroupExample.java

@@ -994,6 +994,146 @@ public class KtsKtGroupExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNull() {
+            addCriterion("phone is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNotNull() {
+            addCriterion("phone is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneEqualTo(String value) {
+            addCriterion("phone =", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotEqualTo(String value) {
+            addCriterion("phone <>", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThan(String value) {
+            addCriterion("phone >", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("phone >=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThan(String value) {
+            addCriterion("phone <", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThanOrEqualTo(String value) {
+            addCriterion("phone <=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLike(String value) {
+            addCriterion("phone like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotLike(String value) {
+            addCriterion("phone not like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIn(List<String> values) {
+            addCriterion("phone in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotIn(List<String> values) {
+            addCriterion("phone not in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneBetween(String value1, String value2) {
+            addCriterion("phone between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotBetween(String value1, String value2) {
+            addCriterion("phone not between", value1, value2, "phone");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

research-system/src/main/java/com/research/system/domain/po/PrjProjOrg.java

@@ -50,6 +50,10 @@ public class PrjProjOrg implements Serializable {
 
     private Integer xsjl;
 
+    private String contactName;
+
+    private String contactPhone;
+
     private String orgIntro;
 
     private static final long serialVersionUID = 1L;
@@ -238,6 +242,22 @@ public class PrjProjOrg implements Serializable {
         this.xsjl = xsjl;
     }
 
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName == null ? null : contactName.trim();
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone == null ? null : contactPhone.trim();
+    }
+
     public String getOrgIntro() {
         return orgIntro;
     }
@@ -275,6 +295,8 @@ public class PrjProjOrg implements Serializable {
         sb.append(", yskt=").append(yskt);
         sb.append(", jscgzh=").append(jscgzh);
         sb.append(", xsjl=").append(xsjl);
+        sb.append(", contactName=").append(contactName);
+        sb.append(", contactPhone=").append(contactPhone);
         sb.append(", orgIntro=").append(orgIntro);
         sb.append("]");
         return sb.toString();

research-system/src/main/java/com/research/system/domain/po/PrjProjOrgExample.java

@@ -1564,6 +1564,146 @@ public class PrjProjOrgExample {
             addCriterion("xsjl not between", value1, value2, "xsjl");
             return (Criteria) this;
         }
+
+        public Criteria andContactNameIsNull() {
+            addCriterion("contact_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameIsNotNull() {
+            addCriterion("contact_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameEqualTo(String value) {
+            addCriterion("contact_name =", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameNotEqualTo(String value) {
+            addCriterion("contact_name <>", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameGreaterThan(String value) {
+            addCriterion("contact_name >", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameGreaterThanOrEqualTo(String value) {
+            addCriterion("contact_name >=", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameLessThan(String value) {
+            addCriterion("contact_name <", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameLessThanOrEqualTo(String value) {
+            addCriterion("contact_name <=", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameLike(String value) {
+            addCriterion("contact_name like", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameNotLike(String value) {
+            addCriterion("contact_name not like", value, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameIn(List<String> values) {
+            addCriterion("contact_name in", values, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameNotIn(List<String> values) {
+            addCriterion("contact_name not in", values, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameBetween(String value1, String value2) {
+            addCriterion("contact_name between", value1, value2, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNameNotBetween(String value1, String value2) {
+            addCriterion("contact_name not between", value1, value2, "contactName");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneIsNull() {
+            addCriterion("contact_phone is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneIsNotNull() {
+            addCriterion("contact_phone is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneEqualTo(String value) {
+            addCriterion("contact_phone =", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneNotEqualTo(String value) {
+            addCriterion("contact_phone <>", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneGreaterThan(String value) {
+            addCriterion("contact_phone >", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("contact_phone >=", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneLessThan(String value) {
+            addCriterion("contact_phone <", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneLessThanOrEqualTo(String value) {
+            addCriterion("contact_phone <=", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneLike(String value) {
+            addCriterion("contact_phone like", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneNotLike(String value) {
+            addCriterion("contact_phone not like", value, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneIn(List<String> values) {
+            addCriterion("contact_phone in", values, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneNotIn(List<String> values) {
+            addCriterion("contact_phone not in", values, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneBetween(String value1, String value2) {
+            addCriterion("contact_phone between", value1, value2, "contactPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactPhoneNotBetween(String value1, String value2) {
+            addCriterion("contact_phone not between", value1, value2, "contactPhone");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -110,7 +110,23 @@ public class ClientPrjProjInfoVo {
 
         private Integer xsjl;
         private Integer total;
+        private Integer xslwNum;
 
+        private Integer zlsqysqNum;
+
+        private Integer rjzzqNum;
+
+        private Integer xszzNum;
+
+        private Integer bzzdNum;
+
+        private Integer ysktNum;
+
+        private Integer jscgzhNum;
+
+        private Integer xsjlNum;
+        private String contactName;
+        private String contactPhone;
     }
 
     @Data

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

@@ -41,6 +41,27 @@ public class GroupVO {
         private Date createTime;
         private String projOrgName;
         private String completionPercentage= "0";
+
+        @ApiModelProperty("负责人手机号")
+        private String phone;
+        @ApiModelProperty("负责人")
+        private String name;
+
+        private Integer xslwNum;
+
+        private Integer zlsqysqNum;
+
+        private Integer rjzzqNum;
+
+        private Integer xszzNum;
+
+        private Integer bzzdNum;
+
+        private Integer ysktNum;
+
+        private Integer jscgzhNum;
+
+        private Integer xsjlNum;
     }
 
     @Data
@@ -89,6 +110,8 @@ public class GroupVO {
         private String qualificationName;
 
         private String titleName;
+        @ApiModelProperty("合作单位名称")
+        private String projOrgName;
     }
 
 }

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

@@ -138,7 +138,8 @@ public class KtsGroupServiceImpl implements KtsGroupService {
         } else {
             ktsKtGroupMember.setUpdateBy(SecurityUtils.getUsername());
             ktsKtGroupMember.setUpdateTime(new Date());
-            ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
+            ktsKtGroupMember.setDelFlag((byte) 0);
+            ktsKtGroupMemberMapper.updateByPrimaryKey(ktsKtGroupMember);
             return ktsKtGroupMember;
         }
     }

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

@@ -24,7 +24,17 @@
             o.bzzd,
             o.yskt,
             o.jscgzh,
-            o.xsjl
+            o.xsjl,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 1 ) as xslwNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 11) as zlsqysqNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 21) as rjzzqNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 31) as xszzNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 41) as bzzdNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 51) as ysktNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 61) as jscgzhNum,
+        (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 71) as xsjlNum,
+        o.contact_name as contactName,
+        o.contact_phone as contactPhone
         from
             prj_proj_org o
         left join

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

@@ -15,7 +15,9 @@
         g.create_by as createBy,
         g.create_time as createTime,
         o.org_name as projOrgName,
-        pg.kt_group_name as parentKtName
+        pg.kt_group_name as parentKtName,
+        g.name as name,
+        g.phone as phone
         from kts_kt_group g
         left join
         prj_proj_org o on g.proj_org_id = o.id
@@ -32,6 +34,7 @@
         <if test="dto.ktGroupName != null and dto.ktGroupName != ''">
             and g.kt_group_name like concat('%',#{dto.ktGroupName},'%')
         </if>
+        group by g.id
         order by g.id desc
     </select>
 
@@ -58,13 +61,15 @@
         m.create_time as createTime,
         g.kt_group_name as ktGroupName,
         d1.dict_label as qualificationName,
-        d2.dict_label as titleName
+        d2.dict_label as titleName,
+        o.org_name as projOrgName
         from
         kts_kt_group_member m
         left join
         kts_kt_group g on m.kt_group_id = g.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 = 'title'
+        left join sys_dict_data d2 on d2.dict_value = m.title and d2.dict_type = 'sys_title'
+        left join prj_proj_org o on o.id = g.proj_org_id
         where 1=1
         and m.del_flag = 0
         <if test="dto.ktGroupId != null">

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

@@ -16,6 +16,8 @@
     <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="name" jdbcType="VARCHAR" property="name" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -77,7 +79,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, proj_id, proj_org_id, parent_kt_id, kt_group_name, sort, intro, kt_group_status, 
-    del_flag, create_by, create_time, update_by, update_time, remark
+    del_flag, create_by, create_time, update_by, update_time, remark, name, phone
   </sql>
   <select id="selectByExample" parameterType="com.research.system.domain.po.KtsKtGroupExample" resultMap="BaseResultMap">
     select
@@ -108,12 +110,14 @@
       parent_kt_id, kt_group_name, sort, 
       intro, kt_group_status, del_flag, 
       create_by, create_time, update_by, 
-      update_time, remark)
+      update_time, remark, name, 
+      phone)
     values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{projOrgId,jdbcType=BIGINT}, 
       #{parentKtId,jdbcType=BIGINT}, #{ktGroupName,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
       #{intro,jdbcType=VARCHAR}, #{ktGroupStatus,jdbcType=TINYINT}, #{delFlag,jdbcType=TINYINT}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR})
+      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.KtsKtGroup">
     insert into kts_kt_group
@@ -160,6 +164,12 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -204,6 +214,12 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.research.system.domain.po.KtsKtGroupExample" resultType="java.lang.Long">
@@ -257,6 +273,12 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -277,7 +299,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},
+      name = #{record.name,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -324,6 +348,12 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -341,7 +371,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

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

@@ -25,6 +25,8 @@
     <result column="yskt" jdbcType="INTEGER" property="yskt" />
     <result column="jscgzh" jdbcType="INTEGER" property="jscgzh" />
     <result column="xsjl" jdbcType="INTEGER" property="xsjl" />
+    <result column="contact_name" jdbcType="VARCHAR" property="contactName" />
+    <result column="contact_phone" jdbcType="VARCHAR" property="contactPhone" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.research.system.domain.po.PrjProjOrg">
     <result column="org_intro" jdbcType="LONGVARCHAR" property="orgIntro" />
@@ -90,7 +92,7 @@
   <sql id="Base_Column_List">
     id, proj_id, category, sort, org_name, org_leader, org_leader_phone, org_leader_email, 
     proj_resp_intro, del_flag, create_by, create_time, update_by, update_time, remark, 
-    xslw, zlsqysq, rjzzq, xszz, bzzd, yskt, jscgzh, xsjl
+    xslw, zlsqysq, rjzzq, xszz, bzzd, yskt, jscgzh, xsjl, contact_name, contact_phone
   </sql>
   <sql id="Blob_Column_List">
     org_intro
@@ -145,7 +147,8 @@
       update_by, update_time, remark, 
       xslw, zlsqysq, rjzzq, 
       xszz, bzzd, yskt, jscgzh, 
-      xsjl, org_intro)
+      xsjl, contact_name, contact_phone, 
+      org_intro)
     values (#{id,jdbcType=BIGINT}, #{projId,jdbcType=BIGINT}, #{category,jdbcType=TINYINT}, 
       #{sort,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR}, #{orgLeader,jdbcType=VARCHAR}, 
       #{orgLeaderPhone,jdbcType=VARCHAR}, #{orgLeaderEmail,jdbcType=VARCHAR}, #{projRespIntro,jdbcType=VARCHAR}, 
@@ -153,7 +156,8 @@
       #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, 
       #{xslw,jdbcType=INTEGER}, #{zlsqysq,jdbcType=INTEGER}, #{rjzzq,jdbcType=INTEGER}, 
       #{xszz,jdbcType=INTEGER}, #{bzzd,jdbcType=INTEGER}, #{yskt,jdbcType=INTEGER}, #{jscgzh,jdbcType=INTEGER}, 
-      #{xsjl,jdbcType=INTEGER}, #{orgIntro,jdbcType=LONGVARCHAR})
+      #{xsjl,jdbcType=INTEGER}, #{contactName,jdbcType=VARCHAR}, #{contactPhone,jdbcType=VARCHAR}, 
+      #{orgIntro,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.research.system.domain.po.PrjProjOrg">
     insert into prj_proj_org
@@ -227,6 +231,12 @@
       <if test="xsjl != null">
         xsjl,
       </if>
+      <if test="contactName != null">
+        contact_name,
+      </if>
+      <if test="contactPhone != null">
+        contact_phone,
+      </if>
       <if test="orgIntro != null">
         org_intro,
       </if>
@@ -301,6 +311,12 @@
       <if test="xsjl != null">
         #{xsjl,jdbcType=INTEGER},
       </if>
+      <if test="contactName != null">
+        #{contactName,jdbcType=VARCHAR},
+      </if>
+      <if test="contactPhone != null">
+        #{contactPhone,jdbcType=VARCHAR},
+      </if>
       <if test="orgIntro != null">
         #{orgIntro,jdbcType=LONGVARCHAR},
       </if>
@@ -384,6 +400,12 @@
       <if test="record.xsjl != null">
         xsjl = #{record.xsjl,jdbcType=INTEGER},
       </if>
+      <if test="record.contactName != null">
+        contact_name = #{record.contactName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactPhone != null">
+        contact_phone = #{record.contactPhone,jdbcType=VARCHAR},
+      </if>
       <if test="record.orgIntro != null">
         org_intro = #{record.orgIntro,jdbcType=LONGVARCHAR},
       </if>
@@ -417,6 +439,8 @@
       yskt = #{record.yskt,jdbcType=INTEGER},
       jscgzh = #{record.jscgzh,jdbcType=INTEGER},
       xsjl = #{record.xsjl,jdbcType=INTEGER},
+      contact_name = #{record.contactName,jdbcType=VARCHAR},
+      contact_phone = #{record.contactPhone,jdbcType=VARCHAR},
       org_intro = #{record.orgIntro,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -446,7 +470,9 @@
       bzzd = #{record.bzzd,jdbcType=INTEGER},
       yskt = #{record.yskt,jdbcType=INTEGER},
       jscgzh = #{record.jscgzh,jdbcType=INTEGER},
-      xsjl = #{record.xsjl,jdbcType=INTEGER}
+      xsjl = #{record.xsjl,jdbcType=INTEGER},
+      contact_name = #{record.contactName,jdbcType=VARCHAR},
+      contact_phone = #{record.contactPhone,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -520,6 +546,12 @@
       <if test="xsjl != null">
         xsjl = #{xsjl,jdbcType=INTEGER},
       </if>
+      <if test="contactName != null">
+        contact_name = #{contactName,jdbcType=VARCHAR},
+      </if>
+      <if test="contactPhone != null">
+        contact_phone = #{contactPhone,jdbcType=VARCHAR},
+      </if>
       <if test="orgIntro != null">
         org_intro = #{orgIntro,jdbcType=LONGVARCHAR},
       </if>
@@ -550,6 +582,8 @@
       yskt = #{yskt,jdbcType=INTEGER},
       jscgzh = #{jscgzh,jdbcType=INTEGER},
       xsjl = #{xsjl,jdbcType=INTEGER},
+      contact_name = #{contactName,jdbcType=VARCHAR},
+      contact_phone = #{contactPhone,jdbcType=VARCHAR},
       org_intro = #{orgIntro,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -576,7 +610,9 @@
       bzzd = #{bzzd,jdbcType=INTEGER},
       yskt = #{yskt,jdbcType=INTEGER},
       jscgzh = #{jscgzh,jdbcType=INTEGER},
-      xsjl = #{xsjl,jdbcType=INTEGER}
+      xsjl = #{xsjl,jdbcType=INTEGER},
+      contact_name = #{contactName,jdbcType=VARCHAR},
+      contact_phone = #{contactPhone,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>