Skip to content

I
iBiz人力资源
提交 dd92657c 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务接口

上级 2444d080
隐藏空白字符变更
内嵌 并排
正在显示 包含 289 行增加 和 56 行删除
config.xml
浏览文件 @ dd92657c
......@@ -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
浏览文件 @ dd92657c
......@@ -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
浏览文件 @ dd92657c
......@@ -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/humanresource/domain/HREmployee.java
浏览文件 @ dd92657c
......@@ -345,6 +345,14 @@ public class HREmployee extends EntityMP implements Serializable {
@JSONField(name = "hrdutyname")
@JsonProperty("hrdutyname")
private String hrdutyname;
/**
* 试用期
*/
@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;
/**
*
......@@ -668,6 +676,24 @@ public class HREmployee extends EntityMP implements Serializable {
this.modify("hrpostid",hrpostid);
}
/**
* 设置 [试用期]
*/
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/mapper/HREmployeeMapper.java
浏览文件 @ dd92657c
......@@ -19,7 +19,11 @@ import com.alibaba.fastjson.JSONObject;
public interface HREmployeeMapper extends BaseMapper<HREmployee>{
Page<HREmployee> searchAfterProbation(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchDefault(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchLeaveDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchOnDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchWaitDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
@Override
HREmployee selectById(Serializable id);
@Override
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHREmployeeService.java
浏览文件 @ dd92657c
......@@ -36,7 +36,11 @@ public interface IHREmployeeService extends IService<HREmployee>{
boolean checkKey(HREmployee et) ;
boolean save(HREmployee et) ;
void saveBatch(List<HREmployee> list) ;
Page<HREmployee> searchAfterProbation(HREmployeeSearchContext context) ;
Page<HREmployee> searchDefault(HREmployeeSearchContext context) ;
Page<HREmployee> searchLeaveDuty(HREmployeeSearchContext context) ;
Page<HREmployee> searchOnDuty(HREmployeeSearchContext context) ;
Page<HREmployee> searchWaitDuty(HREmployeeSearchContext context) ;
List<HREmployee> selectByOrganizationid(String organizationid) ;
void removeByOrganizationid(String organizationid) ;
List<HREmployee> selectByEmpstate(String hrempstateid) ;
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HREmployeeServiceImpl.java
浏览文件 @ dd92657c
......@@ -232,6 +232,15 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
}
/**
* 查询集合 待定工作人员
*/
@Override
public Page<HREmployee> searchAfterProbation(HREmployeeSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HREmployee> pages=baseMapper.searchAfterProbation(context.getPages(),context,context.getSelectCond());
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
* 查询集合 DEFAULT
*/
......@@ -241,6 +250,33 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
* 查询集合 前员工
*/
@Override
public Page<HREmployee> searchLeaveDuty(HREmployeeSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HREmployee> pages=baseMapper.searchLeaveDuty(context.getPages(),context,context.getSelectCond());
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
* 查询集合 在岗员工
*/
@Override
public Page<HREmployee> searchOnDuty(HREmployeeSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HREmployee> pages=baseMapper.searchOnDuty(context.getPages(),context,context.getSelectCond());
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
* 查询集合 待定工作人员
*/
@Override
public Page<HREmployee> searchWaitDuty(HREmployeeSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HREmployee> pages=baseMapper.searchWaitDuty(context.getPages(),context,context.getSelectCond());
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ dd92657c
......@@ -46,7 +46,7 @@
<!--输出实体[HRCERTIFICATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-21-3">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-23-3">
<createTable tableName="T_HRCERTIFICATE">
<column name="HRCERTIFICATEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRCERTIFICATE_HRCERTIFICATE"/>
......@@ -86,7 +86,7 @@
<!--输出实体[HRCONTRACT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-23-4">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-24-4">
<createTable tableName="T_HRCONTRACT">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -306,7 +306,7 @@
<!--输出实体[HREMPSTATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrempstate-16-11">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrempstate-18-11">
<createTable tableName="T_HREMPSTATE">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -332,7 +332,7 @@
<!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-228-12">
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-263-12">
<createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -409,12 +409,14 @@
</column>
<column name="HRPOSTID" remarks="" type="VARCHAR(100)">
</column>
<column name="PROBATIONTIME" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[HRFAMILY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrfamily-20-13">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrfamily-23-13">
<createTable tableName="T_HRFAMILY">
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
......@@ -454,7 +456,7 @@
<!--输出实体[HRLANGUAGEABILITY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlanguageability-14-14">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrlanguageability-16-14">
<createTable tableName="T_HRLANGUAGEABILITY">
<column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -736,7 +738,7 @@
<!--输出实体[HRPAPER]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpaper-13-25">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpaper-15-25">
<createTable tableName="T_HRPAPER">
<column name="HRPAPERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRPAPER_HRPAPERID"/>
......@@ -770,7 +772,7 @@
<!--输出实体[HRPATENT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpatent-14-26">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpatent-16-26">
<createTable tableName="T_HRPATENT">
<column name="HRPATENTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRPATENT_HRPATENTID"/>
......@@ -862,7 +864,7 @@
<!--输出实体[HRRESEARCH]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrresearch-10-29">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrresearch-13-29">
<createTable tableName="T_HRRESEARCH">
<column name="HRRESEARCHID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRRESEARCH_HRRESEARCHID"/>
......@@ -888,7 +890,7 @@
<!--输出实体[HRREWARD]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrreward-16-30">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrreward-18-30">
<createTable tableName="T_HRREWARD">
<column name="HRREWARDNAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -924,7 +926,7 @@
<!--输出实体[HRTECHNICALTITLE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrtechnicaltitle-31-31">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrtechnicaltitle-34-31">
<createTable tableName="T_HRTECHNICALTITLE">
<column name="HRTECHNICALTITLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRTECHNICALTITLE_HRTECHNICA"/>
......@@ -1022,7 +1024,7 @@
<!--输出实体[HRWORKRECORD]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrworkrecord-15-34">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrworkrecord-16-34">
<createTable tableName="T_HRWORKRECORD">
<column name="HRWORKRECORDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRWORKRECORD_HRWORKRECORDID"/>
......@@ -1062,17 +1064,17 @@
</changeSet>
<!--输出实体[HRATTENDANCE]外键关系 -->
<!--输出实体[HRCERTIFICATE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-21-36">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-23-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">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-23-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-23-38">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-24-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">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-24-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]外键关系 -->
......@@ -1101,21 +1103,21 @@
</changeSet>
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-47">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-263-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-48">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-263-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-49">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-263-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-50">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrfamily-23-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-14-51">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrlanguageability-16-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]外键关系 -->
......@@ -1147,11 +1149,11 @@
</changeSet>
<!--输出实体[HRORGANIZATION]外键关系 -->
<!--输出实体[HRPAPER]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpaper-13-59">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpaper-15-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-14-60">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpatent-16-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]外键关系 -->
......@@ -1169,15 +1171,15 @@
<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-10-65">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrresearch-13-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-16-66">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrreward-18-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-31-67">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtechnicaltitle-34-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]外键关系 -->
......@@ -1195,7 +1197,7 @@
<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-72">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrworkrecord-16-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/hremployee/HREmployeeMapper.xml
浏览文件 @ dd92657c
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HREmployeeResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID ) t1 where employeeid=#{id}]]>
<![CDATA[select t1.* from (SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID ) t1 where employeeid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -46,6 +46,15 @@
where hrpostid=#{hrpostid}
</select>
<!--数据集合[AfterProbation]-->
<select id="searchAfterProbation" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from (
<include refid="AfterProbation" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[Default]-->
<select id="searchDefault" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from (
......@@ -55,14 +64,65 @@
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[LeaveDuty]-->
<select id="searchLeaveDuty" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from (
<include refid="LeaveDuty" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[OnDuty]-->
<select id="searchOnDuty" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from (
<include refid="OnDuty" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[WaitDuty]-->
<select id="searchWaitDuty" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from (
<include refid="WaitDuty" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据查询[AfterProbation]-->
<sql id="AfterProbation" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
WHERE ( t1.`EMPSTATE` = '' )
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
]]>
</sql>
<!--数据查询[LeaveDuty]-->
<sql id="LeaveDuty" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
WHERE ( t21.`JOBSTATE` = 'ONDUTY' )
]]>
</sql>
<!--数据查询[OnDuty]-->
<sql id="OnDuty" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
WHERE ( t21.`JOBSTATE` = 'ONDUTY' )
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
]]>
</sql>
<!--数据查询[WaitDuty]-->
<sql id="WaitDuty" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
WHERE ( t1.`HRPOSTID` IS NULL )
]]>
</sql>
</mapper>
......
humanresource-core/src/main/resources/permission/systemResource.json
浏览文件 @ dd92657c
......@@ -87,7 +87,7 @@
"dename":"HREmployee",
"delogicname":"员工",
"sysmoudle":{"id":"HUMANRESOURCE","name":"人力"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"dedataset":[{"id":"AfterProbation" , "name":"待定工作人员"},{"id":"Default" , "name":"DEFAULT"},{"id":"LeaveDuty" , "name":"前员工"},{"id":"OnDuty" , "name":"在岗员工"},{"id":"WaitDuty" , "name":"待定工作人员"}],
"deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
}
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ dd92657c
......@@ -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
浏览文件 @ dd92657c
......@@ -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/HREmployeeDTO.java
浏览文件 @ dd92657c
......@@ -366,6 +366,15 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("hrdutyname")
private String hrdutyname;
/**
* 属性 [PROBATIONTIME]
*
*/
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "probationtime" , format="yyyy-MM-dd")
@JsonProperty("probationtime")
private Timestamp probationtime;
/**
* 设置 [EMPLOYEENAME]
......@@ -623,6 +632,14 @@ public class HREmployeeDTO extends DTOBase implements Serializable {
this.modify("hrpostid",hrpostid);
}
/**
* 设置 [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/rest/HREmployeeResource.java
浏览文件 @ dd92657c
......@@ -139,6 +139,27 @@ public class HREmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchAfterProbation-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取待定工作人员", tags = {"员工" } ,notes = "获取待定工作人员")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchafterprobation")
public ResponseEntity<List<HREmployeeDTO>> fetchAfterProbation(HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchAfterProbation(context) ;
List<HREmployeeDTO> list = hremployeeMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchAfterProbation-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "查询待定工作人员", tags = {"员工" } ,notes = "查询待定工作人员")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/searchafterprobation")
public ResponseEntity<Page<HREmployeeDTO>> searchAfterProbation(@RequestBody HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchAfterProbation(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchDefault-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取DEFAULT", tags = {"员工" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchdefault")
......@@ -160,5 +181,68 @@ public class HREmployeeResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchLeaveDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取前员工", tags = {"员工" } ,notes = "获取前员工")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchleaveduty")
public ResponseEntity<List<HREmployeeDTO>> fetchLeaveDuty(HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchLeaveDuty(context) ;
List<HREmployeeDTO> list = hremployeeMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchLeaveDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "查询前员工", tags = {"员工" } ,notes = "查询前员工")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/searchleaveduty")
public ResponseEntity<Page<HREmployeeDTO>> searchLeaveDuty(@RequestBody HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchLeaveDuty(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchOnDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取在岗员工", tags = {"员工" } ,notes = "获取在岗员工")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchonduty")
public ResponseEntity<List<HREmployeeDTO>> fetchOnDuty(HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchOnDuty(context) ;
List<HREmployeeDTO> list = hremployeeMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchOnDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "查询在岗员工", tags = {"员工" } ,notes = "查询在岗员工")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/searchonduty")
public ResponseEntity<Page<HREmployeeDTO>> searchOnDuty(@RequestBody HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchOnDuty(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchWaitDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取待定工作人员", tags = {"员工" } ,notes = "获取待定工作人员")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchwaitduty")
public ResponseEntity<List<HREmployeeDTO>> fetchWaitDuty(HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchWaitDuty(context) ;
List<HREmployeeDTO> list = hremployeeMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchWaitDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "查询待定工作人员", tags = {"员工" } ,notes = "查询待定工作人员")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/searchwaitduty")
public ResponseEntity<Page<HREmployeeDTO>> searchWaitDuty(@RequestBody HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchWaitDuty(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或