[task-3240] 人员档案功能重构 / 接口调整

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ChinesePaperDTO.java

@@ -1,6 +1,17 @@
 package com.lc.ibps.components.employee.dto;
 
 import com.lc.ibps.components.employee.persistence.entity.ZwlwPo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ChinesePaperDTO extends ZwlwPo {
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
+
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ContinuingEducationDTO.java

@@ -1,6 +1,17 @@
 package com.lc.ibps.components.employee.dto;
 
 import com.lc.ibps.components.employee.persistence.entity.JxjyxmxshdPo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ContinuingEducationDTO extends JxjyxmxshdPo {
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
+
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/SCIPaperDTO.java

@@ -6,7 +6,16 @@ import io.swagger.annotations.ApiModelProperty;
 public class SCIPaperDTO extends SCIwztjbPo {
     @ApiModelProperty(value = "个人排名")
     private String childGeRenPaiMing;
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
 
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
     public String getChildGeRenPaiMing() {
         return childGeRenPaiMing;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ScienceActivitiesDTO.java

@@ -9,15 +9,14 @@ import java.util.Date;
 
 public class ScienceActivitiesDTO extends ScienceActivitiesPo {
 
-    @ApiModelProperty(value = "参与时间")
-    @JsonFormat(pattern = StringPool.DATE_FORMAT_DATETIME, timezone = "GMT+8")
-    private Date joinedTime;
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
 
-    public Date getJoinedTime() {
-        return joinedTime;
+    public String getChildBeiZhu() {
+        return childBeiZhu;
     }
 
-    public void setJoinedTime(Date joinedTime) {
-        this.joinedTime = joinedTime;
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
     }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ScienceBookDTO.java

@@ -6,7 +6,16 @@ import io.swagger.annotations.ApiModelProperty;
 public class ScienceBookDTO extends KyzzPo {
     @ApiModelProperty(value = "主编编委")
     private String childZhuBianBianWei;
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
 
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
     public String getChildZhuBianBianWei() {
         return childZhuBianBianWei;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/SciencePatentDTO.java

@@ -7,6 +7,17 @@ public class SciencePatentDTO extends KyzlPo {
     @ApiModelProperty(value = "个人排名")
     private String childGeRenPaiMing;
 
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
+
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
+
     public String getChildGeRenPaiMing() {
         return childGeRenPaiMing;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ScienceProjectDTO.java

@@ -6,7 +6,16 @@ import io.swagger.annotations.ApiModelProperty;
 public class ScienceProjectDTO extends KyxmPo {
     @ApiModelProperty(value = "主持参与")
     private String childZhuChiCanYu;
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
 
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
     public String getChildZhuChiCanYu() {
         return childZhuChiCanYu;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/dto/ScientificAwardDTO.java

@@ -6,7 +6,16 @@ import io.swagger.annotations.ApiModelProperty;
 public class ScientificAwardDTO extends KjhjcgPo {
     @ApiModelProperty(value = "个人排名")
     private String childGeRenPaiMing;
+    @ApiModelProperty(value = "备注")
+    private String childBeiZhu;
 
+    public String getChildBeiZhu() {
+        return childBeiZhu;
+    }
+
+    public void setChildBeiZhu(String childBeiZhu) {
+        this.childBeiZhu = childBeiZhu;
+    }
     public String getChildGeRenPaiMing() {
         return childGeRenPaiMing;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/KjhjcgTbl.java

@@ -62,6 +62,8 @@ public class KjhjcgTbl extends AbstractPo<String>{
 	protected String  kuaiZhao; 		/*快照*/
 	@ApiModelProperty(value = "地点")
 	protected String  diDian; 		/*地点*/
+	@ApiModelProperty(value = "获奖编号")
+	protected String huoJiangBianHao;
 
 	public void setId(String id) 
 	{
@@ -339,5 +341,12 @@ public class KjhjcgTbl extends AbstractPo<String>{
 	{
 		return this.diDian;
 	}
-	
+
+	public String getHuoJiangBianHao() {
+		return huoJiangBianHao;
+	}
+
+	public void setHuoJiangBianHao(String huoJiangBianHao) {
+		this.huoJiangBianHao = huoJiangBianHao;
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/KyzlTbl.java

@@ -58,6 +58,8 @@ public class KyzlTbl extends AbstractPo<String>{
 	protected String  diDian; 		/*地点*/
 	@ApiModelProperty(value = "外键")
 	protected String  parentId; 		/*外键*/
+	@ApiModelProperty(value = "专利编号")
+	protected String  zhuanLiBianHao; 		/*专利编号*/
 
 	public void setId(String id) 
 	{
@@ -311,5 +313,12 @@ public class KyzlTbl extends AbstractPo<String>{
 	{
 		return this.parentId;
 	}
-	
+
+	public String getZhuanLiBianHao() {
+		return zhuanLiBianHao;
+	}
+
+	public void setZhuanLiBianHao(String zhuanLiBianHao) {
+		this.zhuanLiBianHao = zhuanLiBianHao;
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/KyzzTbl.java

@@ -60,7 +60,8 @@ public class KyzzTbl extends AbstractPo<String>{
 	protected String  shangChuanYuan; 		/*上传原文*/
 	@ApiModelProperty(value = "地点")
 	protected String  diDian; 		/*地点*/
-
+	@ApiModelProperty(value = "专著编号")
+	protected String  zhuanZhuoBianH; 		/*专著编号*/
 	public void setId(String id) 
 	{
 		this.id = id;
@@ -325,5 +326,12 @@ public class KyzzTbl extends AbstractPo<String>{
 	{
 		return this.diDian;
 	}
-	
+
+	public String getZhuanZhuoBianH() {
+		return zhuanZhuoBianH;
+	}
+
+	public void setZhuanZhuoBianH(String zhuanZhuoBianH) {
+		this.zhuanZhuoBianH = zhuanZhuoBianH;
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/RyjbqkInfoTbl.java

@@ -169,6 +169,8 @@ public class RyjbqkInfoTbl extends AbstractPo<String>{
 	protected String  kuaiZhao; 		/*快照*/
 	@ApiModelProperty(value = "人员类型")
 	protected String  renYuanLeiXing; 		/*人员类型*/
+	@ApiModelProperty(value = "是否过审")
+	protected String  shiFouGuoShen; 		/*是否过审*/
 
 	public void setId(String id) 
 	{
@@ -1046,5 +1048,12 @@ public class RyjbqkInfoTbl extends AbstractPo<String>{
 	{
 		return this.renYuanLeiXing;
 	}
-	
+
+	public String getShiFouGuoShen() {
+		return shiFouGuoShen;
+	}
+
+	public void setShiFouGuoShen(String shiFouGuoShen) {
+		this.shiFouGuoShen = shiFouGuoShen;
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/SCIwztjbTbl.java

@@ -68,6 +68,8 @@ public class SCIwztjbTbl extends AbstractPo<String>{
 	protected String  kuaiZhao; 		/*快照*/
 	@ApiModelProperty(value = "地点")
 	protected String  diDian; 		/*地点*/
+	@ApiModelProperty(value = "文字编号")
+	protected String wenZhangBianHao;
 
 	public void setId(String id) 
 	{
@@ -381,5 +383,12 @@ public class SCIwztjbTbl extends AbstractPo<String>{
 	{
 		return this.diDian;
 	}
-	
+
+	public String getWenZhangBianHao() {
+		return wenZhangBianHao;
+	}
+
+	public void setWenZhangBianHao(String wenZhangBianHao) {
+		this.wenZhangBianHao = wenZhangBianHao;
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/ZwlwTbl.java

@@ -68,6 +68,9 @@ public class ZwlwTbl extends AbstractPo<String>{
 	protected String  kuaiZhao; 		/*快照*/
 	@ApiModelProperty(value = "地点")
 	protected String  diDian; 		/*地点*/
+	@ApiModelProperty(value = "文字编号")
+	protected String wenZhangBianHao;
+
 
 	public void setId(String id) 
 	{
@@ -381,5 +384,12 @@ public class ZwlwTbl extends AbstractPo<String>{
 	{
 		return this.diDian;
 	}
-	
+
+	public String getWenZhangBianHao() {
+		return wenZhangBianHao;
+	}
+
+	public void setWenZhangBianHao(String wenZhangBianHao) {
+		this.wenZhangBianHao = wenZhangBianHao;
+	}
 }

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Jxjyxmxshd.map.xml

@@ -32,7 +32,7 @@
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="ContinuingEducationDTO" type="com.lc.ibps.components.employee.dto.ContinuingEducationDTO" extends="JxjyxmxshdPo">
-
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	<sql id="columns">
 		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,XIANG_MU_BIAN_HAO,HUI_YI_MING_CHENG,FU_ZE_REN_,XUE_FEN_JI_BIE_,JU_BAN_SHI_JIAN_,JU_BAN_DI_DIAN_,HE_ZUO_DAN_WEI_,HUI_YI_TONG_ZHI_S,HUO_D_X_C_Z_P_S_C,LEI_XING_,XUE_FEN_,QUAN_BU_ZUO_ZHE_,KUAI_ZHAO_,DI_DIAN_
@@ -84,7 +84,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="ContinuingEducationDTO">
-		SELECT p.* FROM T_JXJYXMXSHD p
+		SELECT p.*,c.bei_zhu_ childBeiZhu FROM T_JXJYXMXSHD p
 			JOIN T_Jxjyxmxshdglb c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Kjhjcg.map.xml

@@ -30,19 +30,21 @@
 		<result property="huoJiangShiJia" column="HUO_JIANG_SHI_JIA" jdbcType="VARCHAR"/>
 		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="huoJiangBianHao" column="huo_jiang_bian_ha" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="ScientificAwardDTO" type="com.lc.ibps.components.employee.dto.ScientificAwardDTO" extends="KjhjcgPo">
-		<result property="childGeRenPaiMing" column="geRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childGeRenPaiMing" column="childGeRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,HUO_JIANG_ZHE_,DAN_WEI_,JIANG_LI_LEI_XING,WAN_CHENG_REN_,PAI_MING_,SHANG_C_H_J_Z_S_,LEI_XING_,JIANG_LI_XIANG_MU,GE_REN_PAI_MING_,QUAN_BU_HUO_JIANG,DAN_WEI_PAI_MING_,HUO_JIANG_SHI_JIA,KUAI_ZHAO_,DI_DIAN_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,HUO_JIANG_ZHE_,DAN_WEI_,JIANG_LI_LEI_XING,WAN_CHENG_REN_,PAI_MING_,SHANG_C_H_J_Z_S_,LEI_XING_,JIANG_LI_XIANG_MU,GE_REN_PAI_MING_,QUAN_BU_HUO_JIANG,DAN_WEI_PAI_MING_,HUO_JIANG_SHI_JIA,KUAI_ZHAO_,DI_DIAN_,huo_jiang_bian_ha
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.KjhjcgPo">
 		INSERT INTO T_KJHJCG
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{huoJiangZhe,jdbcType=VARCHAR}, #{danWei,jdbcType=VARCHAR}, #{jiangLiLeiXing,jdbcType=VARCHAR}, #{wanChengRen,jdbcType=VARCHAR}, #{paiMing,jdbcType=VARCHAR}, #{shangCHJZS,jdbcType=VARCHAR}, #{leiXing,jdbcType=VARCHAR}, #{jiangLiXiangMu,jdbcType=BLOB}, #{geRenPaiMing,jdbcType=BLOB}, #{quanBuHuoJiang,jdbcType=VARCHAR}, #{danWeiPaiMing,jdbcType=BLOB}, #{huoJiangShiJia,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{huoJiangZhe,jdbcType=VARCHAR}, #{danWei,jdbcType=VARCHAR}, #{jiangLiLeiXing,jdbcType=VARCHAR}, #{wanChengRen,jdbcType=VARCHAR}, #{paiMing,jdbcType=VARCHAR}, #{shangCHJZS,jdbcType=VARCHAR}, #{leiXing,jdbcType=VARCHAR}, #{jiangLiXiangMu,jdbcType=BLOB}, #{geRenPaiMing,jdbcType=BLOB}, #{quanBuHuoJiang,jdbcType=VARCHAR}, #{danWeiPaiMing,jdbcType=BLOB}, #{huoJiangShiJia,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}),#{huo_jiang_bian_ha,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="KjhjcgPo">
@@ -84,7 +86,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="ScientificAwardDTO">
-		SELECT p.*,c.GE_REN_PAI_MING_ geRenPaiMing FROM T_KJHJCG p
+		SELECT p.*,c.GE_REN_PAI_MING_ childGeRenPaiMing,c.bei_zhu_ childBeiZhu FROM T_KJHJCG p
 			JOIN T_KJHJCGGLB c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>
@@ -113,7 +115,8 @@
 		DAN_WEI_PAI_MING_=#{danWeiPaiMing,jdbcType=BLOB},
 		HUO_JIANG_SHI_JIA=#{huoJiangShiJia,jdbcType=VARCHAR},
 		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR}
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		huo_jiang_bian_ha=#{huoJiangBianHao,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Kyxm.map.xml

@@ -35,7 +35,8 @@
 		<result property="keYanBiaoId" column="KE_YAN_BIAO_ID_" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="ScienceProjectDTO" type="com.lc.ibps.components.employee.dto.ScienceProjectDTO" extends="KyxmPo">
-		<result property="childZhuChiCanYu" column="zhuChiCanYu" jdbcType="VARCHAR"/>
+		<result property="childZhuChiCanYu" column="childZhuChiCanYu" jdbcType="VARCHAR"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 
 	
@@ -89,7 +90,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="ScienceProjectDTO">
-		SELECT p.*,c.zhu_chi_can_yu_ zhuChiCanYu FROM T_KYXM p
+		SELECT p.*,c.zhu_chi_can_yu_ childZhuChiCanYu,c.bei_zhu_ childBeiZhu FROM T_KYXM p
 			JOIN t_kyxmglb c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Kyzl.map.xml

@@ -28,19 +28,21 @@
 		<result property="fuJian" column="FU_JIAN_" jdbcType="VARCHAR"/>
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
 		<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR"/>
+		<result property="zhuanLiBianHao" column="ZHUAN_LI_BIAN_HAO" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="SciencePatentDTO" type="com.lc.ibps.components.employee.dto.SciencePatentDTO" extends="KyzlPo">
-		<result property="childGeRenPaiMing" column="geRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childGeRenPaiMing" column="childGeRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,XING_MING_,LEI_BIE_,LEI_XING_,ZHUAN_LI_MING_CHE,QUAN_BU_SHEN_QING,ZHUAN_LI_QUAN_REN,SHEN_QING_SHI_JIA,SHOU_QUAN_SHI_JIA,ZUO_ZHE_PAI_MING_,BEI_ZHU_,FU_JIAN_,DI_DIAN_,PARENT_ID_
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,XING_MING_,LEI_BIE_,LEI_XING_,ZHUAN_LI_MING_CHE,QUAN_BU_SHEN_QING,ZHUAN_LI_QUAN_REN,SHEN_QING_SHI_JIA,SHOU_QUAN_SHI_JIA,ZUO_ZHE_PAI_MING_,BEI_ZHU_,FU_JIAN_,DI_DIAN_,PARENT_ID_,ZHUAN_LI_BIAN_HAO
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.KyzlPo">
 		INSERT INTO T_KYZL
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{leiBie,jdbcType=VARCHAR}, #{leiXing,jdbcType=VARCHAR}, #{zhuanLiMingChe,jdbcType=VARCHAR}, #{quanBuShenQing,jdbcType=VARCHAR}, #{zhuanLiQuanRen,jdbcType=VARCHAR}, #{shenQingShiJia,jdbcType=VARCHAR}, #{shouQuanShiJia,jdbcType=VARCHAR}, #{zuoZhePaiMing,jdbcType=VARCHAR}, #{beiZhu,jdbcType=BLOB}, #{fuJian,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{leiBie,jdbcType=VARCHAR}, #{leiXing,jdbcType=VARCHAR}, #{zhuanLiMingChe,jdbcType=VARCHAR}, #{quanBuShenQing,jdbcType=VARCHAR}, #{zhuanLiQuanRen,jdbcType=VARCHAR}, #{shenQingShiJia,jdbcType=VARCHAR}, #{shouQuanShiJia,jdbcType=VARCHAR}, #{zuoZhePaiMing,jdbcType=VARCHAR}, #{beiZhu,jdbcType=BLOB}, #{fuJian,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}), #{zhuanLiBianHao,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="KyzlPo">
@@ -82,7 +84,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="SciencePatentDTO">
-		SELECT p.*,c.GE_REN_PAI_MING_ geRenPaiMing FROM T_KYZL p
+		SELECT p.*,c.GE_REN_PAI_MING_ childGeRenPaiMing,c.bei_zhu_ childBeiZhu FROM T_KYZL p
 			JOIN T_KYZLGLB c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>
@@ -109,7 +111,8 @@
 		BEI_ZHU_=#{beiZhu,jdbcType=BLOB},
 		FU_JIAN_=#{fuJian,jdbcType=VARCHAR},
 		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
-		PARENT_ID_=#{parentId,jdbcType=VARCHAR}
+		PARENT_ID_=#{parentId,jdbcType=VARCHAR},
+		ZHUAN_LI_BIAN_HAO=#{zhuanLiBianHao,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Kyzz.map.xml

@@ -29,19 +29,21 @@
 		<result property="shiYanShiCanY" column="SHI_YAN_SHI_CAN_Y" jdbcType="VARCHAR"/>
 		<result property="shangChuanYuan" column="SHANG_CHUAN_YUAN_" jdbcType="VARCHAR"/>
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="zhuanZhuoBianH" column="ZHUAN_ZHUO_BIAN_H" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="ScienceBookDTO" type="com.lc.ibps.components.employee.dto.ScienceBookDTO" extends="KyzzPo">
-		<result property="childZhuBianBianWei" column="zhuBianBianWei" jdbcType="VARCHAR"/>
+		<result property="childZhuBianBianWei" column="childZhuBianBianWei" jdbcType="VARCHAR"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,XING_MING_,ZHUAN_ZHUO_MING_C,QUAN_BU_ZUO_ZHE_,ZHU_BIAN_BIAN_WEI,CHU_BAN_SHE_,CHU_BAN_SHI_JIAN_,BIAN_ZHUAN_ZI_SHU,LIAN_JIE_,BEI_ZHU_,LEI_XING_,SHI_YAN_SHI_CAN_Y,SHANG_CHUAN_YUAN_,DI_DIAN_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,XING_MING_,ZHUAN_ZHUO_MING_C,QUAN_BU_ZUO_ZHE_,ZHU_BIAN_BIAN_WEI,CHU_BAN_SHE_,CHU_BAN_SHI_JIAN_,BIAN_ZHUAN_ZI_SHU,LIAN_JIE_,BEI_ZHU_,LEI_XING_,SHI_YAN_SHI_CAN_Y,SHANG_CHUAN_YUAN_,DI_DIAN_,ZHUAN_ZHUO_BIAN_H
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.KyzzPo">
 		INSERT INTO T_KYZZ
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{zhuanZhuoMingC,jdbcType=VARCHAR}, #{quanBuZuoZhe,jdbcType=BLOB}, #{zhuBianBianWei,jdbcType=VARCHAR}, #{chuBanShe,jdbcType=VARCHAR}, #{chuBanShiJian,jdbcType=VARCHAR}, #{bianZhuanZiShu,jdbcType=VARCHAR}, #{lianJie,jdbcType=VARCHAR}, #{beiZhu,jdbcType=BLOB}, #{leiXing,jdbcType=VARCHAR}, #{shiYanShiCanY,jdbcType=VARCHAR}, #{shangChuanYuan,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{zhuanZhuoMingC,jdbcType=VARCHAR}, #{quanBuZuoZhe,jdbcType=BLOB}, #{zhuBianBianWei,jdbcType=VARCHAR}, #{chuBanShe,jdbcType=VARCHAR}, #{chuBanShiJian,jdbcType=VARCHAR}, #{bianZhuanZiShu,jdbcType=VARCHAR}, #{lianJie,jdbcType=VARCHAR}, #{beiZhu,jdbcType=BLOB}, #{leiXing,jdbcType=VARCHAR}, #{shiYanShiCanY,jdbcType=VARCHAR}, #{shangChuanYuan,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}), #{zhuanZhuoBianH,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="KyzzPo">
@@ -83,7 +85,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="ScienceBookDTO">
-		SELECT p.*,c.ZHU_BIAN_BIAN_WEI zhuBianBianWei FROM T_KYZZ p
+		SELECT p.*,c.ZHU_BIAN_BIAN_WEI childZhuBianBianWei,c.bei_zhu_ childBeiZhu FROM T_KYZZ p
 			JOIN T_KYZZglb c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>
@@ -111,7 +113,8 @@
 		LEI_XING_=#{leiXing,jdbcType=VARCHAR},
 		SHI_YAN_SHI_CAN_Y=#{shiYanShiCanY,jdbcType=VARCHAR},
 		SHANG_CHUAN_YUAN_=#{shangChuanYuan,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR}
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		ZHUAN_ZHUO_BIAN_H=#{zhuanZhuoBianH,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/SCIwztjb.map.xml

@@ -33,19 +33,21 @@
 		<result property="qiTaZuoZhe" column="QI_TA_ZUO_ZHE_" jdbcType="VARCHAR"/>
 		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="wenZhangBianHao" column="wen_zhang_bian_ha" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="SCIPaperDTO" type="com.lc.ibps.components.employee.dto.SCIPaperDTO" extends="SCIwztjbPo">
-		<result property="childGeRenPaiMing" column="geRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childGeRenPaiMing" column="childGeRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,QUAN_BU_ZUO_ZHE_,LUN_WEN_TI_MU_,QI_KAN_MING_CHENG,QI_JUAN_HAO_,FA_BIAO_SHI_JIAN_,YING_XIANG_Y_Z_IF,ZUO_ZHE_PAI_MING_,LUN_WEN_LIAN_JIE_,SHANG_CHUAN_YUAN_,BEI_ZHU_,BEI_ZHU_A_,LEI_XING_,WOS_HAO_,DAN_WEI_PAI_MING_,QI_TA_ZUO_ZHE_,KUAI_ZHAO_,DI_DIAN_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,QUAN_BU_ZUO_ZHE_,LUN_WEN_TI_MU_,QI_KAN_MING_CHENG,QI_JUAN_HAO_,FA_BIAO_SHI_JIAN_,YING_XIANG_Y_Z_IF,ZUO_ZHE_PAI_MING_,LUN_WEN_LIAN_JIE_,SHANG_CHUAN_YUAN_,BEI_ZHU_,BEI_ZHU_A_,LEI_XING_,WOS_HAO_,DAN_WEI_PAI_MING_,QI_TA_ZUO_ZHE_,KUAI_ZHAO_,DI_DIAN_,wen_zhang_bian_ha
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.SCIwztjbPo">
 		INSERT INTO T_SCIWZTJB
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{quanBuZuoZhe,jdbcType=VARCHAR}, #{lunWenTiMu,jdbcType=VARCHAR}, #{qiKanMingCheng,jdbcType=VARCHAR}, #{qiJuanHao,jdbcType=VARCHAR}, #{faBiaoShiJian,jdbcType=VARCHAR}, #{yingXiangYZIf,jdbcType=VARCHAR}, #{zuoZhePaiMing,jdbcType=VARCHAR}, #{lunWenLianJie,jdbcType=VARCHAR}, #{shangChuanYuan,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{beiZhuA,jdbcType=BLOB}, #{leiXing,jdbcType=VARCHAR}, #{wosHao,jdbcType=BLOB}, #{danWeiPaiMing,jdbcType=VARCHAR}, #{qiTaZuoZhe,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{quanBuZuoZhe,jdbcType=VARCHAR}, #{lunWenTiMu,jdbcType=VARCHAR}, #{qiKanMingCheng,jdbcType=VARCHAR}, #{qiJuanHao,jdbcType=VARCHAR}, #{faBiaoShiJian,jdbcType=VARCHAR}, #{yingXiangYZIf,jdbcType=VARCHAR}, #{zuoZhePaiMing,jdbcType=VARCHAR}, #{lunWenLianJie,jdbcType=VARCHAR}, #{shangChuanYuan,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{beiZhuA,jdbcType=BLOB}, #{leiXing,jdbcType=VARCHAR}, #{wosHao,jdbcType=BLOB}, #{danWeiPaiMing,jdbcType=VARCHAR}, #{qiTaZuoZhe,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}), #{wenZhangBianHao,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="SCIwztjbPo">
@@ -87,7 +89,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="SCIPaperDTO">
-		SELECT p.*,c.GE_REN_PAI_MING_ geRenPaiMing FROM T_SCIWZTJB p
+		SELECT p.*,c.GE_REN_PAI_MING_ childGeRenPaiMing,c.bei_zhu_ childBeiZhu FROM T_SCIWZTJB p
 			JOIN T_SCIWZglb c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>
@@ -119,7 +121,8 @@
 		DAN_WEI_PAI_MING_=#{danWeiPaiMing,jdbcType=VARCHAR},
 		QI_TA_ZUO_ZHE_=#{qiTaZuoZhe,jdbcType=VARCHAR},
 		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR}
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		wen_zhang_bian_ha=#{zhuanZhuoBianH,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/ScienceActivities.map.xml

@@ -24,7 +24,7 @@
 		<result property="kePuBianHao" column="KE_PU_BIAN_HAO_" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="ScienceActivitiesDTO" type="com.lc.ibps.components.employee.dto.ScienceActivitiesDTO" extends="ScienceActivitiesPo">
-		<result property="joinedTime" column="joined_time" jdbcType="TIMESTAMP"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
@@ -78,7 +78,7 @@
 	</select>
 
 	<select id="findByEmployeeId" resultMap="ScienceActivitiesDTO">
-		SELECT p.*,c.create_time_ joined_time FROM t_kphd p
+		SELECT p.*,c.bei_zhu_ childBeiZhu  FROM t_kphd p
 		    JOIN t_kphdglb c
 		        ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Zwlw.map.xml

@@ -33,19 +33,21 @@
 		<result property="qiTaZuoZhe" column="QI_TA_ZUO_ZHE_" jdbcType="VARCHAR"/>
 		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
 		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="wenZhangBianHao" column="wen_zhang_bian_ha" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="ChinesePaperDTO" type="com.lc.ibps.components.employee.dto.ChinesePaperDTO" extends="ZwlwPo">
-		<result property="childGeRenPaiMing" column="geRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childGeRenPaiMing" column="childGeRenPaiMing" jdbcType="VARCHAR"/>
+		<result property="childBeiZhu" column="childBeiZhu" jdbcType="VARCHAR"/>
 	</resultMap>
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,QUAN_BU_ZUO_ZHE_,LUN_WEN_TI_MU_,QI_KAN_MING_CHENG,QI_JUAN_HAO_,FA_BIAO_SHI_JIAN_,QI_KAN_LEI_BIE_,ZUO_ZHE_PAI_MING_,LUN_WEN_LIAN_JIE_,SHANG_CHUAN_YUAN_,BEI_ZHU_,BEI_ZHU_A_,LEI_XING_,ISSN_HAO_,DAN_WEI_PAI_MING_,QI_TA_ZUO_ZHE_,KUAI_ZHAO_,DI_DIAN_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,XING_MING_,QUAN_BU_ZUO_ZHE_,LUN_WEN_TI_MU_,QI_KAN_MING_CHENG,QI_JUAN_HAO_,FA_BIAO_SHI_JIAN_,QI_KAN_LEI_BIE_,ZUO_ZHE_PAI_MING_,LUN_WEN_LIAN_JIE_,SHANG_CHUAN_YUAN_,BEI_ZHU_,BEI_ZHU_A_,LEI_XING_,ISSN_HAO_,DAN_WEI_PAI_MING_,QI_TA_ZUO_ZHE_,KUAI_ZHAO_,DI_DIAN_,wen_zhang_bian_ha
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.ZwlwPo">
 		INSERT INTO T_ZWLW
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{quanBuZuoZhe,jdbcType=VARCHAR}, #{lunWenTiMu,jdbcType=VARCHAR}, #{qiKanMingCheng,jdbcType=VARCHAR}, #{qiJuanHao,jdbcType=VARCHAR}, #{faBiaoShiJian,jdbcType=VARCHAR}, #{qiKanLeiBie,jdbcType=VARCHAR}, #{zuoZhePaiMing,jdbcType=VARCHAR}, #{lunWenLianJie,jdbcType=VARCHAR}, #{shangChuanYuan,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{beiZhuA,jdbcType=BLOB}, #{leiXing,jdbcType=VARCHAR}, #{issnHao,jdbcType=VARCHAR}, #{danWeiPaiMing,jdbcType=BLOB}, #{qiTaZuoZhe,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{xingMing,jdbcType=VARCHAR}, #{quanBuZuoZhe,jdbcType=VARCHAR}, #{lunWenTiMu,jdbcType=VARCHAR}, #{qiKanMingCheng,jdbcType=VARCHAR}, #{qiJuanHao,jdbcType=VARCHAR}, #{faBiaoShiJian,jdbcType=VARCHAR}, #{qiKanLeiBie,jdbcType=VARCHAR}, #{zuoZhePaiMing,jdbcType=VARCHAR}, #{lunWenLianJie,jdbcType=VARCHAR}, #{shangChuanYuan,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{beiZhuA,jdbcType=BLOB}, #{leiXing,jdbcType=VARCHAR}, #{issnHao,jdbcType=VARCHAR}, #{danWeiPaiMing,jdbcType=BLOB}, #{qiTaZuoZhe,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}), #{wenZhangBianHao,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="ZwlwPo">
@@ -87,7 +89,7 @@
 			ORDER BY ID_ DESC			
 	</select>
 	<select id="findByEmployeeId" resultMap="ZwlwPo">
-		SELECT p.*,c.GE_REN_PAI_MING_ geRenPaiMing FROM T_ZWLW p
+		SELECT p.*,c.GE_REN_PAI_MING_ childGeRenPaiMing,c.bei_zhu_ childBeiZhu  FROM T_ZWLW p
 			JOIN T_ZWLWglb c
 				ON c.tenant_id_=p.id_ AND c.parent_id_=#{employeeId}
 	</select>
@@ -119,7 +121,8 @@
 		DAN_WEI_PAI_MING_=#{danWeiPaiMing,jdbcType=BLOB},
 		QI_TA_ZUO_ZHE_=#{qiTaZuoZhe,jdbcType=VARCHAR},
 		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR}
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		wen_zhang_bian_ha=#{zhuanZhuoBianH,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>