jackwang 部署微服务接口

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Ppim
-      cd humanresource-app/humanresource-app-pim
-      mvn -Ppim docker:build
-      mvn -Ppim docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
+      mvn clean package -Phrapi
+      cd humanresource-provider/humanresource-provider-hrapi
+      mvn -Phrapi docker:build
+      mvn -Phrapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 10327
+EXPOSE 8080
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "10327:10327"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10327
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROrganizationServiceImpl.java

@@ -50,6 +50,12 @@ public class HROrganizationServiceImpl extends ServiceImpl<HROrganizationMapper,
     protected cn.ibizlab.humanresource.core.humanresource.service.IHREmployeeService hremployeeService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.humanresource.core.humanresource.service.IHRCertificateService hrcertificateService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.humanresource.core.humanresource.service.IHRContractService hrcontractService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.humanresource.core.base.service.IHROrgAddressService hrorgaddressService;
     @Autowired
     @Lazy

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRCertificate.java

@@ -49,7 +49,7 @@ public class HRCertificate extends EntityMP implements Serializable {
     @JsonProperty("hrcertificateid")
     private String hrcertificateid;
     /**
-     * 证书信息名称
+     * 证书名称
      */
     @TableField(value = "hrcertificatename")
     @JSONField(name = "hrcertificatename")
@@ -103,6 +103,79 @@ public class HRCertificate extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 证书编号
+     */
+    @TableField(value = "certificatecode")
+    @JSONField(name = "certificatecode")
+    @JsonProperty("certificatecode")
+    private String certificatecode;
+    /**
+     * 签发机构
+     */
+    @TableField(value = "authorganization")
+    @JSONField(name = "authorganization")
+    @JsonProperty("authorganization")
+    private String authorganization;
+    /**
+     * 签发日期
+     */
+    @TableField(value = "authdate")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "authdate" , format="yyyy-MM-dd")
+    @JsonProperty("authdate")
+    private Timestamp authdate;
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expiredate")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "expiredate" , format="yyyy-MM-dd")
+    @JsonProperty("expiredate")
+    private Timestamp expiredate;
+    /**
+     * 注册编号
+     */
+    @TableField(value = "registercode")
+    @JSONField(name = "registercode")
+    @JsonProperty("registercode")
+    private String registercode;
+    /**
+     * 初始注册时间
+     */
+    @TableField(value = "registertime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "registertime" , format="yyyy-MM-dd")
+    @JsonProperty("registertime")
+    private Timestamp registertime;
+    /**
+     * 备注
+     */
+    @TableField(value = "memo")
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
+    /**
+     * 注册单位ID
+     */
+    @TableField(value = "registerorganizationid")
+    @JSONField(name = "registerorganizationid")
+    @JsonProperty("registerorganizationid")
+    private String registerorganizationid;
+    /**
+     * 注册单位
+     */
+    @TableField(exist = false)
+    @JSONField(name = "registerorganizationname")
+    @JsonProperty("registerorganizationname")
+    private String registerorganizationname;
 
     /**
      * 员工
@@ -112,10 +185,18 @@ public class HRCertificate extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.humanresource.core.humanresource.domain.HREmployee hremployee;
 
+    /**
+     * 注册单位
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.humanresource.core.base.domain.HROrganization registerorganization;
+
 
 
     /**
-     * 设置 [证书信息名称]
+     * 设置 [证书名称]
      */
     public void setHrcertificatename(String hrcertificatename){
         this.hrcertificatename = hrcertificatename ;
@@ -130,6 +211,108 @@ public class HRCertificate extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [证书编号]
+     */
+    public void setCertificatecode(String certificatecode){
+        this.certificatecode = certificatecode ;
+        this.modify("certificatecode",certificatecode);
+    }
+
+    /**
+     * 设置 [签发机构]
+     */
+    public void setAuthorganization(String authorganization){
+        this.authorganization = authorganization ;
+        this.modify("authorganization",authorganization);
+    }
+
+    /**
+     * 设置 [签发日期]
+     */
+    public void setAuthdate(Timestamp authdate){
+        this.authdate = authdate ;
+        this.modify("authdate",authdate);
+    }
+
+    /**
+     * 格式化日期 [签发日期]
+     */
+    public String formatAuthdate(){
+        if (this.authdate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(authdate);
+    }
+    /**
+     * 设置 [失效日期]
+     */
+    public void setExpiredate(Timestamp expiredate){
+        this.expiredate = expiredate ;
+        this.modify("expiredate",expiredate);
+    }
+
+    /**
+     * 格式化日期 [失效日期]
+     */
+    public String formatExpiredate(){
+        if (this.expiredate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(expiredate);
+    }
+    /**
+     * 设置 [注册编号]
+     */
+    public void setRegistercode(String registercode){
+        this.registercode = registercode ;
+        this.modify("registercode",registercode);
+    }
+
+    /**
+     * 设置 [初始注册时间]
+     */
+    public void setRegistertime(Timestamp registertime){
+        this.registertime = registertime ;
+        this.modify("registertime",registertime);
+    }
+
+    /**
+     * 格式化日期 [初始注册时间]
+     */
+    public String formatRegistertime(){
+        if (this.registertime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(registertime);
+    }
+    /**
+     * 设置 [备注]
+     */
+    public void setMemo(String memo){
+        this.memo = memo ;
+        this.modify("memo",memo);
+    }
+
+    /**
+     * 设置 [注册单位ID]
+     */
+    public void setRegisterorganizationid(String registerorganizationid){
+        this.registerorganizationid = registerorganizationid ;
+        this.modify("registerorganizationid",registerorganizationid);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRContract.java

@@ -147,6 +147,42 @@ public class HRContract extends EntityMP implements Serializable {
     @JSONField(name = "contractstate")
     @JsonProperty("contractstate")
     private String contractstate;
+    /**
+     * 合同管理单位ID
+     */
+    @TableField(value = "mgrorganizationid")
+    @JSONField(name = "mgrorganizationid")
+    @JsonProperty("mgrorganizationid")
+    private String mgrorganizationid;
+    /**
+     * 合同管理单位
+     */
+    @TableField(exist = false)
+    @JSONField(name = "mgrorganizationname")
+    @JsonProperty("mgrorganizationname")
+    private String mgrorganizationname;
+    /**
+     * 合同签约单位ID
+     */
+    @TableField(value = "signorganizationid")
+    @JSONField(name = "signorganizationid")
+    @JsonProperty("signorganizationid")
+    private String signorganizationid;
+    /**
+     * 合同签约单位
+     */
+    @TableField(exist = false)
+    @JSONField(name = "signorganizationname")
+    @JsonProperty("signorganizationname")
+    private String signorganizationname;
+    /**
+     * 试用期
+     */
+    @TableField(value = "probationtime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "probationtime" , format="yyyy-MM-dd")
+    @JsonProperty("probationtime")
+    private Timestamp probationtime;
 
     /**
      * 员工
@@ -156,6 +192,22 @@ public class HRContract extends EntityMP implements Serializable {
     @TableField(exist = false)
     private cn.ibizlab.humanresource.core.humanresource.domain.HREmployee hremployee;
 
+    /**
+     * 合同管理单位
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.humanresource.core.base.domain.HROrganization mgrorganization;
+
+    /**
+     * 合同签约单位
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.humanresource.core.base.domain.HROrganization signorganization;
+
 
 
     /**
@@ -242,6 +294,40 @@ public class HRContract extends EntityMP implements Serializable {
         this.modify("contractstate",contractstate);
     }
 
+    /**
+     * 设置 [合同管理单位ID]
+     */
+    public void setMgrorganizationid(String mgrorganizationid){
+        this.mgrorganizationid = mgrorganizationid ;
+        this.modify("mgrorganizationid",mgrorganizationid);
+    }
+
+    /**
+     * 设置 [合同签约单位ID]
+     */
+    public void setSignorganizationid(String signorganizationid){
+        this.signorganizationid = signorganizationid ;
+        this.modify("signorganizationid",signorganizationid);
+    }
+
+    /**
+     * 设置 [试用期]
+     */
+    public void setProbationtime(Timestamp probationtime){
+        this.probationtime = probationtime ;
+        this.modify("probationtime",probationtime);
+    }
+
+    /**
+     * 格式化日期 [试用期]
+     */
+    public String formatProbationtime(){
+        if (this.probationtime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(probationtime);
+    }
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRPaper.java

@@ -74,7 +74,7 @@ public class HRPaper extends EntityMP implements Serializable {
     @JsonProperty("updateman")
     private String updateman;
     /**
-     * 论文信息名称
+     * 论文名称
      */
     @TableField(value = "hrpapername")
     @JSONField(name = "hrpapername")
@@ -103,6 +103,49 @@ public class HRPaper extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 发表时间
+     */
+    @TableField(value = "activetime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "activetime" , format="yyyy-MM-dd")
+    @JsonProperty("activetime")
+    private Timestamp activetime;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 出版社
+     */
+    @TableField(value = "publisher")
+    @JSONField(name = "publisher")
+    @JsonProperty("publisher")
+    private String publisher;
+    /**
+     * 刊物名称
+     */
+    @TableField(value = "publication")
+    @JSONField(name = "publication")
+    @JsonProperty("publication")
+    private String publication;
+    /**
+     * 刊物期数
+     */
+    @TableField(value = "publicationnum")
+    @JSONField(name = "publicationnum")
+    @JsonProperty("publicationnum")
+    private String publicationnum;
+    /**
+     * 个人在论文著作中排名
+     */
+    @TableField(value = "position")
+    @JSONField(name = "position")
+    @JsonProperty("position")
+    private BigInteger position;
 
     /**
      * 员工
@@ -115,7 +158,7 @@ public class HRPaper extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [论文信息名称]
+     * 设置 [论文名称]
      */
     public void setHrpapername(String hrpapername){
         this.hrpapername = hrpapername ;
@@ -130,6 +173,64 @@ public class HRPaper extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [发表时间]
+     */
+    public void setActivetime(Timestamp activetime){
+        this.activetime = activetime ;
+        this.modify("activetime",activetime);
+    }
+
+    /**
+     * 格式化日期 [发表时间]
+     */
+    public String formatActivetime(){
+        if (this.activetime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(activetime);
+    }
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [出版社]
+     */
+    public void setPublisher(String publisher){
+        this.publisher = publisher ;
+        this.modify("publisher",publisher);
+    }
+
+    /**
+     * 设置 [刊物名称]
+     */
+    public void setPublication(String publication){
+        this.publication = publication ;
+        this.modify("publication",publication);
+    }
+
+    /**
+     * 设置 [刊物期数]
+     */
+    public void setPublicationnum(String publicationnum){
+        this.publicationnum = publicationnum ;
+        this.modify("publicationnum",publicationnum);
+    }
+
+    /**
+     * 设置 [个人在论文著作中排名]
+     */
+    public void setPosition(BigInteger position){
+        this.position = position ;
+        this.modify("position",position);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRPatent.java

@@ -57,7 +57,7 @@ public class HRPatent extends EntityMP implements Serializable {
     @JsonProperty("createman")
     private String createman;
     /**
-     * 专利信息名称
+     * 专利名称
      */
     @TableField(value = "hrpatentname")
     @JSONField(name = "hrpatentname")
@@ -103,6 +103,35 @@ public class HRPatent extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 获取时间
+     */
+    @TableField(value = "activetime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "activetime" , format="yyyy-MM-dd")
+    @JsonProperty("activetime")
+    private Timestamp activetime;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 专利号
+     */
+    @TableField(value = "patentcode")
+    @JSONField(name = "patentcode")
+    @JsonProperty("patentcode")
+    private String patentcode;
+    /**
+     * 专利批准国别
+     */
+    @TableField(value = "patentcountry")
+    @JSONField(name = "patentcountry")
+    @JsonProperty("patentcountry")
+    private String patentcountry;
 
     /**
      * 员工
@@ -115,7 +144,7 @@ public class HRPatent extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [专利信息名称]
+     * 设置 [专利名称]
      */
     public void setHrpatentname(String hrpatentname){
         this.hrpatentname = hrpatentname ;
@@ -130,6 +159,48 @@ public class HRPatent extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [获取时间]
+     */
+    public void setActivetime(Timestamp activetime){
+        this.activetime = activetime ;
+        this.modify("activetime",activetime);
+    }
+
+    /**
+     * 格式化日期 [获取时间]
+     */
+    public String formatActivetime(){
+        if (this.activetime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(activetime);
+    }
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [专利号]
+     */
+    public void setPatentcode(String patentcode){
+        this.patentcode = patentcode ;
+        this.modify("patentcode",patentcode);
+    }
+
+    /**
+     * 设置 [专利批准国别]
+     */
+    public void setPatentcountry(String patentcountry){
+        this.patentcountry = patentcountry ;
+        this.modify("patentcountry",patentcountry);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRResearch.java

@@ -103,6 +103,21 @@ public class HRResearch extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 获取时间
+     */
+    @TableField(value = "activetime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "activetime" , format="yyyy-MM-dd")
+    @JsonProperty("activetime")
+    private Timestamp activetime;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
 
     /**
      * 员工
@@ -130,6 +145,32 @@ public class HRResearch extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [获取时间]
+     */
+    public void setActivetime(Timestamp activetime){
+        this.activetime = activetime ;
+        this.modify("activetime",activetime);
+    }
+
+    /**
+     * 格式化日期 [获取时间]
+     */
+    public String formatActivetime(){
+        if (this.activetime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(activetime);
+    }
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRReward.java

@@ -41,7 +41,7 @@ public class HRReward extends EntityMP implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 奖励惩罚名称
+     * 奖惩名称
      */
     @TableField(value = "hrrewardname")
     @JSONField(name = "hrrewardname")
@@ -103,6 +103,56 @@ public class HRReward extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 奖惩分类
+     */
+    @TableField(value = "rewardtype")
+    @JSONField(name = "rewardtype")
+    @JsonProperty("rewardtype")
+    private String rewardtype;
+    /**
+     * 奖惩级别
+     */
+    @TableField(value = "rewardlevel")
+    @JSONField(name = "rewardlevel")
+    @JsonProperty("rewardlevel")
+    private String rewardlevel;
+    /**
+     * 奖惩金额
+     */
+    @TableField(value = "rewardmoney")
+    @JSONField(name = "rewardmoney")
+    @JsonProperty("rewardmoney")
+    private Double rewardmoney;
+    /**
+     * 奖惩时间
+     */
+    @TableField(value = "rewardtime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "rewardtime" , format="yyyy-MM-dd")
+    @JsonProperty("rewardtime")
+    private Timestamp rewardtime;
+    /**
+     * 授予单位
+     */
+    @TableField(value = "authorganization")
+    @JSONField(name = "authorganization")
+    @JsonProperty("authorganization")
+    private String authorganization;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 奖惩事件
+     */
+    @TableField(value = "rewardevent")
+    @JSONField(name = "rewardevent")
+    @JsonProperty("rewardevent")
+    private String rewardevent;
 
     /**
      * 员工
@@ -115,7 +165,7 @@ public class HRReward extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [奖励惩罚名称]
+     * 设置 [奖惩名称]
      */
     public void setHrrewardname(String hrrewardname){
         this.hrrewardname = hrrewardname ;
@@ -130,6 +180,72 @@ public class HRReward extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [奖惩分类]
+     */
+    public void setRewardtype(String rewardtype){
+        this.rewardtype = rewardtype ;
+        this.modify("rewardtype",rewardtype);
+    }
+
+    /**
+     * 设置 [奖惩级别]
+     */
+    public void setRewardlevel(String rewardlevel){
+        this.rewardlevel = rewardlevel ;
+        this.modify("rewardlevel",rewardlevel);
+    }
+
+    /**
+     * 设置 [奖惩金额]
+     */
+    public void setRewardmoney(Double rewardmoney){
+        this.rewardmoney = rewardmoney ;
+        this.modify("rewardmoney",rewardmoney);
+    }
+
+    /**
+     * 设置 [奖惩时间]
+     */
+    public void setRewardtime(Timestamp rewardtime){
+        this.rewardtime = rewardtime ;
+        this.modify("rewardtime",rewardtime);
+    }
+
+    /**
+     * 格式化日期 [奖惩时间]
+     */
+    public String formatRewardtime(){
+        if (this.rewardtime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(rewardtime);
+    }
+    /**
+     * 设置 [授予单位]
+     */
+    public void setAuthorganization(String authorganization){
+        this.authorganization = authorganization ;
+        this.modify("authorganization",authorganization);
+    }
+
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [奖惩事件]
+     */
+    public void setRewardevent(String rewardevent){
+        this.rewardevent = rewardevent ;
+        this.modify("rewardevent",rewardevent);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRTechnicalTitle.java

@@ -83,7 +83,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
     @JsonProperty("createdate")
     private Timestamp createdate;
     /**
-     * 职称信息名称
+     * 职称名称
      */
     @TableField(value = "hrtechnicaltitlename")
     @JSONField(name = "hrtechnicaltitlename")
@@ -103,6 +103,70 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 职称获取时间
+     */
+    @TableField(value = "titletime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "titletime" , format="yyyy-MM-dd")
+    @JsonProperty("titletime")
+    private Timestamp titletime;
+    /**
+     * 职称等级
+     */
+    @TableField(value = "titlelevel")
+    @JSONField(name = "titlelevel")
+    @JsonProperty("titlelevel")
+    private String titlelevel;
+    /**
+     * 专业类别
+     */
+    @TableField(value = "majortype")
+    @JSONField(name = "majortype")
+    @JsonProperty("majortype")
+    private String majortype;
+    /**
+     * 专业名称
+     */
+    @TableField(value = "major")
+    @JSONField(name = "major")
+    @JsonProperty("major")
+    private String major;
+    /**
+     * 签发机构
+     */
+    @TableField(value = "authorganization")
+    @JSONField(name = "authorganization")
+    @JsonProperty("authorganization")
+    private String authorganization;
+    /**
+     * 评审机构
+     */
+    @TableField(value = "validorganization")
+    @JSONField(name = "validorganization")
+    @JsonProperty("validorganization")
+    private String validorganization;
+    /**
+     * 最高职称
+     */
+    @TableField(value = "hightitle")
+    @JSONField(name = "hightitle")
+    @JsonProperty("hightitle")
+    private Integer hightitle;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 证书编号
+     */
+    @TableField(value = "certificatecode")
+    @JSONField(name = "certificatecode")
+    @JsonProperty("certificatecode")
+    private String certificatecode;
 
     /**
      * 员工
@@ -115,7 +179,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [职称信息名称]
+     * 设置 [职称名称]
      */
     public void setHrtechnicaltitlename(String hrtechnicaltitlename){
         this.hrtechnicaltitlename = hrtechnicaltitlename ;
@@ -130,6 +194,88 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [职称获取时间]
+     */
+    public void setTitletime(Timestamp titletime){
+        this.titletime = titletime ;
+        this.modify("titletime",titletime);
+    }
+
+    /**
+     * 格式化日期 [职称获取时间]
+     */
+    public String formatTitletime(){
+        if (this.titletime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(titletime);
+    }
+    /**
+     * 设置 [职称等级]
+     */
+    public void setTitlelevel(String titlelevel){
+        this.titlelevel = titlelevel ;
+        this.modify("titlelevel",titlelevel);
+    }
+
+    /**
+     * 设置 [专业类别]
+     */
+    public void setMajortype(String majortype){
+        this.majortype = majortype ;
+        this.modify("majortype",majortype);
+    }
+
+    /**
+     * 设置 [专业名称]
+     */
+    public void setMajor(String major){
+        this.major = major ;
+        this.modify("major",major);
+    }
+
+    /**
+     * 设置 [签发机构]
+     */
+    public void setAuthorganization(String authorganization){
+        this.authorganization = authorganization ;
+        this.modify("authorganization",authorganization);
+    }
+
+    /**
+     * 设置 [评审机构]
+     */
+    public void setValidorganization(String validorganization){
+        this.validorganization = validorganization ;
+        this.modify("validorganization",validorganization);
+    }
+
+    /**
+     * 设置 [最高职称]
+     */
+    public void setHightitle(Integer hightitle){
+        this.hightitle = hightitle ;
+        this.modify("hightitle",hightitle);
+    }
+
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [证书编号]
+     */
+    public void setCertificatecode(String certificatecode){
+        this.certificatecode = certificatecode ;
+        this.modify("certificatecode",certificatecode);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRCertificateSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.humanresource.domain.HRCertificate;
 @Data
 public class HRCertificateSearchContext extends QueryWrapperContext<HRCertificate> {
 
-	private String n_hrcertificatename_like;//[证书信息名称]
+	private String n_hrcertificatename_like;//[证书名称]
 	public void setN_hrcertificatename_like(String n_hrcertificatename_like) {
         this.n_hrcertificatename_like = n_hrcertificatename_like;
         if(!ObjectUtils.isEmpty(this.n_hrcertificatename_like)){
@@ -55,6 +55,27 @@ public class HRCertificateSearchContext extends QueryWrapperContext<HRCertificat
             this.getSearchCond().like("hremployeename", n_hremployeename_like);
         }
     }
+	private String n_registerorganizationid_eq;//[注册单位ID]
+	public void setN_registerorganizationid_eq(String n_registerorganizationid_eq) {
+        this.n_registerorganizationid_eq = n_registerorganizationid_eq;
+        if(!ObjectUtils.isEmpty(this.n_registerorganizationid_eq)){
+            this.getSearchCond().eq("registerorganizationid", n_registerorganizationid_eq);
+        }
+    }
+	private String n_registerorganizationname_eq;//[注册单位]
+	public void setN_registerorganizationname_eq(String n_registerorganizationname_eq) {
+        this.n_registerorganizationname_eq = n_registerorganizationname_eq;
+        if(!ObjectUtils.isEmpty(this.n_registerorganizationname_eq)){
+            this.getSearchCond().eq("registerorganizationname", n_registerorganizationname_eq);
+        }
+    }
+	private String n_registerorganizationname_like;//[注册单位]
+	public void setN_registerorganizationname_like(String n_registerorganizationname_like) {
+        this.n_registerorganizationname_like = n_registerorganizationname_like;
+        if(!ObjectUtils.isEmpty(this.n_registerorganizationname_like)){
+            this.getSearchCond().like("registerorganizationname", n_registerorganizationname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRContractSearchContext.java

@@ -76,6 +76,48 @@ public class HRContractSearchContext extends QueryWrapperContext<HRContract> {
             this.getSearchCond().eq("contractstate", n_contractstate_eq);
         }
     }
+	private String n_mgrorganizationid_eq;//[合同管理单位ID]
+	public void setN_mgrorganizationid_eq(String n_mgrorganizationid_eq) {
+        this.n_mgrorganizationid_eq = n_mgrorganizationid_eq;
+        if(!ObjectUtils.isEmpty(this.n_mgrorganizationid_eq)){
+            this.getSearchCond().eq("mgrorganizationid", n_mgrorganizationid_eq);
+        }
+    }
+	private String n_mgrorganizationname_eq;//[合同管理单位]
+	public void setN_mgrorganizationname_eq(String n_mgrorganizationname_eq) {
+        this.n_mgrorganizationname_eq = n_mgrorganizationname_eq;
+        if(!ObjectUtils.isEmpty(this.n_mgrorganizationname_eq)){
+            this.getSearchCond().eq("mgrorganizationname", n_mgrorganizationname_eq);
+        }
+    }
+	private String n_mgrorganizationname_like;//[合同管理单位]
+	public void setN_mgrorganizationname_like(String n_mgrorganizationname_like) {
+        this.n_mgrorganizationname_like = n_mgrorganizationname_like;
+        if(!ObjectUtils.isEmpty(this.n_mgrorganizationname_like)){
+            this.getSearchCond().like("mgrorganizationname", n_mgrorganizationname_like);
+        }
+    }
+	private String n_signorganizationid_eq;//[合同签约单位ID]
+	public void setN_signorganizationid_eq(String n_signorganizationid_eq) {
+        this.n_signorganizationid_eq = n_signorganizationid_eq;
+        if(!ObjectUtils.isEmpty(this.n_signorganizationid_eq)){
+            this.getSearchCond().eq("signorganizationid", n_signorganizationid_eq);
+        }
+    }
+	private String n_signorganizationname_eq;//[合同签约单位]
+	public void setN_signorganizationname_eq(String n_signorganizationname_eq) {
+        this.n_signorganizationname_eq = n_signorganizationname_eq;
+        if(!ObjectUtils.isEmpty(this.n_signorganizationname_eq)){
+            this.getSearchCond().eq("signorganizationname", n_signorganizationname_eq);
+        }
+    }
+	private String n_signorganizationname_like;//[合同签约单位]
+	public void setN_signorganizationname_like(String n_signorganizationname_like) {
+        this.n_signorganizationname_like = n_signorganizationname_like;
+        if(!ObjectUtils.isEmpty(this.n_signorganizationname_like)){
+            this.getSearchCond().like("signorganizationname", n_signorganizationname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRPaperSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.humanresource.domain.HRPaper;
 @Data
 public class HRPaperSearchContext extends QueryWrapperContext<HRPaper> {
 
-	private String n_hrpapername_like;//[论文信息名称]
+	private String n_hrpapername_like;//[论文名称]
 	public void setN_hrpapername_like(String n_hrpapername_like) {
         this.n_hrpapername_like = n_hrpapername_like;
         if(!ObjectUtils.isEmpty(this.n_hrpapername_like)){

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRPatentSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.humanresource.domain.HRPatent;
 @Data
 public class HRPatentSearchContext extends QueryWrapperContext<HRPatent> {
 
-	private String n_hrpatentname_like;//[专利信息名称]
+	private String n_hrpatentname_like;//[专利名称]
 	public void setN_hrpatentname_like(String n_hrpatentname_like) {
         this.n_hrpatentname_like = n_hrpatentname_like;
         if(!ObjectUtils.isEmpty(this.n_hrpatentname_like)){

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRRewardSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.humanresource.domain.HRReward;
 @Data
 public class HRRewardSearchContext extends QueryWrapperContext<HRReward> {
 
-	private String n_hrrewardname_like;//[奖励惩罚名称]
+	private String n_hrrewardname_like;//[奖惩名称]
 	public void setN_hrrewardname_like(String n_hrrewardname_like) {
         this.n_hrrewardname_like = n_hrrewardname_like;
         if(!ObjectUtils.isEmpty(this.n_hrrewardname_like)){
@@ -55,6 +55,20 @@ public class HRRewardSearchContext extends QueryWrapperContext<HRReward> {
             this.getSearchCond().like("hremployeename", n_hremployeename_like);
         }
     }
+	private String n_rewardtype_eq;//[奖惩分类]
+	public void setN_rewardtype_eq(String n_rewardtype_eq) {
+        this.n_rewardtype_eq = n_rewardtype_eq;
+        if(!ObjectUtils.isEmpty(this.n_rewardtype_eq)){
+            this.getSearchCond().eq("rewardtype", n_rewardtype_eq);
+        }
+    }
+	private String n_rewardlevel_eq;//[奖惩级别]
+	public void setN_rewardlevel_eq(String n_rewardlevel_eq) {
+        this.n_rewardlevel_eq = n_rewardlevel_eq;
+        if(!ObjectUtils.isEmpty(this.n_rewardlevel_eq)){
+            this.getSearchCond().eq("rewardlevel", n_rewardlevel_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRTechnicalTitleSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.humanresource.domain.HRTechnicalTitle;
 @Data
 public class HRTechnicalTitleSearchContext extends QueryWrapperContext<HRTechnicalTitle> {
 
-	private String n_hrtechnicaltitlename_like;//[职称信息名称]
+	private String n_hrtechnicaltitlename_like;//[职称名称]
 	public void setN_hrtechnicaltitlename_like(String n_hrtechnicaltitlename_like) {
         this.n_hrtechnicaltitlename_like = n_hrtechnicaltitlename_like;
         if(!ObjectUtils.isEmpty(this.n_hrtechnicaltitlename_like)){
@@ -55,6 +55,13 @@ public class HRTechnicalTitleSearchContext extends QueryWrapperContext<HRTechnic
             this.getSearchCond().like("hremployeename", n_hremployeename_like);
         }
     }
+	private String n_titlelevel_eq;//[职称等级]
+	public void setN_titlelevel_eq(String n_titlelevel_eq) {
+        this.n_titlelevel_eq = n_titlelevel_eq;
+        if(!ObjectUtils.isEmpty(this.n_titlelevel_eq)){
+            this.getSearchCond().eq("titlelevel", n_titlelevel_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/mapper/HRCertificateMapper.java

@@ -64,4 +64,6 @@ public interface HRCertificateMapper extends BaseMapper<HRCertificate>{
 
     List<HRCertificate> selectByHremployeeid(@Param("employeeid") Serializable employeeid) ;
 
+    List<HRCertificate> selectByRegisterorganizationid(@Param("organizationid") Serializable organizationid) ;
+
 }

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/mapper/HRContractMapper.java

@@ -64,4 +64,8 @@ public interface HRContractMapper extends BaseMapper<HRContract>{
 
     List<HRContract> selectByHremployeeid(@Param("employeeid") Serializable employeeid) ;
 
+    List<HRContract> selectByMgrorganizationid(@Param("organizationid") Serializable organizationid) ;
+
+    List<HRContract> selectBySignorganizationid(@Param("organizationid") Serializable organizationid) ;
+
 }

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHRCertificateService.java

@@ -39,6 +39,8 @@ public interface IHRCertificateService extends IService<HRCertificate>{
     Page<HRCertificate> searchDefault(HRCertificateSearchContext context) ;
     List<HRCertificate> selectByHremployeeid(String employeeid) ;
     void removeByHremployeeid(String employeeid) ;
+    List<HRCertificate> selectByRegisterorganizationid(String organizationid) ;
+    void removeByRegisterorganizationid(String organizationid) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHRContractService.java

@@ -39,6 +39,10 @@ public interface IHRContractService extends IService<HRContract>{
     Page<HRContract> searchDefault(HRContractSearchContext context) ;
     List<HRContract> selectByHremployeeid(String employeeid) ;
     void removeByHremployeeid(String employeeid) ;
+    List<HRContract> selectByMgrorganizationid(String organizationid) ;
+    void removeByMgrorganizationid(String organizationid) ;
+    List<HRContract> selectBySignorganizationid(String organizationid) ;
+    void removeBySignorganizationid(String organizationid) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRCertificateServiceImpl.java

@@ -48,6 +48,9 @@ public class HRCertificateServiceImpl extends ServiceImpl<HRCertificateMapper, H
     @Autowired
     @Lazy
     protected cn.ibizlab.humanresource.core.humanresource.service.IHREmployeeService hremployeeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.humanresource.core.base.service.IHROrganizationService hrorganizationService;
 
     protected int batchSize = 500;
 
@@ -160,6 +163,16 @@ public class HRCertificateServiceImpl extends ServiceImpl<HRCertificateMapper, H
         this.remove(new QueryWrapper<HRCertificate>().eq("hremployeeid",employeeid));
     }
 
+	@Override
+    public List<HRCertificate> selectByRegisterorganizationid(String organizationid) {
+        return baseMapper.selectByRegisterorganizationid(organizationid);
+    }
+
+    @Override
+    public void removeByRegisterorganizationid(String organizationid) {
+        this.remove(new QueryWrapper<HRCertificate>().eq("registerorganizationid",organizationid));
+    }
+
 
     /**
      * 查询集合 DEFAULT
@@ -187,6 +200,16 @@ public class HRCertificateServiceImpl extends ServiceImpl<HRCertificateMapper, H
             }
             et.setHremployeename(hremployee.getEmployeename());
         }
+        //实体关系[DER1N_HRCERTIFICATE_HRORGANIZATION_REGISTERORGANIZATIONID_6BD9DC]
+        if(!ObjectUtils.isEmpty(et.getRegisterorganizationid())){
+            cn.ibizlab.humanresource.core.base.domain.HROrganization registerorganization=et.getRegisterorganization();
+            if(ObjectUtils.isEmpty(registerorganization)){
+                cn.ibizlab.humanresource.core.base.domain.HROrganization majorEntity=hrorganizationService.get(et.getRegisterorganizationid());
+                et.setRegisterorganization(majorEntity);
+                registerorganization=majorEntity;
+            }
+            et.setRegisterorganizationname(registerorganization.getOrganizationname());
+        }
     }
 
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRContractServiceImpl.java

@@ -48,6 +48,9 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr
     @Autowired
     @Lazy
     protected cn.ibizlab.humanresource.core.humanresource.service.IHREmployeeService hremployeeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.humanresource.core.base.service.IHROrganizationService hrorganizationService;
 
     protected int batchSize = 500;
 
@@ -160,6 +163,26 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr
         this.remove(new QueryWrapper<HRContract>().eq("hremployeeid",employeeid));
     }
 
+	@Override
+    public List<HRContract> selectByMgrorganizationid(String organizationid) {
+        return baseMapper.selectByMgrorganizationid(organizationid);
+    }
+
+    @Override
+    public void removeByMgrorganizationid(String organizationid) {
+        this.remove(new QueryWrapper<HRContract>().eq("mgrorganizationid",organizationid));
+    }
+
+	@Override
+    public List<HRContract> selectBySignorganizationid(String organizationid) {
+        return baseMapper.selectBySignorganizationid(organizationid);
+    }
+
+    @Override
+    public void removeBySignorganizationid(String organizationid) {
+        this.remove(new QueryWrapper<HRContract>().eq("signorganizationid",organizationid));
+    }
+
 
     /**
      * 查询集合 DEFAULT
@@ -187,6 +210,26 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr
             }
             et.setHremployeename(hremployee.getEmployeename());
         }
+        //实体关系[DER1N_HRCONTRACT_HRORGANIZATION_MGRORGANIZATIONID_6BD9DC]
+        if(!ObjectUtils.isEmpty(et.getMgrorganizationid())){
+            cn.ibizlab.humanresource.core.base.domain.HROrganization mgrorganization=et.getMgrorganization();
+            if(ObjectUtils.isEmpty(mgrorganization)){
+                cn.ibizlab.humanresource.core.base.domain.HROrganization majorEntity=hrorganizationService.get(et.getMgrorganizationid());
+                et.setMgrorganization(majorEntity);
+                mgrorganization=majorEntity;
+            }
+            et.setMgrorganizationname(mgrorganization.getOrganizationname());
+        }
+        //实体关系[DER1N_HRCONTRACT_HRORGANIZATION_SIGNORGANIZATIONID_6BD9DC]
+        if(!ObjectUtils.isEmpty(et.getSignorganizationid())){
+            cn.ibizlab.humanresource.core.base.domain.HROrganization signorganization=et.getSignorganization();
+            if(ObjectUtils.isEmpty(signorganization)){
+                cn.ibizlab.humanresource.core.base.domain.HROrganization majorEntity=hrorganizationService.get(et.getSignorganizationid());
+                et.setSignorganization(majorEntity);
+                signorganization=majorEntity;
+            }
+            et.setSignorganizationname(signorganization.getOrganizationname());
+        }
     }
 
 

humanresource-core/src/main/resources/liquibase/h2_table.xml

@@ -46,7 +46,7 @@
 
 
     <!--输出实体[HRCERTIFICATE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-8-3">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-21-3">
         <createTable tableName="T_HRCERTIFICATE">
                 <column name="HRCERTIFICATEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRCERTIFICATE_HRCERTIFICATE"/>
@@ -63,12 +63,30 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="CERTIFICATECODE" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="AUTHORGANIZATION" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="AUTHDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="EXPIREDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="REGISTERCODE" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="REGISTERTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="MEMO" remarks="" type="VARCHAR(2000)">
+                </column>
+                <column name="REGISTERORGANIZATIONID" remarks="" type="VARCHAR(60)">
+                </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[HRCONTRACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-8-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-23-4">
         <createTable tableName="T_HRCONTRACT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -97,6 +115,12 @@
                 </column>
                 <column name="CONTRACTSTATE" remarks="" type="VARCHAR(60)">
                 </column>
+                <column name="MGRORGANIZATIONID" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="SIGNORGANIZATIONID" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="PROBATIONTIME" remarks="" type="DATETIME">
+                </column>
         </createTable>
     </changeSet>
 
@@ -232,7 +256,7 @@
 
 
     <!--输出实体[HREDUCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hreducation-36-10">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hreducation-40-10">
         <createTable tableName="T_HREDUCATION">
                 <column name="HREDUCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HREDUCATION_HREDUCATIONID"/>
@@ -430,7 +454,7 @@
 
 
     <!--输出实体[HRLANGUAGEABILITY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlanguageability-13-14">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlanguageability-14-14">
         <createTable tableName="T_HRLANGUAGEABILITY">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -678,7 +702,7 @@
 
 
     <!--输出实体[HRORGANIZATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-33-24">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-36-24">
         <createTable tableName="ORGANIZATION">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -712,7 +736,7 @@
 
 
     <!--输出实体[HRPAPER]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrpaper-6-25">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrpaper-13-25">
         <createTable tableName="T_HRPAPER">
                 <column name="HRPAPERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRPAPER_HRPAPERID"/>
@@ -729,12 +753,24 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="ACTIVETIME" remarks="" type="DATETIME">
+                </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="PUBLISHER" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="PUBLICATION" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="PUBLICATIONNUM" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="POSITION" remarks="" type="BIGINT">
+                </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[HRPATENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrpatent-7-26">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrpatent-14-26">
         <createTable tableName="T_HRPATENT">
                 <column name="HRPATENTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRPATENT_HRPATENTID"/>
@@ -751,6 +787,14 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="ACTIVETIME" remarks="" type="DATETIME">
+                </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="PATENTCODE" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="PATENTCOUNTRY" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -818,7 +862,7 @@
 
 
     <!--输出实体[HRRESEARCH]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrresearch-8-29">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrresearch-10-29">
         <createTable tableName="T_HRRESEARCH">
                 <column name="HRRESEARCHID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRRESEARCH_HRRESEARCHID"/>
@@ -835,12 +879,16 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="ACTIVETIME" remarks="" type="DATETIME">
+                </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[HRREWARD]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrreward-8-30">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrreward-16-30">
         <createTable tableName="T_HRREWARD">
                 <column name="HRREWARDNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -857,12 +905,26 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="REWARDTYPE" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="REWARDLEVEL" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="REWARDMONEY" remarks="" type="DECIMAL(38,2)">
+                </column>
+                <column name="REWARDTIME" remarks="" type="DATETIME">
+                </column>
+                <column name="AUTHORGANIZATION" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="REWARDEVENT" remarks="" type="VARCHAR(2000)">
+                </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[HRTECHNICALTITLE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtechnicaltitle-8-31">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtechnicaltitle-31-31">
         <createTable tableName="T_HRTECHNICALTITLE">
                 <column name="HRTECHNICALTITLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRTECHNICALTITLE_HRTECHNICA"/>
@@ -879,6 +941,24 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="TITLETIME" remarks="" type="DATETIME">
+                </column>
+                <column name="TITLELEVEL" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="MAJORTYPE" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MAJOR" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="AUTHORGANIZATION" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="VALIDORGANIZATION" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="HIGHTITLE" remarks="" type="INT">
+                </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="CERTIFICATECODE" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -982,134 +1062,140 @@
     </changeSet>
         <!--输出实体[HRATTENDANCE]外键关系 -->
         <!--输出实体[HRCERTIFICATE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-8-36">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-21-36">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HREMPLOYEE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
+    </changeSet>
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-21-37">
+       <addForeignKeyConstraint baseColumnNames="REGISTERORGANIZATIONID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HRORGANIZA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRCONTRACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-8-37">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-23-38">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
+    </changeSet>
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-23-39">
+       <addForeignKeyConstraint baseColumnNames="MGRORGANIZATIONID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HRORGANIZATIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRDISTRIBUTION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-39-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-39-41">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HREMPLOYE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-39-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-39-42">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HRPOST_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRDUTY]外键关系 -->
         <!--输出实体[HRDUTYCERT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdutycert-23-40">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdutycert-23-43">
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYCERT" constraintName="DER1N_HRDUTYCERT_HRDUTY_HRDUTY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
         <!--输出实体[HRDUTYEDU]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyedu-22-41">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyedu-22-44">
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYEDU" constraintName="DER1N_HRDUTYEDU_HRDUTY_HRDUTYI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
         <!--输出实体[HRDUTYSKILL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyskill-21-42">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdutyskill-21-45">
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYSKILL" constraintName="DER1N_HRDUTYSKILL_HRDUTY_HRDUT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
         <!--输出实体[HREDUCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hreducation-36-43">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hreducation-40-46">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HREDUCATION" constraintName="DER1N_HREDUCATION_HREMPLOYEE_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HREMPSTATE]外键关系 -->
         <!--输出实体[HREMPLOYEE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-44">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-47">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-45">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-48">
        <addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-46">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-49">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HRPOST_HRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRFAMILY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrfamily-20-47">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrfamily-20-50">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRFAMILY" constraintName="DER1N_HRFAMILY_HREMPLOYEE_HREM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRLANGUAGEABILITY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrlanguageability-13-48">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrlanguageability-14-51">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRLANGUAGEABILITY" constraintName="DER1N_HRLANGUAGEABILITY_HREMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRLEAVE]外键关系 -->
         <!--输出实体[HRLEGAL]外键关系 -->
         <!--输出实体[HROMHIERARCHYPURPOSE]外键关系 -->
         <!--输出实体[HROMHIERARCHY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-76-49">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-76-52">
        <addForeignKeyConstraint baseColumnNames="HROMHIERARCHYCATID" baseTableName="OMHIERARCHY" constraintName="DER1N_HROMHIERARCHY_HROMHIERAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYCATID" referencedTableName="OMHIERARCHYCAT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-76-50">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-76-53">
        <addForeignKeyConstraint baseColumnNames="POMHIERARCHYID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_OMHIERARCHY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYID" referencedTableName="OMHIERARCHY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-76-51">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-76-54">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_ORGANIZATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HROMHIERARCHYCAT]外键关系 -->
         <!--输出实体[HROMHIERARCHYPURPOSEREF]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchypurposeref-6-52">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchypurposeref-6-55">
        <addForeignKeyConstraint baseColumnNames="OMHIERARCHYCATID" baseTableName="OMHIERARCHYPURPOSEREF" constraintName="DER1N_OMHIERARCHYPURPOSEREF_OM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYCATID" referencedTableName="OMHIERARCHYCAT" validate="true"/>
     </changeSet>
         <!--输出实体[HROPERATIONUNIT]外键关系 -->
         <!--输出实体[HRORGADDRESS]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrorgaddress-29-54">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrorgaddress-29-57">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRORGADDRESS" constraintName="DER1N_HRORGADDRESS_HRORGANIZAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRORGCONTACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrorgcontact-24-55">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrorgcontact-24-58">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRORGCONTACT" constraintName="DER1N_HRORGCONTACT_HRORGANIZAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRORGANIZATION]外键关系 -->
         <!--输出实体[HRPAPER]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpaper-6-56">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpaper-13-59">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRPAPER" constraintName="DER1N_HRPAPER_HREMPLOYEE_HREMP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRPATENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpatent-7-57">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpatent-14-60">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRPATENT" constraintName="DER1N_HRPATENT_HREMPLOYEE_HREM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRPOST]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-108-58">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-108-61">
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRDUTY_HRDUTYID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-108-59">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-108-62">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRORGANIZATION_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRPOSTREL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-60">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-63">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_HRPOSTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-61">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-64">
        <addForeignKeyConstraint baseColumnNames="PHRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_PHRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRRESEARCH]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrresearch-8-62">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrresearch-10-65">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRRESEARCH" constraintName="DER1N_HRRESEARCH_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRREWARD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrreward-8-63">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrreward-16-66">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRREWARD" constraintName="DER1N_HRREWARD_HREMPLOYEE_HREM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRTECHNICALTITLE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtechnicaltitle-8-64">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtechnicaltitle-31-67">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTECHNICALTITLE" constraintName="DER1N_HRTECHNICALTITLE_HREMPLO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRTRAININGRECORD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtrainingrecord-8-65">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtrainingrecord-8-68">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRAININGRECORD" constraintName="DER1N_HRTRAININGRECORD_HREMPLO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRTRANSFERAPPLY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-66">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-69">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HREMPLOY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-67">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-70">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRORGANI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-68">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-71">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRPOST_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRWORKRECORD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrworkrecord-15-69">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrworkrecord-15-72">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRWORKRECORD" constraintName="DER1N_HRWORKRECORD_HREMPLOYEE_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
 

humanresource-core/src/main/resources/mapper/humanresource/hrcertificate/HRCertificateMapper.xml

@@ -5,17 +5,20 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRCertificateResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrcertificateid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID  ) t1 where hrcertificateid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="HRCertificateResultMap" type="cn.ibizlab.humanresource.core.humanresource.domain.HRCertificate" autoMapping="true">
         <id property="hrcertificateid" column="hrcertificateid" /><!--主键字段映射-->
 		<result property="hremployeeid" column="hremployeeid" />
+		<result property="registerorganizationid" column="registerorganizationid" />
             
 		
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="hremployee" javaType="cn.ibizlab.humanresource.core.humanresource.domain.HREmployee" column="hremployeeid" select="cn.ibizlab.humanresource.core.humanresource.mapper.HREmployeeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="registerorganization" javaType="cn.ibizlab.humanresource.core.base.domain.HROrganization" column="registerorganizationid" select="cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRCERTIFICATE_HREMPLOYEE_HREMPLOYEEID_327A4D] -->
@@ -24,6 +27,13 @@
                 <include refid="Default" />
 			 ) t1
 			 where  hremployeeid=#{employeeid}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRCERTIFICATE_HRORGANIZATION_REGISTERORGANIZATIONID_6BD9DC] -->
+	 <select id="selectByRegisterorganizationid" resultMap="HRCertificateResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  registerorganizationid=#{organizationid}
      </select>
 
     <!--数据集合[Default]-->
@@ -37,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/humanresource/hrcontract/HRContractMapper.xml

@@ -5,17 +5,23 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRContractResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrcontractid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID  ) t1 where hrcontractid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="HRContractResultMap" type="cn.ibizlab.humanresource.core.humanresource.domain.HRContract" autoMapping="true">
         <id property="hrcontractid" column="hrcontractid" /><!--主键字段映射-->
 		<result property="hremployeeid" column="hremployeeid" />
+		<result property="mgrorganizationid" column="mgrorganizationid" />
+		<result property="signorganizationid" column="signorganizationid" />
             
 		
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="hremployee" javaType="cn.ibizlab.humanresource.core.humanresource.domain.HREmployee" column="hremployeeid" select="cn.ibizlab.humanresource.core.humanresource.mapper.HREmployeeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="mgrorganization" javaType="cn.ibizlab.humanresource.core.base.domain.HROrganization" column="mgrorganizationid" select="cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="signorganization" javaType="cn.ibizlab.humanresource.core.base.domain.HROrganization" column="signorganizationid" select="cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRCONTRACT_HREMPLOYEE_HREMPLOYEEID_327A4D] -->
@@ -24,6 +30,20 @@
                 <include refid="Default" />
 			 ) t1
 			 where  hremployeeid=#{employeeid}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRCONTRACT_HRORGANIZATION_MGRORGANIZATIONID_6BD9DC] -->
+	 <select id="selectByMgrorganizationid" resultMap="HRContractResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  mgrorganizationid=#{organizationid}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HRCONTRACT_HRORGANIZATION_SIGNORGANIZATIONID_6BD9DC] -->
+	 <select id="selectBySignorganizationid" resultMap="HRContractResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  signorganizationid=#{organizationid}
      </select>
 
     <!--数据集合[Default]-->
@@ -37,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/humanresource/hrpaper/HRPaperMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRPaperResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPAPERID`, t1.`HRPAPERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPAPER` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrpaperid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPAPERID`, t1.`HRPAPERNAME`, t1.`POSITION`, t1.`PUBLICATION`, t1.`PUBLICATIONNUM`, t1.`PUBLISHER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPAPER` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrpaperid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPAPERID`, t1.`HRPAPERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPAPER` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPAPERID`, t1.`HRPAPERNAME`, t1.`POSITION`, t1.`PUBLICATION`, t1.`PUBLICATIONNUM`, t1.`PUBLISHER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPAPER` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPAPERID`, t1.`HRPAPERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPAPER` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPAPERID`, t1.`HRPAPERNAME`, t1.`POSITION`, t1.`PUBLICATION`, t1.`PUBLICATIONNUM`, t1.`PUBLISHER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPAPER` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/humanresource/hrpatent/HRPatentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRPatentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPATENTID`, t1.`HRPATENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPATENT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrpatentid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPATENTID`, t1.`HRPATENTNAME`, t1.`PATENTCODE`, t1.`PATENTCOUNTRY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPATENT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrpatentid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPATENTID`, t1.`HRPATENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPATENT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPATENTID`, t1.`HRPATENTNAME`, t1.`PATENTCODE`, t1.`PATENTCOUNTRY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPATENT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPATENTID`, t1.`HRPATENTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPATENT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRPATENTID`, t1.`HRPATENTNAME`, t1.`PATENTCODE`, t1.`PATENTCOUNTRY`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRPATENT` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/humanresource/hrresearch/HRResearchMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRResearchResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRRESEARCHID`, t1.`HRRESEARCHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRRESEARCH` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrresearchid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRRESEARCHID`, t1.`HRRESEARCHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRRESEARCH` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrresearchid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRRESEARCHID`, t1.`HRRESEARCHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRRESEARCH` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRRESEARCHID`, t1.`HRRESEARCHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRRESEARCH` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRRESEARCHID`, t1.`HRRESEARCHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRRESEARCH` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ACTIVETIME`, t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRRESEARCHID`, t1.`HRRESEARCHNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRRESEARCH` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/humanresource/hrreward/HRRewardMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRRewardResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRREWARDID`, t1.`HRREWARDNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRREWARD` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrrewardid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRREWARDID`, t1.`HRREWARDNAME`, t1.`REWARDEVENT`, t1.`REWARDLEVEL`, t1.`REWARDMONEY`, t1.`REWARDTIME`, t1.`REWARDTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRREWARD` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrrewardid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRREWARDID`, t1.`HRREWARDNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRREWARD` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRREWARDID`, t1.`HRREWARDNAME`, t1.`REWARDEVENT`, t1.`REWARDLEVEL`, t1.`REWARDMONEY`, t1.`REWARDTIME`, t1.`REWARDTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRREWARD` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRREWARDID`, t1.`HRREWARDNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRREWARD` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRREWARDID`, t1.`HRREWARDNAME`, t1.`REWARDEVENT`, t1.`REWARDLEVEL`, t1.`REWARDMONEY`, t1.`REWARDTIME`, t1.`REWARDTYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRREWARD` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/humanresource/hrtechnicaltitle/HRTechnicalTitleMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRTechnicalTitleResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRTECHNICALTITLE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrtechnicaltitleid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HIGHTITLE`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`MAJOR`, t1.`MAJORTYPE`, t1.`TITLELEVEL`, t1.`TITLETIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDORGANIZATION` FROM `T_HRTECHNICALTITLE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrtechnicaltitleid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRTECHNICALTITLE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HIGHTITLE`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`MAJOR`, t1.`MAJORTYPE`, t1.`TITLELEVEL`, t1.`TITLETIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDORGANIZATION` FROM `T_HRTECHNICALTITLE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRTECHNICALTITLE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HIGHTITLE`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`MAJOR`, t1.`MAJORTYPE`, t1.`TITLELEVEL`, t1.`TITLETIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDORGANIZATION` FROM `T_HRTECHNICALTITLE` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
 
-EXPOSE 8081
+EXPOSE 10317
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "8081:8081"
+      - "10317:10317"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10317
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRCertificateDTO.java

@@ -90,6 +90,89 @@ public class HRCertificateDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [CERTIFICATECODE]
+     *
+     */
+    @JSONField(name = "certificatecode")
+    @JsonProperty("certificatecode")
+    private String certificatecode;
+
+    /**
+     * 属性 [AUTHORGANIZATION]
+     *
+     */
+    @JSONField(name = "authorganization")
+    @JsonProperty("authorganization")
+    private String authorganization;
+
+    /**
+     * 属性 [AUTHDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "authdate" , format="yyyy-MM-dd")
+    @JsonProperty("authdate")
+    private Timestamp authdate;
+
+    /**
+     * 属性 [EXPIREDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "expiredate" , format="yyyy-MM-dd")
+    @JsonProperty("expiredate")
+    private Timestamp expiredate;
+
+    /**
+     * 属性 [REGISTERCODE]
+     *
+     */
+    @JSONField(name = "registercode")
+    @JsonProperty("registercode")
+    private String registercode;
+
+    /**
+     * 属性 [REGISTERTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "registertime" , format="yyyy-MM-dd")
+    @JsonProperty("registertime")
+    private Timestamp registertime;
+
+    /**
+     * 属性 [MEMO]
+     *
+     */
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
+
+    /**
+     * 属性 [REGISTERORGANIZATIONID]
+     *
+     */
+    @JSONField(name = "registerorganizationid")
+    @JsonProperty("registerorganizationid")
+    private String registerorganizationid;
+
+    /**
+     * 属性 [REGISTERORGANIZATIONNAME]
+     *
+     */
+    @JSONField(name = "registerorganizationname")
+    @JsonProperty("registerorganizationname")
+    private String registerorganizationname;
+
 
     /**
      * 设置 [HRCERTIFICATENAME]
@@ -107,6 +190,78 @@ public class HRCertificateDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [CERTIFICATECODE]
+     */
+    public void setCertificatecode(String  certificatecode){
+        this.certificatecode = certificatecode ;
+        this.modify("certificatecode",certificatecode);
+    }
+
+    /**
+     * 设置 [AUTHORGANIZATION]
+     */
+    public void setAuthorganization(String  authorganization){
+        this.authorganization = authorganization ;
+        this.modify("authorganization",authorganization);
+    }
+
+    /**
+     * 设置 [AUTHDATE]
+     */
+    public void setAuthdate(Timestamp  authdate){
+        this.authdate = authdate ;
+        this.modify("authdate",authdate);
+    }
+
+    /**
+     * 设置 [EXPIREDATE]
+     */
+    public void setExpiredate(Timestamp  expiredate){
+        this.expiredate = expiredate ;
+        this.modify("expiredate",expiredate);
+    }
+
+    /**
+     * 设置 [REGISTERCODE]
+     */
+    public void setRegistercode(String  registercode){
+        this.registercode = registercode ;
+        this.modify("registercode",registercode);
+    }
+
+    /**
+     * 设置 [REGISTERTIME]
+     */
+    public void setRegistertime(Timestamp  registertime){
+        this.registertime = registertime ;
+        this.modify("registertime",registertime);
+    }
+
+    /**
+     * 设置 [MEMO]
+     */
+    public void setMemo(String  memo){
+        this.memo = memo ;
+        this.modify("memo",memo);
+    }
+
+    /**
+     * 设置 [REGISTERORGANIZATIONID]
+     */
+    public void setRegisterorganizationid(String  registerorganizationid){
+        this.registerorganizationid = registerorganizationid ;
+        this.modify("registerorganizationid",registerorganizationid);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRContractDTO.java

@@ -140,6 +140,47 @@ public class HRContractDTO extends DTOBase implements Serializable {
     @JsonProperty("contractstate")
     private String contractstate;
 
+    /**
+     * 属性 [MGRORGANIZATIONID]
+     *
+     */
+    @JSONField(name = "mgrorganizationid")
+    @JsonProperty("mgrorganizationid")
+    private String mgrorganizationid;
+
+    /**
+     * 属性 [MGRORGANIZATIONNAME]
+     *
+     */
+    @JSONField(name = "mgrorganizationname")
+    @JsonProperty("mgrorganizationname")
+    private String mgrorganizationname;
+
+    /**
+     * 属性 [SIGNORGANIZATIONID]
+     *
+     */
+    @JSONField(name = "signorganizationid")
+    @JsonProperty("signorganizationid")
+    private String signorganizationid;
+
+    /**
+     * 属性 [SIGNORGANIZATIONNAME]
+     *
+     */
+    @JSONField(name = "signorganizationname")
+    @JsonProperty("signorganizationname")
+    private String signorganizationname;
+
+    /**
+     * 属性 [PROBATIONTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "probationtime" , format="yyyy-MM-dd")
+    @JsonProperty("probationtime")
+    private Timestamp probationtime;
+
 
     /**
      * 设置 [HRCONTRACTNAME]
@@ -205,6 +246,30 @@ public class HRContractDTO extends DTOBase implements Serializable {
         this.modify("contractstate",contractstate);
     }
 
+    /**
+     * 设置 [MGRORGANIZATIONID]
+     */
+    public void setMgrorganizationid(String  mgrorganizationid){
+        this.mgrorganizationid = mgrorganizationid ;
+        this.modify("mgrorganizationid",mgrorganizationid);
+    }
+
+    /**
+     * 设置 [SIGNORGANIZATIONID]
+     */
+    public void setSignorganizationid(String  signorganizationid){
+        this.signorganizationid = signorganizationid ;
+        this.modify("signorganizationid",signorganizationid);
+    }
+
+    /**
+     * 设置 [PROBATIONTIME]
+     */
+    public void setProbationtime(Timestamp  probationtime){
+        this.probationtime = probationtime ;
+        this.modify("probationtime",probationtime);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRPaperDTO.java

@@ -90,6 +90,55 @@ public class HRPaperDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [ACTIVETIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "activetime" , format="yyyy-MM-dd")
+    @JsonProperty("activetime")
+    private Timestamp activetime;
+
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [PUBLISHER]
+     *
+     */
+    @JSONField(name = "publisher")
+    @JsonProperty("publisher")
+    private String publisher;
+
+    /**
+     * 属性 [PUBLICATION]
+     *
+     */
+    @JSONField(name = "publication")
+    @JsonProperty("publication")
+    private String publication;
+
+    /**
+     * 属性 [PUBLICATIONNUM]
+     *
+     */
+    @JSONField(name = "publicationnum")
+    @JsonProperty("publicationnum")
+    private String publicationnum;
+
+    /**
+     * 属性 [POSITION]
+     *
+     */
+    @JSONField(name = "position")
+    @JsonProperty("position")
+    private BigInteger position;
+
 
     /**
      * 设置 [HRPAPERNAME]
@@ -107,6 +156,54 @@ public class HRPaperDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [ACTIVETIME]
+     */
+    public void setActivetime(Timestamp  activetime){
+        this.activetime = activetime ;
+        this.modify("activetime",activetime);
+    }
+
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [PUBLISHER]
+     */
+    public void setPublisher(String  publisher){
+        this.publisher = publisher ;
+        this.modify("publisher",publisher);
+    }
+
+    /**
+     * 设置 [PUBLICATION]
+     */
+    public void setPublication(String  publication){
+        this.publication = publication ;
+        this.modify("publication",publication);
+    }
+
+    /**
+     * 设置 [PUBLICATIONNUM]
+     */
+    public void setPublicationnum(String  publicationnum){
+        this.publicationnum = publicationnum ;
+        this.modify("publicationnum",publicationnum);
+    }
+
+    /**
+     * 设置 [POSITION]
+     */
+    public void setPosition(BigInteger  position){
+        this.position = position ;
+        this.modify("position",position);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRPatentDTO.java

@@ -90,6 +90,39 @@ public class HRPatentDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [ACTIVETIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "activetime" , format="yyyy-MM-dd")
+    @JsonProperty("activetime")
+    private Timestamp activetime;
+
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [PATENTCODE]
+     *
+     */
+    @JSONField(name = "patentcode")
+    @JsonProperty("patentcode")
+    private String patentcode;
+
+    /**
+     * 属性 [PATENTCOUNTRY]
+     *
+     */
+    @JSONField(name = "patentcountry")
+    @JsonProperty("patentcountry")
+    private String patentcountry;
+
 
     /**
      * 设置 [HRPATENTNAME]
@@ -107,6 +140,38 @@ public class HRPatentDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [ACTIVETIME]
+     */
+    public void setActivetime(Timestamp  activetime){
+        this.activetime = activetime ;
+        this.modify("activetime",activetime);
+    }
+
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [PATENTCODE]
+     */
+    public void setPatentcode(String  patentcode){
+        this.patentcode = patentcode ;
+        this.modify("patentcode",patentcode);
+    }
+
+    /**
+     * 设置 [PATENTCOUNTRY]
+     */
+    public void setPatentcountry(String  patentcountry){
+        this.patentcountry = patentcountry ;
+        this.modify("patentcountry",patentcountry);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRResearchDTO.java

@@ -90,6 +90,23 @@ public class HRResearchDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [ACTIVETIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "activetime" , format="yyyy-MM-dd")
+    @JsonProperty("activetime")
+    private Timestamp activetime;
+
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
 
     /**
      * 设置 [HRRESEARCHNAME]
@@ -107,6 +124,22 @@ public class HRResearchDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [ACTIVETIME]
+     */
+    public void setActivetime(Timestamp  activetime){
+        this.activetime = activetime ;
+        this.modify("activetime",activetime);
+    }
+
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRRewardDTO.java

@@ -90,6 +90,63 @@ public class HRRewardDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [REWARDTYPE]
+     *
+     */
+    @JSONField(name = "rewardtype")
+    @JsonProperty("rewardtype")
+    private String rewardtype;
+
+    /**
+     * 属性 [REWARDLEVEL]
+     *
+     */
+    @JSONField(name = "rewardlevel")
+    @JsonProperty("rewardlevel")
+    private String rewardlevel;
+
+    /**
+     * 属性 [REWARDMONEY]
+     *
+     */
+    @JSONField(name = "rewardmoney")
+    @JsonProperty("rewardmoney")
+    private Double rewardmoney;
+
+    /**
+     * 属性 [REWARDTIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "rewardtime" , format="yyyy-MM-dd")
+    @JsonProperty("rewardtime")
+    private Timestamp rewardtime;
+
+    /**
+     * 属性 [AUTHORGANIZATION]
+     *
+     */
+    @JSONField(name = "authorganization")
+    @JsonProperty("authorganization")
+    private String authorganization;
+
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [REWARDEVENT]
+     *
+     */
+    @JSONField(name = "rewardevent")
+    @JsonProperty("rewardevent")
+    private String rewardevent;
+
 
     /**
      * 设置 [HRREWARDNAME]
@@ -107,6 +164,62 @@ public class HRRewardDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [REWARDTYPE]
+     */
+    public void setRewardtype(String  rewardtype){
+        this.rewardtype = rewardtype ;
+        this.modify("rewardtype",rewardtype);
+    }
+
+    /**
+     * 设置 [REWARDLEVEL]
+     */
+    public void setRewardlevel(String  rewardlevel){
+        this.rewardlevel = rewardlevel ;
+        this.modify("rewardlevel",rewardlevel);
+    }
+
+    /**
+     * 设置 [REWARDMONEY]
+     */
+    public void setRewardmoney(Double  rewardmoney){
+        this.rewardmoney = rewardmoney ;
+        this.modify("rewardmoney",rewardmoney);
+    }
+
+    /**
+     * 设置 [REWARDTIME]
+     */
+    public void setRewardtime(Timestamp  rewardtime){
+        this.rewardtime = rewardtime ;
+        this.modify("rewardtime",rewardtime);
+    }
+
+    /**
+     * 设置 [AUTHORGANIZATION]
+     */
+    public void setAuthorganization(String  authorganization){
+        this.authorganization = authorganization ;
+        this.modify("authorganization",authorganization);
+    }
+
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [REWARDEVENT]
+     */
+    public void setRewardevent(String  rewardevent){
+        this.rewardevent = rewardevent ;
+        this.modify("rewardevent",rewardevent);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRTechnicalTitleDTO.java

@@ -90,6 +90,79 @@ public class HRTechnicalTitleDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [TITLETIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "titletime" , format="yyyy-MM-dd")
+    @JsonProperty("titletime")
+    private Timestamp titletime;
+
+    /**
+     * 属性 [TITLELEVEL]
+     *
+     */
+    @JSONField(name = "titlelevel")
+    @JsonProperty("titlelevel")
+    private String titlelevel;
+
+    /**
+     * 属性 [MAJORTYPE]
+     *
+     */
+    @JSONField(name = "majortype")
+    @JsonProperty("majortype")
+    private String majortype;
+
+    /**
+     * 属性 [MAJOR]
+     *
+     */
+    @JSONField(name = "major")
+    @JsonProperty("major")
+    private String major;
+
+    /**
+     * 属性 [AUTHORGANIZATION]
+     *
+     */
+    @JSONField(name = "authorganization")
+    @JsonProperty("authorganization")
+    private String authorganization;
+
+    /**
+     * 属性 [VALIDORGANIZATION]
+     *
+     */
+    @JSONField(name = "validorganization")
+    @JsonProperty("validorganization")
+    private String validorganization;
+
+    /**
+     * 属性 [HIGHTITLE]
+     *
+     */
+    @JSONField(name = "hightitle")
+    @JsonProperty("hightitle")
+    private Integer hightitle;
+
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [CERTIFICATECODE]
+     *
+     */
+    @JSONField(name = "certificatecode")
+    @JsonProperty("certificatecode")
+    private String certificatecode;
+
 
     /**
      * 设置 [HRTECHNICALTITLENAME]
@@ -107,6 +180,78 @@ public class HRTechnicalTitleDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [TITLETIME]
+     */
+    public void setTitletime(Timestamp  titletime){
+        this.titletime = titletime ;
+        this.modify("titletime",titletime);
+    }
+
+    /**
+     * 设置 [TITLELEVEL]
+     */
+    public void setTitlelevel(String  titlelevel){
+        this.titlelevel = titlelevel ;
+        this.modify("titlelevel",titlelevel);
+    }
+
+    /**
+     * 设置 [MAJORTYPE]
+     */
+    public void setMajortype(String  majortype){
+        this.majortype = majortype ;
+        this.modify("majortype",majortype);
+    }
+
+    /**
+     * 设置 [MAJOR]
+     */
+    public void setMajor(String  major){
+        this.major = major ;
+        this.modify("major",major);
+    }
+
+    /**
+     * 设置 [AUTHORGANIZATION]
+     */
+    public void setAuthorganization(String  authorganization){
+        this.authorganization = authorganization ;
+        this.modify("authorganization",authorganization);
+    }
+
+    /**
+     * 设置 [VALIDORGANIZATION]
+     */
+    public void setValidorganization(String  validorganization){
+        this.validorganization = validorganization ;
+        this.modify("validorganization",validorganization);
+    }
+
+    /**
+     * 设置 [HIGHTITLE]
+     */
+    public void setHightitle(Integer  hightitle){
+        this.hightitle = hightitle ;
+        this.modify("hightitle",hightitle);
+    }
+
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [CERTIFICATECODE]
+     */
+    public void setCertificatecode(String  certificatecode){
+        this.certificatecode = certificatecode ;
+        this.modify("certificatecode",certificatecode);
+    }
+
 
 }