提交 ff7aa40e 编写于 作者: ibizdev's avatar ibizdev

jackwang 部署微服务接口

上级 197927f3
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/ git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/ cd ibizhumanresources/
mvn clean package -Ppim mvn clean package -Phrapi
cd humanresource-app/humanresource-app-pim cd humanresource-provider/humanresource-provider-hrapi
mvn -Ppim docker:build mvn -Phrapi docker:build
mvn -Ppim docker:push mvn -Phrapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar 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 ADD humanresource-app-pim.jar /humanresource-app-pim.jar
...@@ -3,25 +3,9 @@ services: ...@@ -3,25 +3,9 @@ services:
humanresource-app-pim: humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports: ports:
- "10327:10327" - "8080:8080"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
...@@ -103,6 +103,114 @@ public class HRArchives extends EntityMP implements Serializable { ...@@ -103,6 +103,114 @@ public class HRArchives extends EntityMP implements Serializable {
@JSONField(name = "hremployeename") @JSONField(name = "hremployeename")
@JsonProperty("hremployeename") @JsonProperty("hremployeename")
private String hremployeename; private String hremployeename;
/**
* 员工编号
*/
@TableField(exist = false)
@JSONField(name = "employeecode")
@JsonProperty("employeecode")
private String employeecode;
/**
* 单位
*/
@TableField(exist = false)
@JSONField(name = "organizationname")
@JsonProperty("organizationname")
private String organizationname;
/**
* 单位ID
*/
@TableField(exist = false)
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
/**
* 员工状态
*/
@TableField(exist = false)
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/**
* 档案编号
*/
@TableField(value = "archivescode")
@JSONField(name = "archivescode")
@JsonProperty("archivescode")
private String archivescode;
/**
* 档案室
*/
@TableField(value = "archivesroom")
@JSONField(name = "archivesroom")
@JsonProperty("archivesroom")
private String archivesroom;
/**
* 档案保管地
*/
@TableField(value = "archivesplacetype")
@JSONField(name = "archivesplacetype")
@JsonProperty("archivesplacetype")
private String archivesplacetype;
/**
* 档案保管地
*/
@TableField(value = "archivesplace")
@JSONField(name = "archivesplace")
@JsonProperty("archivesplace")
private String archivesplace;
/**
* 档案学历
*/
@TableField(value = "degree")
@JSONField(name = "degree")
@JsonProperty("degree")
private String degree;
/**
* 档案出生日期
*/
@TableField(value = "birthday")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "birthday" , format="yyyy-MM-dd")
@JsonProperty("birthday")
private Timestamp birthday;
/**
* 档案入党时间
*/
@TableField(value = "politicaltime")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "politicaltime" , format="yyyy-MM-dd")
@JsonProperty("politicaltime")
private Timestamp politicaltime;
/**
* 档案参加工作时间
*/
@TableField(value = "startworktime")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "startworktime" , format="yyyy-MM-dd")
@JsonProperty("startworktime")
private Timestamp startworktime;
/**
* 是否有效
*/
@TableField(value = "activeflag")
@JSONField(name = "activeflag")
@JsonProperty("activeflag")
private Integer activeflag;
/**
* 人事档案目录
*/
@TableField(value = "attachment")
@JSONField(name = "attachment")
@JsonProperty("attachment")
private String attachment;
/**
* 备注
*/
@TableField(value = "memo")
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/** /**
* 员工 * 员工
...@@ -130,6 +238,124 @@ public class HRArchives extends EntityMP implements Serializable { ...@@ -130,6 +238,124 @@ public class HRArchives extends EntityMP implements Serializable {
this.modify("hremployeeid",hremployeeid); this.modify("hremployeeid",hremployeeid);
} }
/**
* 设置 [档案编号]
*/
public void setArchivescode(String archivescode){
this.archivescode = archivescode ;
this.modify("archivescode",archivescode);
}
/**
* 设置 [档案室]
*/
public void setArchivesroom(String archivesroom){
this.archivesroom = archivesroom ;
this.modify("archivesroom",archivesroom);
}
/**
* 设置 [档案保管地]
*/
public void setArchivesplacetype(String archivesplacetype){
this.archivesplacetype = archivesplacetype ;
this.modify("archivesplacetype",archivesplacetype);
}
/**
* 设置 [档案保管地]
*/
public void setArchivesplace(String archivesplace){
this.archivesplace = archivesplace ;
this.modify("archivesplace",archivesplace);
}
/**
* 设置 [档案学历]
*/
public void setDegree(String degree){
this.degree = degree ;
this.modify("degree",degree);
}
/**
* 设置 [档案出生日期]
*/
public void setBirthday(Timestamp birthday){
this.birthday = birthday ;
this.modify("birthday",birthday);
}
/**
* 格式化日期 [档案出生日期]
*/
public String formatBirthday(){
if (this.birthday == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(birthday);
}
/**
* 设置 [档案入党时间]
*/
public void setPoliticaltime(Timestamp politicaltime){
this.politicaltime = politicaltime ;
this.modify("politicaltime",politicaltime);
}
/**
* 格式化日期 [档案入党时间]
*/
public String formatPoliticaltime(){
if (this.politicaltime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(politicaltime);
}
/**
* 设置 [档案参加工作时间]
*/
public void setStartworktime(Timestamp startworktime){
this.startworktime = startworktime ;
this.modify("startworktime",startworktime);
}
/**
* 格式化日期 [档案参加工作时间]
*/
public String formatStartworktime(){
if (this.startworktime == null) {
return null;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(startworktime);
}
/**
* 设置 [是否有效]
*/
public void setActiveflag(Integer activeflag){
this.activeflag = activeflag ;
this.modify("activeflag",activeflag);
}
/**
* 设置 [人事档案目录]
*/
public void setAttachment(String attachment){
this.attachment = attachment ;
this.modify("attachment",attachment);
}
/**
* 设置 [备注]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
} }
......
...@@ -176,6 +176,34 @@ public class HRCertificate extends EntityMP implements Serializable { ...@@ -176,6 +176,34 @@ public class HRCertificate extends EntityMP implements Serializable {
@JSONField(name = "registerorganizationname") @JSONField(name = "registerorganizationname")
@JsonProperty("registerorganizationname") @JsonProperty("registerorganizationname")
private String registerorganizationname; private String registerorganizationname;
/**
* 员工编号
*/
@TableField(exist = false)
@JSONField(name = "employeecode")
@JsonProperty("employeecode")
private String employeecode;
/**
* 单位
*/
@TableField(exist = false)
@JSONField(name = "organizationname")
@JsonProperty("organizationname")
private String organizationname;
/**
* 单位ID
*/
@TableField(exist = false)
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
/**
* 员工状态
*/
@TableField(value = "empstate")
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/** /**
* 员工 * 员工
...@@ -313,6 +341,14 @@ public class HRCertificate extends EntityMP implements Serializable { ...@@ -313,6 +341,14 @@ public class HRCertificate extends EntityMP implements Serializable {
this.modify("registerorganizationid",registerorganizationid); this.modify("registerorganizationid",registerorganizationid);
} }
/**
* 设置 [员工状态]
*/
public void setEmpstate(String empstate){
this.empstate = empstate ;
this.modify("empstate",empstate);
}
} }
......
...@@ -167,6 +167,34 @@ public class HRTechnicalTitle extends EntityMP implements Serializable { ...@@ -167,6 +167,34 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
@JSONField(name = "certificatecode") @JSONField(name = "certificatecode")
@JsonProperty("certificatecode") @JsonProperty("certificatecode")
private String certificatecode; private String certificatecode;
/**
* 员工编号
*/
@TableField(exist = false)
@JSONField(name = "employeecode")
@JsonProperty("employeecode")
private String employeecode;
/**
* 单位
*/
@TableField(exist = false)
@JSONField(name = "organizationname")
@JsonProperty("organizationname")
private String organizationname;
/**
* 单位ID
*/
@TableField(exist = false)
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
/**
* 员工状态
*/
@TableField(exist = false)
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/** /**
* 员工 * 员工
......
...@@ -55,6 +55,20 @@ public class HRArchivesSearchContext extends QueryWrapperContext<HRArchives> { ...@@ -55,6 +55,20 @@ public class HRArchivesSearchContext extends QueryWrapperContext<HRArchives> {
this.getSearchCond().like("hremployeename", n_hremployeename_like); this.getSearchCond().like("hremployeename", n_hremployeename_like);
} }
} }
private String n_archivesplacetype_eq;//[档案保管地]
public void setN_archivesplacetype_eq(String n_archivesplacetype_eq) {
this.n_archivesplacetype_eq = n_archivesplacetype_eq;
if(!ObjectUtils.isEmpty(this.n_archivesplacetype_eq)){
this.getSearchCond().eq("archivesplacetype", n_archivesplacetype_eq);
}
}
private String n_degree_eq;//[档案学历]
public void setN_degree_eq(String n_degree_eq) {
this.n_degree_eq = n_degree_eq;
if(!ObjectUtils.isEmpty(this.n_degree_eq)){
this.getSearchCond().eq("degree", n_degree_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
...@@ -134,7 +134,9 @@ public class HRContractSearchContext extends QueryWrapperContext<HRContract> { ...@@ -134,7 +134,9 @@ public class HRContractSearchContext extends QueryWrapperContext<HRContract> {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("hrcontractname", query) wrapper.like("hremployeename", query)
.or().like("contractcode", query)
.or().like("employeecode", query)
); );
} }
} }
......
...@@ -186,6 +186,10 @@ public class HRArchivesServiceImpl extends ServiceImpl<HRArchivesMapper, HRArchi ...@@ -186,6 +186,10 @@ public class HRArchivesServiceImpl extends ServiceImpl<HRArchivesMapper, HRArchi
hremployee=majorEntity; hremployee=majorEntity;
} }
et.setHremployeename(hremployee.getEmployeename()); et.setHremployeename(hremployee.getEmployeename());
et.setEmployeecode(hremployee.getEmployeecode());
et.setOrganizationname(hremployee.getOrganizationname());
et.setOrganizationid(hremployee.getOrganizationid());
et.setEmpstate(hremployee.getEmpstate());
} }
} }
......
...@@ -199,6 +199,9 @@ public class HRCertificateServiceImpl extends ServiceImpl<HRCertificateMapper, H ...@@ -199,6 +199,9 @@ public class HRCertificateServiceImpl extends ServiceImpl<HRCertificateMapper, H
hremployee=majorEntity; hremployee=majorEntity;
} }
et.setHremployeename(hremployee.getEmployeename()); et.setHremployeename(hremployee.getEmployeename());
et.setEmployeecode(hremployee.getEmployeecode());
et.setOrganizationname(hremployee.getOrganizationname());
et.setOrganizationid(hremployee.getOrganizationid());
} }
//实体关系[DER1N_HRCERTIFICATE_HRORGANIZATION_REGISTERORGANIZATIONID_6BD9DC] //实体关系[DER1N_HRCERTIFICATE_HRORGANIZATION_REGISTERORGANIZATIONID_6BD9DC]
if(!ObjectUtils.isEmpty(et.getRegisterorganizationid())){ if(!ObjectUtils.isEmpty(et.getRegisterorganizationid())){
......
...@@ -186,6 +186,10 @@ public class HRTechnicalTitleServiceImpl extends ServiceImpl<HRTechnicalTitleMap ...@@ -186,6 +186,10 @@ public class HRTechnicalTitleServiceImpl extends ServiceImpl<HRTechnicalTitleMap
hremployee=majorEntity; hremployee=majorEntity;
} }
et.setHremployeename(hremployee.getEmployeename()); et.setHremployeename(hremployee.getEmployeename());
et.setEmployeecode(hremployee.getEmployeecode());
et.setOrganizationname(hremployee.getOrganizationname());
et.setOrganizationid(hremployee.getOrganizationid());
et.setEmpstate(hremployee.getEmpstate());
} }
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[HRARCHIVES]数据结构 --> <!--输出实体[HRARCHIVES]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrarchives-8-1"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrarchives-23-1">
<createTable tableName="T_HRARCHIVES"> <createTable tableName="T_HRARCHIVES">
<column name="HRARCHIVESID" remarks="" type="VARCHAR(100)"> <column name="HRARCHIVESID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRARCHIVES_HRARCHIVESID"/> <constraints primaryKey="true" primaryKeyName="PK_HRARCHIVES_HRARCHIVESID"/>
...@@ -21,6 +21,28 @@ ...@@ -21,6 +21,28 @@
</column> </column>
<column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)"> <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="ARCHIVESCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="ARCHIVESROOM" remarks="" type="VARCHAR(100)">
</column>
<column name="ARCHIVESPLACETYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="ARCHIVESPLACE" remarks="" type="VARCHAR(100)">
</column>
<column name="DEGREE" remarks="" type="VARCHAR(60)">
</column>
<column name="BIRTHDAY" remarks="" type="DATETIME">
</column>
<column name="POLITICALTIME" remarks="" type="DATETIME">
</column>
<column name="STARTWORKTIME" remarks="" type="DATETIME">
</column>
<column name="ACTIVEFLAG" remarks="" type="INT">
</column>
<column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(2000)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -46,7 +68,7 @@ ...@@ -46,7 +68,7 @@
<!--输出实体[HRCERTIFICATE]数据结构 --> <!--输出实体[HRCERTIFICATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-23-3"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-27-3">
<createTable tableName="T_HRCERTIFICATE"> <createTable tableName="T_HRCERTIFICATE">
<column name="HRCERTIFICATEID" remarks="" type="VARCHAR(100)"> <column name="HRCERTIFICATEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRCERTIFICATE_HRCERTIFICATE"/> <constraints primaryKey="true" primaryKeyName="PK_HRCERTIFICATE_HRCERTIFICATE"/>
...@@ -81,12 +103,14 @@ ...@@ -81,12 +103,14 @@
</column> </column>
<column name="REGISTERORGANIZATIONID" remarks="" type="VARCHAR(60)"> <column name="REGISTERORGANIZATIONID" remarks="" type="VARCHAR(60)">
</column> </column>
<column name="EMPSTATE" remarks="" type="VARCHAR(100)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[HRCONTRACT]数据结构 --> <!--输出实体[HRCONTRACT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-131-4"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-135-4">
<createTable tableName="T_HRCONTRACT"> <createTable tableName="T_HRCONTRACT">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -936,7 +960,7 @@ ...@@ -936,7 +960,7 @@
<!--输出实体[HRTECHNICALTITLE]数据结构 --> <!--输出实体[HRTECHNICALTITLE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrtechnicaltitle-34-31"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrtechnicaltitle-38-31">
<createTable tableName="T_HRTECHNICALTITLE"> <createTable tableName="T_HRTECHNICALTITLE">
<column name="HRTECHNICALTITLEID" remarks="" type="VARCHAR(100)"> <column name="HRTECHNICALTITLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRTECHNICALTITLE_HRTECHNICA"/> <constraints primaryKey="true" primaryKeyName="PK_HRTECHNICALTITLE_HRTECHNICA"/>
...@@ -1079,22 +1103,22 @@ ...@@ -1079,22 +1103,22 @@
</changeSet> </changeSet>
<!--输出实体[HRARCHIVES]外键关系 --> <!--输出实体[HRARCHIVES]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrarchives-8-35"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrarchives-23-35">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRARCHIVES" constraintName="DER1N_HRARCHIVES_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/> <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRARCHIVES" constraintName="DER1N_HRARCHIVES_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRATTENDANCE]外键关系 --> <!--输出实体[HRATTENDANCE]外键关系 -->
<!--输出实体[HRCERTIFICATE]外键关系 --> <!--输出实体[HRCERTIFICATE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-23-36"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-27-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"/> <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>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-23-37"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-27-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"/> <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> </changeSet>
<!--输出实体[HRCONTRACT]外键关系 --> <!--输出实体[HRCONTRACT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-131-38"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-135-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"/> <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>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-131-39"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-135-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"/> <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> </changeSet>
<!--输出实体[HRDISTRIBUTION]外键关系 --> <!--输出实体[HRDISTRIBUTION]外键关系 -->
...@@ -1199,7 +1223,7 @@ ...@@ -1199,7 +1223,7 @@
<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"/> <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> </changeSet>
<!--输出实体[HRTECHNICALTITLE]外键关系 --> <!--输出实体[HRTECHNICALTITLE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtechnicaltitle-34-67"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrtechnicaltitle-38-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"/> <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> </changeSet>
<!--输出实体[HRTRAININGRECORD]外键关系 --> <!--输出实体[HRTRAININGRECORD]外键关系 -->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="HRArchivesResultMap" databaseId="mysql"> <select id="selectById" resultMap="HRArchivesResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID ) t1 where hrarchivesid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID ) t1 where hrarchivesid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID <![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID <![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ARCHIVESCODE`, t1.`ARCHIVESPLACE`, t1.`ARCHIVESPLACETYPE`, t1.`ARCHIVESROOM`, t1.`ATTACHMENT`, t1.`BIRTHDAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEGREE`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HRARCHIVESID`, t1.`HRARCHIVESNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POLITICALTIME`, t1.`STARTWORKTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRARCHIVES` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="HRCertificateResultMap" databaseId="mysql"> <select id="selectById" resultMap="HRCertificateResultMap" databaseId="mysql">
<![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}]]> <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t2.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, 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 LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrcertificateid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![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 <![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t2.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, 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 LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![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 <![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t2.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, 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 LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select id="selectById" resultMap="HRTechnicalTitleResultMap" databaseId="mysql"> <select id="selectById" resultMap="HRTechnicalTitleResultMap" databaseId="mysql">
<![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}]]> <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HIGHTITLE`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`MAJOR`, t1.`MAJORTYPE`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`TITLELEVEL`, t1.`TITLETIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDORGANIZATION` FROM `T_HRTECHNICALTITLE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID ) t1 where hrtechnicaltitleid=#{id}]]>
</select> </select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![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 <![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HIGHTITLE`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`MAJOR`, t1.`MAJORTYPE`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`TITLELEVEL`, t1.`TITLETIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDORGANIZATION` FROM `T_HRTECHNICALTITLE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![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 <![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`HIGHTITLE`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRTECHNICALTITLEID`, t1.`HRTECHNICALTITLENAME`, t1.`MAJOR`, t1.`MAJORTYPE`, t11.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`TITLELEVEL`, t1.`TITLETIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VALIDORGANIZATION` FROM `T_HRTECHNICALTITLE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID
]]> ]]>
</sql> </sql>
</mapper> </mapper>
......
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
{ {
"appid":"PIM", "appid":"PIM",
"appname":"基础管理", "appname":"基础管理",
"appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"基础" , "items":[{ "id":"menuitem15" , "name":"员工" },{ "id":"menuitem8" , "name":"合同" },{ "id":"menuitem16" , "name":"档案" },{ "id":"menuitem17" , "name":"职称" },{ "id":"menuitem18" , "name":"证书" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]},{ "id":"menuitem13" , "name":"调动" , "items":[{ "id":"menuitem14" , "name":"调动申请" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }] "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem19" , "name":"首页" },{ "id":"menuitem5" , "name":"基础" , "items":[{ "id":"menuitem15" , "name":"员工" },{ "id":"menuitem8" , "name":"合同" },{ "id":"menuitem16" , "name":"档案" },{ "id":"menuitem17" , "name":"职称" },{ "id":"menuitem18" , "name":"证书" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]},{ "id":"menuitem13" , "name":"调动" , "items":[{ "id":"menuitem14" , "name":"调动申请" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
} }
] ]
} }
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar 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 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
...@@ -3,9 +3,25 @@ services: ...@@ -3,9 +3,25 @@ services:
humanresource-provider-hrapi: humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports: ports:
- "8081:8081" - "10317:10317"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
...@@ -90,6 +90,129 @@ public class HRArchivesDTO extends DTOBase implements Serializable { ...@@ -90,6 +90,129 @@ public class HRArchivesDTO extends DTOBase implements Serializable {
@JsonProperty("hremployeename") @JsonProperty("hremployeename")
private String hremployeename; private String hremployeename;
/**
* 属性 [EMPLOYEECODE]
*
*/
@JSONField(name = "employeecode")
@JsonProperty("employeecode")
private String employeecode;
/**
* 属性 [ORGANIZATIONNAME]
*
*/
@JSONField(name = "organizationname")
@JsonProperty("organizationname")
private String organizationname;
/**
* 属性 [ORGANIZATIONID]
*
*/
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
/**
* 属性 [EMPSTATE]
*
*/
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/**
* 属性 [ARCHIVESCODE]
*
*/
@JSONField(name = "archivescode")
@JsonProperty("archivescode")
private String archivescode;
/**
* 属性 [ARCHIVESROOM]
*
*/
@JSONField(name = "archivesroom")
@JsonProperty("archivesroom")
private String archivesroom;
/**
* 属性 [ARCHIVESPLACETYPE]
*
*/
@JSONField(name = "archivesplacetype")
@JsonProperty("archivesplacetype")
private String archivesplacetype;
/**
* 属性 [ARCHIVESPLACE]
*
*/
@JSONField(name = "archivesplace")
@JsonProperty("archivesplace")
private String archivesplace;
/**
* 属性 [DEGREE]
*
*/
@JSONField(name = "degree")
@JsonProperty("degree")
private String degree;
/**
* 属性 [BIRTHDAY]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "birthday" , format="yyyy-MM-dd")
@JsonProperty("birthday")
private Timestamp birthday;
/**
* 属性 [POLITICALTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "politicaltime" , format="yyyy-MM-dd")
@JsonProperty("politicaltime")
private Timestamp politicaltime;
/**
* 属性 [STARTWORKTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "startworktime" , format="yyyy-MM-dd")
@JsonProperty("startworktime")
private Timestamp startworktime;
/**
* 属性 [ACTIVEFLAG]
*
*/
@JSONField(name = "activeflag")
@JsonProperty("activeflag")
private Integer activeflag;
/**
* 属性 [ATTACHMENT]
*
*/
@JSONField(name = "attachment")
@JsonProperty("attachment")
private String attachment;
/**
* 属性 [MEMO]
*
*/
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/** /**
* 设置 [HRARCHIVESNAME] * 设置 [HRARCHIVESNAME]
...@@ -107,6 +230,94 @@ public class HRArchivesDTO extends DTOBase implements Serializable { ...@@ -107,6 +230,94 @@ public class HRArchivesDTO extends DTOBase implements Serializable {
this.modify("hremployeeid",hremployeeid); this.modify("hremployeeid",hremployeeid);
} }
/**
* 设置 [ARCHIVESCODE]
*/
public void setArchivescode(String archivescode){
this.archivescode = archivescode ;
this.modify("archivescode",archivescode);
}
/**
* 设置 [ARCHIVESROOM]
*/
public void setArchivesroom(String archivesroom){
this.archivesroom = archivesroom ;
this.modify("archivesroom",archivesroom);
}
/**
* 设置 [ARCHIVESPLACETYPE]
*/
public void setArchivesplacetype(String archivesplacetype){
this.archivesplacetype = archivesplacetype ;
this.modify("archivesplacetype",archivesplacetype);
}
/**
* 设置 [ARCHIVESPLACE]
*/
public void setArchivesplace(String archivesplace){
this.archivesplace = archivesplace ;
this.modify("archivesplace",archivesplace);
}
/**
* 设置 [DEGREE]
*/
public void setDegree(String degree){
this.degree = degree ;
this.modify("degree",degree);
}
/**
* 设置 [BIRTHDAY]
*/
public void setBirthday(Timestamp birthday){
this.birthday = birthday ;
this.modify("birthday",birthday);
}
/**
* 设置 [POLITICALTIME]
*/
public void setPoliticaltime(Timestamp politicaltime){
this.politicaltime = politicaltime ;
this.modify("politicaltime",politicaltime);
}
/**
* 设置 [STARTWORKTIME]
*/
public void setStartworktime(Timestamp startworktime){
this.startworktime = startworktime ;
this.modify("startworktime",startworktime);
}
/**
* 设置 [ACTIVEFLAG]
*/
public void setActiveflag(Integer activeflag){
this.activeflag = activeflag ;
this.modify("activeflag",activeflag);
}
/**
* 设置 [ATTACHMENT]
*/
public void setAttachment(String attachment){
this.attachment = attachment ;
this.modify("attachment",attachment);
}
/**
* 设置 [MEMO]
*/
public void setMemo(String memo){
this.memo = memo ;
this.modify("memo",memo);
}
} }
...@@ -173,6 +173,38 @@ public class HRCertificateDTO extends DTOBase implements Serializable { ...@@ -173,6 +173,38 @@ public class HRCertificateDTO extends DTOBase implements Serializable {
@JsonProperty("registerorganizationname") @JsonProperty("registerorganizationname")
private String registerorganizationname; private String registerorganizationname;
/**
* 属性 [EMPLOYEECODE]
*
*/
@JSONField(name = "employeecode")
@JsonProperty("employeecode")
private String employeecode;
/**
* 属性 [ORGANIZATIONNAME]
*
*/
@JSONField(name = "organizationname")
@JsonProperty("organizationname")
private String organizationname;
/**
* 属性 [ORGANIZATIONID]
*
*/
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
/**
* 属性 [EMPSTATE]
*
*/
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/** /**
* 设置 [HRCERTIFICATENAME] * 设置 [HRCERTIFICATENAME]
...@@ -262,6 +294,14 @@ public class HRCertificateDTO extends DTOBase implements Serializable { ...@@ -262,6 +294,14 @@ public class HRCertificateDTO extends DTOBase implements Serializable {
this.modify("registerorganizationid",registerorganizationid); this.modify("registerorganizationid",registerorganizationid);
} }
/**
* 设置 [EMPSTATE]
*/
public void setEmpstate(String empstate){
this.empstate = empstate ;
this.modify("empstate",empstate);
}
} }
...@@ -163,6 +163,38 @@ public class HRTechnicalTitleDTO extends DTOBase implements Serializable { ...@@ -163,6 +163,38 @@ public class HRTechnicalTitleDTO extends DTOBase implements Serializable {
@JsonProperty("certificatecode") @JsonProperty("certificatecode")
private String certificatecode; private String certificatecode;
/**
* 属性 [EMPLOYEECODE]
*
*/
@JSONField(name = "employeecode")
@JsonProperty("employeecode")
private String employeecode;
/**
* 属性 [ORGANIZATIONNAME]
*
*/
@JSONField(name = "organizationname")
@JsonProperty("organizationname")
private String organizationname;
/**
* 属性 [ORGANIZATIONID]
*
*/
@JSONField(name = "organizationid")
@JsonProperty("organizationid")
private String organizationid;
/**
* 属性 [EMPSTATE]
*
*/
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/** /**
* 设置 [HRTECHNICALTITLENAME] * 设置 [HRTECHNICALTITLENAME]
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册